suimeng
/
helix
mirror of https://github.com/helix-editor/helix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix panic when using set-language on a scratch (#1996) 

Skip launching a language server if a document doesn't have a valid URL.
pull/2094/head
Roland Kovacs 2022-04-13 03:02:14 +02:00 committed by GitHub
parent 3deb1c9230
commit a0c6c45c1b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -453,6 +453,9 @@ impl Editor {
/// Launch a language server for a given document /// Launch a language server for a given document
fn launch_language_server(ls: &mut helix_lsp::Registry, doc: &mut Document) -> Option<()> { fn launch_language_server(ls: &mut helix_lsp::Registry, doc: &mut Document) -> Option<()> {
// if doc doesn't have a URL it's a scratch buffer, ignore it
let doc_url = doc.url()?;
// try to find a language server based on the language name // try to find a language server based on the language name
let language_server = doc.language.as_ref().and_then(|language| { let language_server = doc.language.as_ref().and_then(|language| {
ls.get(language) ls.get(language)
@ -476,7 +479,7 @@ impl Editor {
// TODO: this now races with on_init code if the init happens too quickly // TODO: this now races with on_init code if the init happens too quickly
tokio::spawn(language_server.text_document_did_open( tokio::spawn(language_server.text_document_did_open(
doc.url().unwrap(), doc_url,
doc.version(), doc.version(),
doc.text(), doc.text(),
language_id, language_id,