cd16df1 · helix · git.iko.soy

Cargo.lock+11

compare with master

unifiedsplit

@@ -594,6 +594,7 @@ dependencies = [

594 "num_cpus",

595 "once_cell",

596 "smol",

597+ "smol-timeout",

597 "tui",

598 "tui",

598]

599]

599

600

@@ -1142,6 +1143,16 @@ dependencies = [

1142 "once_cell",

1143 "once_cell",

1143]

1144]

1144

1145

1146+[[package]]

1147+name = "smol-timeout"

1148+version = "0.6.0"

1149+source = "registry+https://github.com/rust-lang/crates.io-index"

1150+checksum = "847d777e2c6c166bad26264479e80a9820f3d364fcb4a0e23cd57bbfa8e94961"

1151+dependencies = [

1152+ "async-io",

1153+ "pin-project-lite",

1154+]

1155+

1145[[package]]

1156[[package]]

1146name = "socket2"

1157name = "socket2"

1147version = "0.3.18"

1158version = "0.3.18"

helix-lsp/src/lib.rs+27−2

@@ -28,19 +28,44 @@ pub enum Error {

28

29pub mod util {

30 use super::*;

31+ use helix_core::{RopeSlice, State, Transaction};

31

32

32− pub fn lsp_pos_to_pos(doc: &helix_core::RopeSlice, pos: lsp::Position) -> usize {

33+ pub fn lsp_pos_to_pos(doc: &RopeSlice, pos: lsp::Position) -> usize {

33 let line = doc.line_to_char(pos.line as usize);

34 let line = doc.line_to_char(pos.line as usize);

34 let line_start = doc.char_to_utf16_cu(line);

35 let line_start = doc.char_to_utf16_cu(line);

35 doc.utf16_cu_to_char(pos.character as usize + line_start)

36 doc.utf16_cu_to_char(pos.character as usize + line_start)

36 }

37 }

37− pub fn pos_to_lsp_pos(doc: &helix_core::RopeSlice, pos: usize) -> lsp::Position {

38+ pub fn pos_to_lsp_pos(doc: &RopeSlice, pos: usize) -> lsp::Position {

38 let line = doc.char_to_line(pos);

39 let line = doc.char_to_line(pos);

39 let line_start = doc.char_to_utf16_cu(line);

40 let line_start = doc.char_to_utf16_cu(line);

40 let col = doc.char_to_utf16_cu(pos) - line_start;

41 let col = doc.char_to_utf16_cu(pos) - line_start;

41

42

42 lsp::Position::new(line as u32, col as u32)

43 lsp::Position::new(line as u32, col as u32)

43 }

44 }

45+

46+ pub fn generate_transaction_from_edits(

47+ state: &State,

48+ edits: Vec<lsp::TextEdit>,

49+ ) -> Transaction {

50+ let doc = state.doc.slice(..);

51+ Transaction::change(

52+ state,

53+ edits.into_iter().map(|edit| {

54+ // simplify "" into None for cleaner changesets

55+ let replacement = if !edit.new_text.is_empty() {

56+ Some(edit.new_text.into())

57+ } else {

58+ None

59+ };

60+

61+ let start = lsp_pos_to_pos(&doc, edit.range.start);

62+ let end = lsp_pos_to_pos(&doc, edit.range.end);

63+ (start, end, replacement)

64+ }),

65+ )

66+ }

67+

68+ // apply_insert_replace_edit

44}

69}

45

70

46#[derive(Debug, PartialEq, Clone)]

71#[derive(Debug, PartialEq, Clone)]

helix-lsp/src/transport.rs+2−2

@@ -107,6 +107,8 @@ impl Transport {

107

108 // read data

109

110+ debug!("<- {}", msg);

111+

110 // try parsing as output (server response) or call (server request)

112 // try parsing as output (server response) or call (server request)

111 let output: serde_json::Result<Message> = serde_json::from_str(&msg);

113 let output: serde_json::Result<Message> = serde_json::from_str(&msg);

112

114

@@ -201,8 +203,6 @@ impl Transport {

201 }

203 }

202 let msg = msg.unwrap();

204 let msg = msg.unwrap();

203

205

204− debug!("<- {:?}", msg);

205−

206 self.recv_msg(msg).await.unwrap();

207 }

208 }

helix-term/Cargo.toml+1

@@ -20,6 +20,7 @@ anyhow = "1"

20once_cell = "1.4"

21

22smol = "1"

23+smol-timeout = "0.6"

23num_cpus = "1"

24num_cpus = "1"

24# tui = { version = "0.12", default-features = false, features = ["crossterm"] }

25# tui = { version = "0.12", default-features = false, features = ["crossterm"] }

25tui = { git = "https://github.com/fdehau/tui-rs", default-features = false, features = ["crossterm"] }

26tui = { git = "https://github.com/fdehau/tui-rs", default-features = false, features = ["crossterm"] }

helix-term/src/commands.rs+16−1

@@ -837,17 +837,32 @@ pub fn completion(cx: &mut Context) {

837 let language_server = cx.language_servers.get("rust", &cx.executor).unwrap();

838 use log::info;

839

840+ use smol_timeout::TimeoutExt;

841+ use std::time::Duration;

842+

840 // TODO: blocking here is not ideal

843 // TODO: blocking here is not ideal

844+ let res = smol::block_on(

845+ language_server

846+ .completion(&cx.view.doc)

847+ .timeout(Duration::from_secs(2)),

848+ )

849+ .expect("completion failed!")

841− let res = smol::block_on(language_server.completion(&cx.view.doc)).expect("completion failed!");

850+ .expect("completion failed!");

842

851

843 let picker = ui::Picker::new(

852 let picker = ui::Picker::new(

844 res,

853 res,

845 |item| {

854 |item| {

846 // format_fn

855 // format_fn

847 item.label.as_str().into()

856 item.label.as_str().into()

857+

858+ // TODO: use item.filter_text for filtering

848 },

859 },

849 |editor: &mut Editor, item| {

860 |editor: &mut Editor, item| {

861+ // if item.text_edit is Some we use that, else

862+ // let insert_text = &item.insert_text.unwrap_or(item.label);

863+ // and we insert at position.

850 //

864 //

865+ // merge this with additional_text_edits

851 },

866 },

852 );

867 );

853

868