Use the 'jsonc' language id for all JSON files

Max Brunsfeld created 3 years ago

This way, comments are allowed by the language server.

Change summary

crates/language/src/language.rs  |  4 ++++
crates/project/src/project.rs    | 21 +++++++++++++++++----
crates/zed/src/languages/json.rs |  8 ++++++++
3 files changed, 29 insertions(+), 4 deletions(-)

Detailed changes

crates/language/src/language.rs

@@ -102,6 +102,10 @@ pub trait LspAdapter: 'static + Send + Sync {
     fn disk_based_diagnostics_progress_token(&self) -> Option<&'static str> {
         None
     }
+
+    fn id_for_language(&self, _name: &str) -> Option<String> {
+        None
+    }
 }
 
 #[derive(Clone, Debug, PartialEq, Eq)]

crates/project/src/project.rs

@@ -1132,7 +1132,19 @@ impl Project {
             if file.is_local() {
                 let uri = lsp::Url::from_file_path(file.abs_path(cx)).unwrap();
                 let initial_snapshot = buffer.text_snapshot();
-                let language_server = self.language_server_for_buffer(buffer, cx).cloned();
+
+                let mut language_server = None;
+                let mut language_id = None;
+                if let Some(language) = buffer.language() {
+                    let worktree_id = file.worktree_id(cx);
+                    if let Some(adapter) = language.lsp_adapter() {
+                        language_id = adapter.id_for_language(language.name().as_ref());
+                        language_server = self
+                            .language_servers
+                            .get(&(worktree_id, adapter.name()))
+                            .cloned();
+                    }
+                }
 
                 if let Some(local_worktree) = file.worktree.read(cx).as_local() {
                     if let Some(diagnostics) = local_worktree.diagnostics_for_path(file.path()) {
@@ -1147,7 +1159,7 @@ impl Project {
                             lsp::DidOpenTextDocumentParams {
                                 text_document: lsp::TextDocumentItem::new(
                                     uri,
-                                    Default::default(),
+                                    language_id.unwrap_or_default(),
                                     0,
                                     initial_snapshot.text(),
                                 ),
@@ -1437,7 +1449,7 @@ impl Project {
 
                     this.update(&mut cx, |this, cx| {
                         this.language_servers
-                            .insert(key.clone(), (adapter, language_server.clone()));
+                            .insert(key.clone(), (adapter.clone(), language_server.clone()));
                         this.language_server_statuses.insert(
                             server_id,
                             LanguageServerStatus {
@@ -1494,12 +1506,13 @@ impl Project {
                                     .or_insert_with(|| vec![(0, buffer.text_snapshot())]);
                                 let (version, initial_snapshot) = versions.last().unwrap();
                                 let uri = lsp::Url::from_file_path(file.abs_path(cx)).unwrap();
+                                let language_id = adapter.id_for_language(language.name().as_ref());
                                 language_server
                                     .notify::<lsp::notification::DidOpenTextDocument>(
                                         lsp::DidOpenTextDocumentParams {
                                             text_document: lsp::TextDocumentItem::new(
                                                 uri,
-                                                Default::default(),
+                                                language_id.unwrap_or_default(),
                                                 *version,
                                                 initial_snapshot.text(),
                                             ),

crates/zed/src/languages/json.rs

@@ -127,4 +127,12 @@ impl LspAdapter for JsonLspAdapter {
             "provideFormatter": true
         }))
     }
+
+    fn id_for_language(&self, name: &str) -> Option<String> {
+        if name == "JSON" {
+            Some("jsonc".into())
+        } else {
+            None
+        }
+    }
 }