Merge branch 'zed-industries:main' into hide-root

zed-industries · Feb 21, 2025 · d9da335 · d9da335
2 parents 20859ae + 144d8a1
commit d9da335
Show file tree

Hide file tree

Showing 10 changed files with 92 additions and 15 deletions.
diff --git a/crates/gpui/src/platform/windows/events.rs b/crates/gpui/src/platform/windows/events.rs
@@ -1249,6 +1249,7 @@ fn parse_syskeydown_msg_keystroke(wparam: WPARAM) -> Option<Keystroke> {
         VK_ESCAPE => "escape",
         VK_INSERT => "insert",
         VK_DELETE => "delete",
+        VK_APPS => "menu",
         _ => {
             let basic_key = basic_vkcode_to_string(vk_code, modifiers);
             if basic_key.is_some() {
@@ -1303,6 +1304,7 @@ fn parse_keydown_msg_keystroke(wparam: WPARAM) -> Option<KeystrokeOrModifier> {
         VK_ESCAPE => "escape",
         VK_INSERT => "insert",
         VK_DELETE => "delete",
+        VK_APPS => "menu",
         _ => {
             if is_modifier(VIRTUAL_KEY(vk_code)) {
                 return Some(KeystrokeOrModifier::Modifier(modifiers));

diff --git a/crates/languages/src/bash/highlights.scm b/crates/languages/src/bash/highlights.scm
@@ -4,11 +4,10 @@
   (heredoc_body)
   (heredoc_start)
   (ansi_c_string)
+  (word)
 ] @string
 
-(command_name) @function
-
-(variable_name) @property
+(variable_name) @variable
 
 [
   "case"
@@ -35,24 +34,67 @@
 (comment) @comment
 
 (function_definition name: (word) @function)
+(command_name (word) @function)
+
+[
+  (file_descriptor)
+  (number)
+] @number
 
-(file_descriptor) @number
+(regex) @string.regex
 
 [
   (command_substitution)
   (process_substitution)
   (expansion)
-]@embedded
+] @embedded
+
 
 [
   "$"
   "&&"
   ">"
   ">>"
+  ">&"
+  ">&-"
   "<"
   "|"
+  ":"
+  "//"
+  "/"
+  "%"
+  "%%"
+  "#"
+  "##"
+  "="
+  "=="
 ] @operator
 
+(test_operator) @keyword.operator
+
+[
+  ";"
+] @punctuation.delimiter
+
+[
+  "("
+  ")"
+  "{"
+  "}"
+  "["
+  "]"
+] @punctuation.bracket
+
+(simple_expansion
+  "$" @punctuation.special)
+(expansion
+  "${" @punctuation.special
+  "}" @punctuation.special) @embedded
+
+(command_substitution
+  "$(" @punctuation.special
+  ")" @punctuation.special)
+
 (
   (command (_) @constant)
   (#match? @constant "^-")

diff --git a/crates/languages/src/c/highlights.scm b/crates/languages/src/c/highlights.scm
@@ -102,8 +102,9 @@
 [
   (true)
   (false)
-  (null)
-] @constant
+] @boolean
+
+(null) @constant.builtin
 
 (identifier) @variable
 

diff --git a/crates/languages/src/cpp/highlights.scm b/crates/languages/src/cpp/highlights.scm
@@ -153,9 +153,12 @@ type :(primitive_type) @type.primitive
 [
   (true)
   (false)
+] @boolean
+
+[
   (null)
   ("nullptr")
-] @constant
+] @constant.builtin
 
 (number_literal) @number
 

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
 
 [
   "("
@@ -118,6 +128,9 @@
 [
   (true)
   (false)
+] @boolean
+
+[
   (nil)
   (iota)
 ] @constant.builtin

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

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

diff --git a/crates/languages/src/python/highlights.scm b/crates/languages/src/python/highlights.scm
@@ -95,9 +95,12 @@
 ; Literals
 
 [
-  (none)
   (true)
   (false)
+] @boolean
+
+[
+  (none)
   (ellipsis)
 ] @constant.builtin
 

diff --git a/crates/languages/src/rust/highlights.scm b/crates/languages/src/rust/highlights.scm
@@ -99,6 +99,7 @@
   "mod"
   "move"
   "pub"
+  "raw"
   "ref"
   "return"
   "static"
@@ -129,7 +130,7 @@
   (float_literal)
 ] @number
 
-(boolean_literal) @constant
+(boolean_literal) @boolean
 
 [
   (line_comment)

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(),