ilyakooo0/helix
1
0
Fork 0
mirror of https://github.com/ilyakooo0/helix.git synced 2024-11-10 06:16:00 +03:00
Code Issues Packages Projects Releases Wiki Activity

lsp: Pass through language_id on didOpenTextDocument.

Browse Source
This commit is contained in:
Blaž Hrastnik 2021-03-16 16:13:41 +09:00
parent 143cfe13e0
commit eca2a73ad0
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
helix-lsp/src/client.rs
View File

@ -244,11 +244,12 @@ impl Client {
uri: lsp::Url,
version: i32,
doc: &Rope,
language_id: String,
) -> Result<()> {
self.notify::<lsp::notification::DidOpenTextDocument>(lsp::DidOpenTextDocumentParams {
text_document: lsp::TextDocumentItem {
uri,
language_id: "rust".to_string(), // TODO: hardcoded for now
language_id,
version,
text: String::from(doc),
},

1
helix-term/src/commands.rs
View File

@ -1183,6 +1183,7 @@ pub fn completion(cx: &mut Context) {
let pos = helix_lsp::util::pos_to_lsp_pos(doc.text().slice(..), doc.selection().cursor());
// TODO: handle fails
let res = smol::block_on(language_server.completion(doc.identifier(), pos)).unwrap_or_default();
// TODO: if no completion, show some message or something

7
helix-view/src/editor.rs
View File

@ -46,10 +46,17 @@ impl Editor {
if let Some(language_server) = language_server {
doc.set_language_server(Some(language_server.clone()));
let language_id = doc
.language()
.and_then(|s| s.split(".").last()) // source.rust
.map(ToOwned::to_owned)
.unwrap_or_default();
smol::block_on(language_server.text_document_did_open(
doc.url().unwrap(),
doc.version(),
doc.text(),
language_id,
))
.unwrap();
}