temp fix for then using keyword

jeff-hykin · jeff-hykin · commit 58662491824b · 2019-05-25T11:56:20.000-04:00
diff --git a/cpp/generate.rb b/cpp/generate.rb
@@ -152,6 +152,7 @@ def generateBlockFinder( name:"", tag_as:"", start_pattern:nil, needs_semicolon:
             :static_assert,
             :other_keywords,
             :memory_operators,
+            :using_name,
             :the_this_keyword,
             :language_constants,
             :template_isolated_definition,
@@ -312,6 +313,7 @@ def generateBlockFinder( name:"", tag_as:"", start_pattern:nil, needs_semicolon:
 #
 # Keywords and Keyword-ish things
 #
+    cpp_grammar[:using_name] = newPattern(match: /using/, tag_as: "keyword.other.using.directive").then(@spaces).lookAheadToAvoid(/namespace\b/)
     cpp_grammar[:functional_specifiers_pre_parameters] = newPattern(
         match: variableBounds[ @cpp_tokens.that(:isFunctionSpecifier) ],
         tag_as: "storage.modifier.specificer.functional.pre-parameters.$match"
@@ -466,10 +468,7 @@ def generateBlockFinder( name:"", tag_as:"", start_pattern:nil, needs_semicolon:
                         :string_context_c,
                     ],
                 ),
-                newPattern(match: /using/, tag_as: "keyword.other.using.directive").then(@spaces).then(
-                    match: variable_name,
-                    tag_as: "entity.name.namespace",
-                ),
+                :using_name,
                 newPattern(match: /,/, tag_as: "punctuation.separator.attribute"),
                 newPattern(match: /:/, tag_as: "punctuation.accessor.attribute"),
                 newPattern(
@@ -1187,7 +1186,7 @@ def generateBlockFinder( name:"", tag_as:"", start_pattern:nil, needs_semicolon:
                         tag_as: "storage.modifier.inline"
                     )
                 )
-        ]
+        ],
         )
 
 #
diff --git a/syntaxes/cpp.tmLanguage.json b/syntaxes/cpp.tmLanguage.json
@@ -43,6 +43,9 @@
     {
       "include": "#memory_operators"
     },
+    {
+      "include": "#using_name"
+    },
     {
       "include": "#the_this_keyword"
     },
@@ -735,6 +738,14 @@
         }
       ]
     },
+    "using_name": {
+      "match": "(using)\\s+(?!namespace\\b)",
+      "captures": {
+        "1": {
+          "name": "keyword.other.using.directive.cpp"
+        }
+      }
+    },
     "functional_specifiers_pre_parameters": {
       "match": "(?<!\\w)(?:inline|constexpr|mutable|friend|explicit|virtual)(?!\\w)",
       "name": "storage.modifier.specificer.functional.pre-parameters.$0.cpp"
@@ -952,15 +963,7 @@
           ]
         },
         {
-          "match": "(using)\\s+((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*(?!\\w))",
-          "captures": {
-            "1": {
-              "name": "keyword.other.using.directive.cpp"
-            },
-            "2": {
-              "name": "entity.name.namespace.cpp"
-            }
-          }
+          "include": "#using_name"
         },
         {
           "match": ",",
@@ -1014,15 +1017,7 @@
           ]
         },
         {
-          "match": "(using)\\s+((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*(?!\\w))",
-          "captures": {
-            "1": {
-              "name": "keyword.other.using.directive.cpp"
-            },
-            "2": {
-              "name": "entity.name.namespace.cpp"
-            }
-          }
+          "include": "#using_name"
         },
         {
           "match": ",",
@@ -1076,15 +1071,7 @@
           ]
         },
         {
-          "match": "(using)\\s+((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*(?!\\w))",
-          "captures": {
-            "1": {
-              "name": "keyword.other.using.directive.cpp"
-            },
-            "2": {
-              "name": "entity.name.namespace.cpp"
-            }
-          }
+          "include": "#using_name"
         },
         {
           "match": ",",
@@ -1138,15 +1125,7 @@
           ]
         },
         {
-          "match": "(using)\\s+((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*(?!\\w))",
-          "captures": {
-            "1": {
-              "name": "keyword.other.using.directive.cpp"
-            },
-            "2": {
-              "name": "entity.name.namespace.cpp"
-            }
-          }
+          "include": "#using_name"
         },
         {
           "match": ",",
diff --git a/syntaxes/cpp.tmLanguage.yaml b/syntaxes/cpp.tmLanguage.yaml
@@ -18,6 +18,7 @@
 - include: "#static_assert"
 - include: "#other_keywords"
 - include: "#memory_operators"
+- include: "#using_name"
 - include: "#the_this_keyword"
 - include: "#language_constants"
 - include: "#template_isolated_definition"
@@ -369,6 +370,11 @@
         name: punctuation.section.arguments.end.bracket.round.decltype.cpp
     patterns:
     - include: "#evaluation_context"
+  using_name:
+    match: "(using)\\s+(?!namespace\\b)"
+    captures:
+      '1':
+        name: keyword.other.using.directive.cpp
   functional_specifiers_pre_parameters:
     match: "(?<!\\w)(?:inline|constexpr|mutable|friend|explicit|virtual)(?!\\w)"
     name: storage.modifier.specificer.functional.pre-parameters.$0.cpp
@@ -499,12 +505,7 @@
       patterns:
       - include: "#attributes_context"
       - include: "#string_context_c"
-    - match: "(using)\\s+((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*(?!\\w))"
-      captures:
-        '1':
-          name: keyword.other.using.directive.cpp
-        '2':
-          name: entity.name.namespace.cpp
+    - include: "#using_name"
     - match: ","
       name: punctuation.separator.attribute.cpp
     - match: ":"
@@ -531,12 +532,7 @@
       patterns:
       - include: "#attributes_context"
       - include: "#string_context_c"
-    - match: "(using)\\s+((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*(?!\\w))"
-      captures:
-        '1':
-          name: keyword.other.using.directive.cpp
-        '2':
-          name: entity.name.namespace.cpp
+    - include: "#using_name"
     - match: ","
       name: punctuation.separator.attribute.cpp
     - match: ":"
@@ -563,12 +559,7 @@
       patterns:
       - include: "#attributes_context"
       - include: "#string_context_c"
-    - match: "(using)\\s+((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*(?!\\w))"
-      captures:
-        '1':
-          name: keyword.other.using.directive.cpp
-        '2':
-          name: entity.name.namespace.cpp
+    - include: "#using_name"
     - match: ","
       name: punctuation.separator.attribute.cpp
     - match: ":"
@@ -595,12 +586,7 @@
       patterns:
       - include: "#attributes_context"
       - include: "#string_context_c"
-    - match: "(using)\\s+((?<!\\w)(?:[a-zA-Z_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F]))(?:(?:[a-zA-Z0-9_]|(?:\\\\u[0-9a-fA-F]{4}|\\\\U000[0-9a-fA-F])))*(?!\\w))"
-      captures:
-        '1':
-          name: keyword.other.using.directive.cpp
-        '2':
-          name: entity.name.namespace.cpp
+    - include: "#using_name"
     - match: ","
       name: punctuation.separator.attribute.cpp
     - match: ":"
diff --git a/test/fixtures/vscode/misc001.cpp b/test/fixtures/vscode/misc001.cpp
@@ -0,0 +1,36 @@
+#include "compiler/rule.h"
+#include "compiler/util/hash_combine.h"
+
+namespace tree_sitter {
+namespace rules {
+    
+using std::move;
+using std::vector;
+using until::hash_combine;
+
+Rule::Rule(const Rule &other) : blank_(Blank{}), type(BlankType) {
+    *this = other;
+}
+
+static void destroy_value(Rule *rule) {
+    switch (rule->type) {
+        case Rule::BlankType: return rule->blank.~Blank();
+    }
+}
+
+Rule &Rule::operator=(const Rule &other) {
+    destroy_value(this);
+    type = other.type;
+    switch(type) {
+        case BlankType:
+            new (&blank_) Blank(other.blank);
+            break;
+        case CharacterSetType:
+            new (&charater_set_) CharacterSet(other.character_set_);
+            break;
+    }
+}
+
+}
+    
+}
diff --git a/test/specs/issues/002.cpp.yaml b/test/specs/issues/002.cpp.yaml
@@ -69,7 +69,8 @@
 - source: '::'
   scopes:
     - punctuation.separator.namespace.access
-    - punctuation.separator.scope-resolution.function.definition.operator-overload
+    - >-
+      punctuation.separator.scope-resolution.function.definition.operator-overload
 - source: string &
   scopesEnd:
     - entity.name.operator.overloadee
diff --git a/test/specs/issues/055.cpp.yaml b/test/specs/issues/055.cpp.yaml
@@ -49,7 +49,7 @@
 - source: (
   scopes:
     - punctuation.section.parameters.begin.bracket.round
-- source: 'enum'
+- source: enum
   scopesBegin:
     - meta.function.definition.parameters
     - meta.block.enum
@@ -67,7 +67,7 @@
   scopes:
     - punctuation.separator.namespace.access
     - punctuation.separator.scope-resolution
-- source: 'baz quix)'
+- source: baz quix)
   scopesEnd:
     - meta.head.enum
 - source: ;
diff --git a/test/specs/test.cpp.yaml b/test/specs/test.cpp.yaml
@@ -45,7 +45,7 @@
 - source: ' a comment /* no nest */'
   scopesEnd:
     - comment.line.double-slash
-- source: '/*'
+- source: /*
   scopesBegin:
     - comment.block
   scopes:
@@ -54,5 +54,3 @@
 - source: '*/'
   scopes:
     - punctuation.definition.comment.end
-  scopesEnd:
-    - comment.block
diff --git a/test/specs/vscode/misc001.cpp.yaml b/test/specs/vscode/misc001.cpp.yaml

Original file line number	Diff line number	Diff line change
`@@ -152,6 +152,7 @@ def generateBlockFinder( name:"", tag_as:"", start_pattern:nil, needs_semicolon:`
`152`	`152`	`:static_assert,`
`153`	`153`	`:other_keywords,`
`154`	`154`	`:memory_operators,`
	`155`	`+ :using_name,`
`155`	`156`	`:the_this_keyword,`
`156`	`157`	`:language_constants,`
`157`	`158`	`:template_isolated_definition,`
`@@ -312,6 +313,7 @@ def generateBlockFinder( name:"", tag_as:"", start_pattern:nil, needs_semicolon:`
`312`	`313`	`#`
`313`	`314`	`# Keywords and Keyword-ish things`
`314`	`315`	`#`
	`316`	`+ cpp_grammar[:using_name] = newPattern(match: /using/, tag_as: "keyword.other.using.directive").then(@spaces).lookAheadToAvoid(/namespace\b/)`
`315`	`317`	`cpp_grammar[:functional_specifiers_pre_parameters] = newPattern(`
`316`	`318`	`match: variableBounds[ @cpp_tokens.that(:isFunctionSpecifier) ],`
`317`	`319`	`tag_as: "storage.modifier.specificer.functional.pre-parameters.$match"`
`@@ -466,10 +468,7 @@ def generateBlockFinder( name:"", tag_as:"", start_pattern:nil, needs_semicolon:`
`466`	`468`	`:string_context_c,`
`467`	`469`	`],`
`468`	`470`	`),`
`469`		`- newPattern(match: /using/, tag_as: "keyword.other.using.directive").then(@spaces).then(`
`470`		`- match: variable_name,`
`471`		`- tag_as: "entity.name.namespace",`
`472`		`- ),`
	`471`	`+ :using_name,`
`473`	`472`	`newPattern(match: /,/, tag_as: "punctuation.separator.attribute"),`
`474`	`473`	`newPattern(match: /:/, tag_as: "punctuation.accessor.attribute"),`
`475`	`474`	`newPattern(`
`@@ -1187,7 +1186,7 @@ def generateBlockFinder( name:"", tag_as:"", start_pattern:nil, needs_semicolon:`
`1187`	`1186`	`tag_as: "storage.modifier.inline"`
`1188`	`1187`	`)`
`1189`	`1188`	`)`
`1190`		`- ]`
	`1189`	`+ ],`
`1191`	`1190`	`)`
`1192`	`1191`
`1193`	`1192`	`#`