Merge branch 'main' into pr/25325

zed-industries · Feb 21, 2025 · d5c4252 · d5c4252
2 parents 34de10c + 7deceb6
commit d5c4252
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 5 deletions.
diff --git a/crates/languages/src/go/highlights.scm b/crates/languages/src/go/highlights.scm
@@ -2,6 +2,7 @@
 
 (type_identifier) @type
 (field_identifier) @variable.member
+(package_identifier) @namespace
 
 (keyed_element
   .
@@ -20,6 +21,15 @@
 
 (method_declaration
   name: (field_identifier) @function.method)
+(method_elem
+  name: (field_identifier) @function.method)
+
+[
+  ";"
+  "."
+  ","
+  ":"
+] @punctuation.delimiter
 
 [
   "("

diff --git a/crates/languages/src/json/highlights.scm b/crates/languages/src/json/highlights.scm
@@ -13,9 +13,12 @@
   (false)
 ] @boolean
 
+(null) @constant.builtin
+
 [
-  (null)
-] @constant
+  ","
+  ":"
+] @punctuation.delimiter
 
 [
   "{"

diff --git a/crates/languages/src/jsonc/highlights.scm b/crates/languages/src/jsonc/highlights.scm
@@ -13,9 +13,12 @@
   (false)
 ] @boolean
 
+(null) @constant.builtin
+
 [
-  (null)
-] @constant
+  ","
+  ":"
+] @punctuation.delimiter
 
 [
   "{"

diff --git a/crates/lsp/src/lsp.rs b/crates/lsp/src/lsp.rs
@@ -791,7 +791,7 @@ impl LanguageServer {
                 }),
             },
             trace: None,
-            workspace_folders: None,
+            workspace_folders: Some(vec![]),
             client_info: release_channel::ReleaseChannel::try_global(cx).map(|release_channel| {
                 ClientInfo {
                     name: release_channel.display_name().to_string(),