Add cpp/locals.scm

queries/cpp/highlights.scm

@@ -61,7 +61,11 @@
  (match? @constructor "^[A-Z]"))
 
 (auto) @keyword
-(class_specifier)
+
+;; Parameters
+; normals
+(parameter_list
+  (parameter_declaration) @parameter)
 
 ; Constants
 
@@ -77,14 +81,14 @@
 "catch" @exception
 "class" @keyword
 "constexpr" @keyword
-"delete" @operator
+"delete" @keyword
 "explicit" @keyword
 "final" @exception
 "friend" @keyword
 "mutable" @keyword
 "namespace" @keyword
 "noexcept" @keyword
-"new" @operator
+"new" @keyword
 "override" @keyword
 "private" @keyword
 "protected" @keyword
@@ -95,3 +99,4 @@
 "typename" @keyword
 "using" @keyword
 "virtual" @keyword
+"::" @operator

queries/cpp/locals.scm

@@ -0,0 +1,49 @@
+
+;; Class / struct defintions
+(class_specifier) @scope
+(struct_specifier) @scope
+
+
+(struct_specifier
+  name: (type_identifier) @definition.type) 
+
+(struct_specifier
+  name: (scoped_type_identifier
+          name: (type_identifier) @definition.type) ) 
+
+(class_specifier
+  name: (type_identifier) @definition.type) 
+
+(class_specifier
+  name: (scoped_type_identifier
+          name: (type_identifier) @definition.type) ) 
+
+;; Function defintions
+(template_function
+  name: (identifier) @definition.function) @scope
+
+(template_method
+  name: (field_identifier) @definition.method) @scope
+
+(template_function
+  name: (scoped_identifier
+    name: (identifier) @definition.function)) @scope
+
+(function_declarator
+  declarator: (scoped_identifier
+                name: (type_identifier) @definition.function)) @scope
+
+(field_declaration
+        declarator: (function_declarator
+                       (field_identifier) @definition.method))
+
+(lambda_expression) @scope
+
+;; Control structures
+(try_statement
+  body: (*) @scope)
+
+(catch_clause) @scope
+
+(destructor_name
+  name: (*) @constructor)