runtime/queries/slang/highlights.scm

@@ -1,8 +1,8 @@
 ; inherits: c
 
 ; cpp
-((identifier) @variable.other.member
-  (#match? @variable.other.member "^m_.*$"))
+((identifier) @variable.member
+  (#match? @variable.member "^m_.*$"))
 
 (parameter_declaration
   declarator: (reference_declarator) @variable.parameter)
@@ -16,22 +16,27 @@
 (optional_parameter_declaration
   declarator: (_) @variable.parameter)
 
+;(field_expression) @variable.parameter ;; How to highlight this?
+((field_expression
+  (field_identifier) @function.method) @_parent
+  (#has-parent? @_parent template_method function_declarator))
+
 (field_declaration
-  (field_identifier) @variable.other.member)
+  (field_identifier) @variable.member)
 
 (field_initializer
-  (field_identifier) @variable.other.member)
+  (field_identifier) @property)
 
 (function_declarator
   declarator: (field_identifier) @function.method)
 
 (concept_definition
-  name: (identifier) @type)
+  name: (identifier) @type.definition)
 
 (alias_declaration
-  name: (type_identifier) @type)
+  name: (type_identifier) @type.definition)
 
-(namespace_identifier) @namespace
+(namespace_identifier) @module
 
 ((namespace_identifier) @type
   (#match? @type "^[%u]"))
@@ -49,7 +54,7 @@
   [
     (qualified_identifier)
     (identifier)
-  ] @namespace)
+  ] @module)
 
 (destructor_name
   (identifier) @function.method)
@@ -70,6 +75,13 @@
       (qualified_identifier
         (identifier) @function))))
 
+((qualified_identifier
+  (qualified_identifier
+    (qualified_identifier
+      (qualified_identifier
+        (identifier) @function)))) @_parent
+  (#has-ancestor? @_parent function_declarator))
+
 (function_declarator
   (template_function
     (identifier) @function))
@@ -83,41 +95,56 @@
 
 (call_expression
   (qualified_identifier
-    (identifier) @function))
+    (identifier) @function.call))
 
 
 (call_expression
   (qualified_identifier
     (qualified_identifier
-      (identifier) @function)))
+      (identifier) @function.call)))
 
 (call_expression
   (qualified_identifier
     (qualified_identifier
       (qualified_identifier
-        (identifier) @function))))
+        (identifier) @function.call))))
+
+((qualified_identifier
+  (qualified_identifier
+    (qualified_identifier
+      (qualified_identifier
+        (identifier) @function.call)))) @_parent
+  (#has-ancestor? @_parent call_expression))
 
 (call_expression
   (template_function
-    (identifier) @function))
+    (identifier) @function.call))
 
 (call_expression
   (qualified_identifier
     (template_function
-      (identifier) @function)))
+      (identifier) @function.call)))
 
 (call_expression
   (qualified_identifier
     (qualified_identifier
       (template_function
-        (identifier) @function))))
+        (identifier) @function.call))))
 
 (call_expression
   (qualified_identifier
     (qualified_identifier
       (qualified_identifier
         (template_function
-          (identifier) @function)))))
+          (identifier) @function.call)))))
+
+((qualified_identifier
+  (qualified_identifier
+    (qualified_identifier
+      (qualified_identifier
+        (template_function
+          (identifier) @function.call))))) @_parent
+  (#has-ancestor? @_parent call_expression))
 
 ; methods
 (function_declarator
@@ -126,7 +153,7 @@
 
 (call_expression
   (field_expression
-    (field_identifier) @function.method))
+    (field_identifier) @function.method.call))
 
 ; constructors
 ((function_declarator
@@ -160,9 +187,9 @@
 (null
   "nullptr" @constant.builtin)
 
-(true) @constant.builtin.boolean
+(true) @boolean
 
-(false) @constant.builtin.boolean
+(false) @boolean
 
 ; Literals
 (raw_string_literal) @string
@@ -173,7 +200,7 @@
   "catch"
   "noexcept"
   "throw"
-] @keyword.control.exception
+] @keyword.exception
 
 [
   "decltype"
@@ -191,13 +218,13 @@
   "template"
   "typename"
   "concept"
-] @keyword.storage.type
+] @keyword.type
 
 [
   "co_await"
   "co_yield"
   "co_return"
-] @keyword
+] @keyword.coroutine
 
 [
   "public"
@@ -205,7 +232,7 @@
   "protected"
   "final"
   "virtual"
-] @keyword.storage.modifier
+] @keyword.modifier
 
 [
   "new"
@@ -266,7 +293,7 @@
   "triangleadj"
   "lineadj"
   "triangle"
-] @keyword
+] @keyword.modifier
 
 ((identifier) @variable.builtin
   (#match? @variable.builtin "^SV_"))
@@ -300,9 +327,9 @@
   "set"
 ] @function.builtin
 
-(call_expression) @function
+(call_expression) @function.call
 
-(call_expression (identifier)) @function
+(call_expression (identifier)) @function.call
 
 ((call_expression
   function: (identifier) @function.builtin)
@@ -365,7 +392,7 @@
 [
   "__exported"
   "import"
-] @keyword.control.import
+] @keyword.import
 
 (property_declaration
-  (identifier) @variable.other.member)
+  (identifier) @property)

runtime/queries/slang/indents.scm

@@ -3,4 +3,4 @@
 [
   (interface_specifier)
   (extension_specifier)
-] @indent
+] @indent.begin

runtime/queries/slang/textobjects.scm

@@ -1,30 +0,0 @@
-(function_definition
-  body: (_) @function.inside) @function.around
-
-(struct_specifier
-  body: (_) @class.inside) @class.around
-
-(interface_specifier
-  body: (_) @class.inside) @class.around
-
-(enum_specifier
-  body: (_) @class.inside) @class.around
-
-(union_specifier
-  body: (_) @class.inside) @class.around
-
-(parameter_list 
-  ((_) @parameter.inside . ","? @parameter.around) @parameter.around)
-
-(argument_list
-  ((_) @parameter.inside . ","? @parameter.around) @parameter.around)
-
-(comment) @comment.inside
-
-(comment)+ @comment.around
-
-(enumerator
-  (_) @entry.inside) @entry.around
-
-(initializer_list
-  (_) @entry.around)