Unnamed repository; edit this file 'description' to name the repository.
Update scss and highlights (#13414)
Erasin Wang 10 months ago
parent 0815b52 · commit 52d4d77
-rw-r--r--languages.toml2
-rw-r--r--runtime/queries/scss/highlights.scm106
2 files changed, 63 insertions, 45 deletions
diff --git a/languages.toml b/languages.toml
index db997ac7..6f26701f 100644
--- a/languages.toml
+++ b/languages.toml
@@ -887,7 +887,7 @@ source = { git = "https://github.com/tree-sitter/tree-sitter-typescript", rev =
name = "css"
scope = "source.css"
injection-regex = "css"
-file-types = ["css", "scss"]
+file-types = ["css"]
block-comment-tokens = { start = "/*", end = "*/" }
language-servers = [ "vscode-css-language-server" ]
auto-format = true
diff --git a/runtime/queries/scss/highlights.scm b/runtime/queries/scss/highlights.scm
index eb361f96..e3818fb6 100644
--- a/runtime/queries/scss/highlights.scm
+++ b/runtime/queries/scss/highlights.scm
@@ -1,47 +1,64 @@
[(comment) (single_line_comment)] @comment
-"~" @operator
-">" @operator
-"+" @operator
-"-" @operator
-"*" @operator
-"/" @operator
-"=" @operator
-"^=" @operator
-"|=" @operator
-"~=" @operator
-"$=" @operator
-"*=" @operator
-
-"in" @operator
-"and" @operator
-"or" @operator
-"not" @operator
-"only" @operator
-
-"@apply" @constant.builtin
-"@at-root" @constant.builtin
-"@charset" @constant.builtin
-"@debug" @constant.builtin
-"@each" @keyword.control.repeat
-"@else" @keyword.control.conditional
-"@error" @constant.builtin
-"@extend" @constant.builtin
-"@for" @keyword.control.repeat
-"@forward" @keyword.control.import
+[
+ "~"
+ ">"
+ "+"
+ "-"
+ "*"
+ "/"
+ "="
+ "^="
+ "|="
+ "~="
+ "$="
+ "*="
+] @operator
+
+[
+ "in"
+ "and"
+ "or"
+ "not"
+ "only"
+] @operator.control
+
+[
+ "@apply"
+ "@at-root"
+ "@charset"
+ "@debug"
+ "@error"
+ "@extend"
+ "@keyframes"
+ "@media"
+ "@mixin"
+ "@supports"
+ "@warn"
+] @constant.builtin
+
+[
+ "@import"
+ "@include"
+ "@forward"
+ "@use"
+] @keyword.control.import
+
+[
+ "@if"
+ "@else"
+] @keyword.control.conditional
+
+[
+ "@each"
+ "@for"
+ "@while"
+] @keyword.control.repeat
+
+"@return" @keyword.control.return
+
"@function" @function.method
-"@if" @keyword.control.conditional
-"@import" @keyword.control.import
-"@include" @keyword.control.import
-"@keyframes" @constant.builtin
-"@media" @constant.builtin
-"@mixin" @constant.builtin
"@namespace" @namespace
-"@return" @keyword.control.return
-"@supports" @constant.builtin
-"@use" @keyword.control.import
-"@warn" @constant.builtin
-"@while" @keyword.control.repeat
(property_name) @variable.other.member
@@ -58,10 +75,11 @@
(pseudo_class_selector) @attribute
(identifier) @variable
-(class_name) @variable
-(id_name) @variable
-(namespace_name) @variable
-(feature_name) @variable
+(class_name) @label
+(id_name) @label
+(namespace_name) @namespace
+
+(feature_name) @variable.other.member
(variable) @variable
(variable_name) @variable.other.member
(variable_value) @variable.other.member