update semantic token

Author: CppCXY

crates/emmylua_ls/src/handlers/semantic_token/build_semantic_tokens.rs

@@ -118,7 +118,16 @@ fn build_tokens_semantic_token(
             builder.push(token, SemanticTokenType::OPERATOR);
         }
         LuaTokenKind::TkLeftBrace | LuaTokenKind::TkRightBrace => {
-            builder.push(token, SemanticTokenType::OPERATOR);
+            if let Some(parent) = token.parent()
+                && !matches!(
+                    parent.kind().into(),
+                    LuaSyntaxKind::TableArrayExpr
+                        | LuaSyntaxKind::TableEmptyExpr
+                        | LuaSyntaxKind::TableFieldAssign
+                )
+            {
+                builder.push(token, SemanticTokenType::OPERATOR);
+            }
         }
         LuaTokenKind::TkColon => {
             if let Some(parent) = token.parent()
@@ -128,11 +137,27 @@ fn build_tokens_semantic_token(
             }
         }
         // delimiter
-        LuaTokenKind::TkLeftBracket
-        | LuaTokenKind::TkRightBracket
-        | LuaTokenKind::TkLeftParen
-        | LuaTokenKind::TkRightParen => {
-            if client_id.is_neovim() {
+        LuaTokenKind::TkLeftBracket | LuaTokenKind::TkRightBracket => {
+            if let Some(parent) = token.parent()
+                && matches!(
+                    parent.kind().into(),
+                    LuaSyntaxKind::TableFieldAssign | LuaSyntaxKind::IndexExpr
+                )
+            {
+                builder.push(token, CustomSemanticTokenType::DELIMITER);
+            } else {
+                builder.push(token, SemanticTokenType::OPERATOR);
+            }
+        }
+        LuaTokenKind::TkLeftParen | LuaTokenKind::TkRightParen => {
+            if let Some(parent) = token.parent()
+                && matches!(
+                    parent.kind().into(),
+                    LuaSyntaxKind::ParamList
+                        | LuaSyntaxKind::CallArgList
+                        | LuaSyntaxKind::ParenExpr
+                )
+            {
                 builder.push(token, CustomSemanticTokenType::DELIMITER);
             } else {
                 builder.push(token, SemanticTokenType::OPERATOR);

crates/emmylua_ls/src/handlers/semantic_token/mod.rs

@@ -11,7 +11,10 @@ use lsp_types::{
     SemanticTokensOptions, SemanticTokensParams, SemanticTokensResult,
     SemanticTokensServerCapabilities, ServerCapabilities,
 };
-pub use semantic_token_builder::{SEMANTIC_TOKEN_MODIFIERS, SEMANTIC_TOKEN_TYPES};
+#[allow(unused)]
+pub use semantic_token_builder::{
+    CustomSemanticTokenType, SEMANTIC_TOKEN_MODIFIERS, SEMANTIC_TOKEN_TYPES,
+};
 use tokio_util::sync::CancellationToken;
 
 use super::RegisterCapabilities;

crates/emmylua_ls/src/handlers/test/semantic_token_test.rs

@@ -1,6 +1,9 @@
 #[cfg(test)]
 mod tests {
-    use crate::handlers::test_lib::{ProviderVirtualWorkspace, VirtualSemanticToken, check};
+    use crate::handlers::{
+        semantic_token::CustomSemanticTokenType,
+        test_lib::{ProviderVirtualWorkspace, VirtualSemanticToken, check},
+    };
     use googletest::prelude::*;
     use lsp_types::{SemanticTokenModifier, SemanticTokenType};
     use std::collections::HashSet;
@@ -90,7 +93,7 @@ mod tests {
                     line: 4,
                     start: 32,
                     length: 1,
-                    token_type: SemanticTokenType::OPERATOR,
+                    token_type: CustomSemanticTokenType::DELIMITER,
                     token_modifier: HashSet::new(),
                 },
                 VirtualSemanticToken {
@@ -104,7 +107,7 @@ mod tests {
                     line: 4,
                     start: 34,
                     length: 1,
-                    token_type: SemanticTokenType::OPERATOR,
+                    token_type: CustomSemanticTokenType::DELIMITER,
                     token_modifier: HashSet::new(),
                 },
                 VirtualSemanticToken {
@@ -153,7 +156,7 @@ mod tests {
                     line: 4,
                     start: 54,
                     length: 1,
-                    token_type: SemanticTokenType::OPERATOR,
+                    token_type: CustomSemanticTokenType::DELIMITER,
                     token_modifier: HashSet::new(),
                 },
                 VirtualSemanticToken {
@@ -167,7 +170,7 @@ mod tests {
                     line: 4,
                     start: 56,
                     length: 1,
-                    token_type: SemanticTokenType::OPERATOR,
+                    token_type: CustomSemanticTokenType::DELIMITER,
                     token_modifier: HashSet::new(),
                 },
             ],