f0eb6ed · helix · git.iko.soy

git.iko.soy/helix

on master help sign in

Resolve a couple TODOs

f0eb6edBlaž Hrastnik5 years ago

helix-term/src/commands.rs+2−13

compare with master

unifiedsplit

@@ -480,10 +480,6 @@ fn goto_window_bottom(cx: &mut Context) {

480 goto_window(cx, Align::Bottom)

481}

482

483−// TODO: move vs extend could take an extra type Extend/Move that would

484−// Range::new(if Move { pos } if Extend { range.anchor }, pos)

485−// since these all really do the same thing

486−

487fn move_next_word_start(cx: &mut Context) {

483fn move_next_word_start(cx: &mut Context) {

488 let count = cx.count();

484 let count = cx.count();

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

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

@@ -2320,7 +2316,7 @@ fn apply_workspace_edit(

2320}

2316}

2321

2317

2322fn last_picker(cx: &mut Context) {

2318fn last_picker(cx: &mut Context) {

2323− // TODO: last picker does not seemed to work well with buffer_picker

2319+ // TODO: last picker does not seem to work well with buffer_picker

2324 cx.callback = Some(Box::new(|compositor: &mut Compositor| {

2320 cx.callback = Some(Box::new(|compositor: &mut Compositor| {

2325 if let Some(picker) = compositor.last_picker.take() {

2321 if let Some(picker) = compositor.last_picker.take() {

2326 compositor.push(picker);

2322 compositor.push(picker);

@@ -2653,7 +2649,6 @@ fn goto_definition(cx: &mut Context) {

2653 offset_encoding,

2649 offset_encoding,

2654 );

2650 );

2655

2651

2656− // TODO: handle fails

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

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

2658

2653

2659 cx.callback(

2654 cx.callback(

@@ -2696,7 +2691,6 @@ fn goto_type_definition(cx: &mut Context) {

2696 offset_encoding,

2691 offset_encoding,

2697 );

2692 );

2698

2693

2699− // TODO: handle fails

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

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

2701

2695

2702 cx.callback(

2696 cx.callback(

@@ -2739,7 +2733,6 @@ fn goto_implementation(cx: &mut Context) {

2739 offset_encoding,

2733 offset_encoding,

2740 );

2734 );

2741

2735

2742− // TODO: handle fails

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

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

2744

2737

2745 cx.callback(

2738 cx.callback(

@@ -2782,7 +2775,6 @@ fn goto_reference(cx: &mut Context) {

2782 offset_encoding,

2775 offset_encoding,

2783 );

2776 );

2784

2777

2785− // TODO: handle fails

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

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

2787

2779

2788 cx.callback(

2780 cx.callback(

@@ -2900,7 +2892,6 @@ fn signature_help(cx: &mut Context) {

2900 language_server.offset_encoding(),

2892 language_server.offset_encoding(),

2901 );

2893 );

2902

2894

2903− // TODO: handle fails

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

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

2905

2896

2906 cx.callback(

2897 cx.callback(

@@ -3646,7 +3637,6 @@ fn completion(cx: &mut Context) {

3646

3637

3647 let pos = pos_to_lsp_pos(doc.text(), cursor, offset_encoding);

3638 let pos = pos_to_lsp_pos(doc.text(), cursor, offset_encoding);

3648

3639

3649− // TODO: handle fails

3650 let future = language_server.completion(doc.identifier(), pos, None);

3640 let future = language_server.completion(doc.identifier(), pos, None);

3651

3641

3652 let trigger_offset = cursor;

3642 let trigger_offset = cursor;

@@ -3672,8 +3662,8 @@ fn completion(cx: &mut Context) {

3672 None => Vec::new(),

3662 None => Vec::new(),

3673 };

3663 };

3674

3664

3675− // TODO: if no completion, show some message or something

3676 if items.is_empty() {

3665 if items.is_empty() {

3666+ editor.set_error("No completion available".to_string());

3677 return;

3667 return;

3678 }

3668 }

3679 let size = compositor.size();

3669 let size = compositor.size();

@@ -3705,7 +3695,6 @@ fn hover(cx: &mut Context) {

3705 language_server.offset_encoding(),

3695 language_server.offset_encoding(),

3706 );

3696 );

3707

3697

3708− // TODO: handle fails

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

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

3710

3699

3711 cx.callback(

3700 cx.callback(

helix-term/src/keymap.rs+1−2

@@ -475,8 +475,7 @@ impl Default for Keymaps {

475

476 // z family for save/restore/combine from/to sels from register

477

478− // supposedly "C-i" but did not work

478+ "tab" => jump_forward, // tab == <C-i>

479− "tab" => jump_forward,

480 "C-o" => jump_backward,

479 "C-o" => jump_backward,

481 // "C-s" => save_selection,

480 // "C-s" => save_selection,

482

481

helix-view/src/document.rs+2−3

@@ -520,13 +520,12 @@ impl Document {

520 // state without blocking any further edits.

521

522 let mut text = self.text().clone();

523− let path = self.path.clone().expect("Can't save with no path set!"); // TODO: handle no path

523+ let path = self.path.clone().expect("Can't save with no path set!");

524 let identifier = self.identifier();

525

526− // TODO: mark changes up to now as saved

527−

528 let language_server = self.language_server.clone();

526 let language_server = self.language_server.clone();

529

527

528+ // mark changes up to now as saved

530 self.reset_modified();

529 self.reset_modified();

531

530

532 let encoding = self.encoding;

531 let encoding = self.encoding;