d7d0d5f · helix · git.iko.soy

helix-term/src/ui/completion.rs+21

compare with master

unifiedsplit

@@ -295,6 +295,27 @@ impl Completion {

295 pub fn is_empty(&self) -> bool {

296 self.popup.contents().is_empty()

297 }

298+

299+ pub fn ensure_item_resolved(&mut self, cx: &mut commands::Context) -> bool {

300+ // > If computing full completion items is expensive, servers can additionally provide a

301+ // > handler for the completion item resolve request. ...

302+ // > A typical use case is for example: the `textDocument/completion` request doesn't fill

303+ // > in the `documentation` property for returned completion items since it is expensive

304+ // > to compute. When the item is selected in the user interface then a

305+ // > 'completionItem/resolve' request is sent with the selected completion item as a parameter.

306+ // > The returned completion item should have the documentation property filled in.

307+ // https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_completion

308+ match self.popup.contents_mut().selection_mut() {

309+ Some(item) if item.documentation.is_none() => {

310+ let doc = doc!(cx.editor);

311+ if let Some(resolved_item) = Self::resolve_completion_item(doc, item.clone()) {

312+ *item = resolved_item;

313+ }

314+ true

315+ }

316+ _ => false,

317+ }

318+ }

298}

319}

299

320

300impl Component for Completion {

321impl Component for Completion {

helix-term/src/ui/editor.rs+9−4

@@ -1097,10 +1097,15 @@ impl EditorView {

1097 }

1098

1099 pub fn handle_idle_timeout(&mut self, cx: &mut commands::Context) -> EventResult {

1100− if self.completion.is_some()

1100+ if let Some(completion) = &mut self.completion {

1101− || cx.editor.mode != Mode::Insert

1101+ return if completion.ensure_item_resolved(cx) {

1102+ EventResult::Consumed(None)

1103+ } else {

1104+ EventResult::Ignored(None)

1105+ };

1106+ }

1107+

1102− || !cx.editor.config().auto_completion

1108+ if cx.editor.mode != Mode::Insert || !cx.editor.config().auto_completion {

1103− {

1104 return EventResult::Ignored(None);

1109 return EventResult::Ignored(None);

1105 }

1110 }

1106

1111

helix-term/src/ui/menu.rs+8

@@ -206,6 +206,14 @@ impl<T: Item> Menu<T> {

206 })

207 }

208

209+ pub fn selection_mut(&mut self) -> Option<&mut T> {

210+ self.cursor.and_then(|cursor| {

211+ self.matches

212+ .get(cursor)

213+ .map(|(index, _score)| &mut self.options[*index])

214+ })

215+ }

216+

209 pub fn is_empty(&self) -> bool {

217 pub fn is_empty(&self) -> bool {

210 self.matches.is_empty()

218 self.matches.is_empty()

211 }

219 }