a449156 · helix · git.iko.soy

git.iko.soy/helix

on master help sign in

Extract a lsp position helper

a449156Blaž Hrastnik5 years ago

helix-term/src/commands/lsp.rs+10−50

compare with master

unifiedsplit

@@ -1,6 +1,6 @@

1use helix_lsp::{

2 block_on, lsp,

3− util::{lsp_pos_to_pos, lsp_range_to_range, pos_to_lsp_pos, range_to_lsp_range},

3+ util::{lsp_pos_to_pos, lsp_range_to_range, range_to_lsp_range},

4 OffsetEncoding,

5};

@@ -495,13 +495,7 @@ pub fn goto_definition(cx: &mut Context) {

495 let language_server = language_server!(doc);

496 let offset_encoding = language_server.offset_encoding();

497

498− let pos = pos_to_lsp_pos(

499− doc.text(),

500− doc.selection(view.id)

501− .primary()

502− .cursor(doc.text().slice(..)),

503− offset_encoding,

498+ let pos = doc.position(view.id, offset_encoding);

504− );

505

499

506 let future = language_server.goto_definition(doc.identifier(), pos, None);

500 let future = language_server.goto_definition(doc.identifier(), pos, None);

507

501

@@ -519,13 +513,7 @@ pub fn goto_type_definition(cx: &mut Context) {

519 let language_server = language_server!(doc);

513 let language_server = language_server!(doc);

520 let offset_encoding = language_server.offset_encoding();

514 let offset_encoding = language_server.offset_encoding();

521

515

522− let pos = pos_to_lsp_pos(

523− doc.text(),

524− doc.selection(view.id)

525− .primary()

526− .cursor(doc.text().slice(..)),

527− offset_encoding,

516+ let pos = doc.position(view.id, offset_encoding);

528− );

529

517

530 let future = language_server.goto_type_definition(doc.identifier(), pos, None);

518 let future = language_server.goto_type_definition(doc.identifier(), pos, None);

531

519

@@ -543,13 +531,7 @@ pub fn goto_implementation(cx: &mut Context) {

543 let language_server = language_server!(doc);

531 let language_server = language_server!(doc);

544 let offset_encoding = language_server.offset_encoding();

532 let offset_encoding = language_server.offset_encoding();

545

533

546− let pos = pos_to_lsp_pos(

547− doc.text(),

548− doc.selection(view.id)

549− .primary()

550− .cursor(doc.text().slice(..)),

551− offset_encoding,

534+ let pos = doc.position(view.id, offset_encoding);

552− );

553

535

554 let future = language_server.goto_implementation(doc.identifier(), pos, None);

536 let future = language_server.goto_implementation(doc.identifier(), pos, None);

555

537

@@ -567,13 +549,7 @@ pub fn goto_reference(cx: &mut Context) {

567 let language_server = language_server!(doc);

549 let language_server = language_server!(doc);

568 let offset_encoding = language_server.offset_encoding();

550 let offset_encoding = language_server.offset_encoding();

569

551

570− let pos = pos_to_lsp_pos(

571− doc.text(),

572− doc.selection(view.id)

573− .primary()

574− .cursor(doc.text().slice(..)),

575− offset_encoding,

552+ let pos = doc.position(view.id, offset_encoding);

576− );

577

553

578 let future = language_server.goto_reference(doc.identifier(), pos, None);

554 let future = language_server.goto_reference(doc.identifier(), pos, None);

579

555

@@ -589,14 +565,9 @@ pub fn goto_reference(cx: &mut Context) {

589pub fn signature_help(cx: &mut Context) {

565pub fn signature_help(cx: &mut Context) {

590 let (view, doc) = current!(cx.editor);

566 let (view, doc) = current!(cx.editor);

591 let language_server = language_server!(doc);

567 let language_server = language_server!(doc);

568+ let offset_encoding = language_server.offset_encoding();

592

569

593− let pos = pos_to_lsp_pos(

594− doc.text(),

595− doc.selection(view.id)

596− .primary()

597− .cursor(doc.text().slice(..)),

598− language_server.offset_encoding(),

570+ let pos = doc.position(view.id, offset_encoding);

599− );

600

571

601 let future = language_server.text_document_signature_help(doc.identifier(), pos, None);

572 let future = language_server.text_document_signature_help(doc.identifier(), pos, None);

602

573

@@ -622,16 +593,11 @@ pub fn signature_help(cx: &mut Context) {

622pub fn hover(cx: &mut Context) {

593pub fn hover(cx: &mut Context) {

623 let (view, doc) = current!(cx.editor);

594 let (view, doc) = current!(cx.editor);

624 let language_server = language_server!(doc);

595 let language_server = language_server!(doc);

596+ let offset_encoding = language_server.offset_encoding();

625

597

626 // TODO: factor out a doc.position_identifier() that returns lsp::TextDocumentPositionIdentifier

598 // TODO: factor out a doc.position_identifier() that returns lsp::TextDocumentPositionIdentifier

627

599

628− let pos = pos_to_lsp_pos(

629− doc.text(),

630− doc.selection(view.id)

631− .primary()

632− .cursor(doc.text().slice(..)),

633− language_server.offset_encoding(),

600+ let pos = doc.position(view.id, offset_encoding);

634− );

635

601

636 let future = language_server.text_document_hover(doc.identifier(), pos, None);

602 let future = language_server.text_document_hover(doc.identifier(), pos, None);

637

603

@@ -688,13 +654,7 @@ pub fn rename_symbol(cx: &mut Context) {

688 let language_server = language_server!(doc);

654 let language_server = language_server!(doc);

689 let offset_encoding = language_server.offset_encoding();

655 let offset_encoding = language_server.offset_encoding();

690

656

691− let pos = pos_to_lsp_pos(

692− doc.text(),

693− doc.selection(view.id)

694− .primary()

695− .cursor(doc.text().slice(..)),

696− offset_encoding,

657+ let pos = doc.position(view.id, offset_encoding);

697− );

698

658

699 let task = language_server.rename_symbol(doc.identifier(), pos, input.to_string());

659 let task = language_server.rename_symbol(doc.identifier(), pos, input.to_string());

700 let edits = block_on(task).unwrap_or_default();

660 let edits = block_on(task).unwrap_or_default();

helix-view/src/document.rs+14

@@ -922,6 +922,20 @@ impl Document {

922 lsp::VersionedTextDocumentIdentifier::new(self.url().unwrap(), self.version)

923 }

924

925+ pub fn position(

926+ &self,

927+ view_id: ViewId,

928+ offset_encoding: helix_lsp::OffsetEncoding,

929+ ) -> lsp::Position {

930+ let text = self.text();

931+

932+ helix_lsp::util::pos_to_lsp_pos(

933+ text,

934+ self.selection(view_id).primary().cursor(text.slice(..)),

935+ offset_encoding,

936+ )

937+ }

938+

925 #[inline]

939 #[inline]

926 pub fn diagnostics(&self) -> &[Diagnostic] {

940 pub fn diagnostics(&self) -> &[Diagnostic] {

927 &self.diagnostics

941 &self.diagnostics