Merge pull request #609 from j-cortial/cpp/fix/type-alias

Cpp/fix/type alias

Author: jeff-hykin

autogenerated/cpp.tmLanguage.json

@@ -120,7 +120,6 @@
     - keyword.other.using.directive
 - source: type
   scopes:
-    - meta.qualified_type
     - entity.name.type
 - source: '='
   scopes:

language_examples/#018.spec.yaml

@@ -18,7 +18,6 @@
     - keyword.other.using.directive
 - source: A
   scopes:
-    - meta.qualified_type
     - entity.name.type
 - source: '='
   scopes:

language_examples/#051.spec.yaml

@@ -5,7 +5,6 @@
     - keyword.other.using.directive
 - source: type
   scopes:
-    - meta.qualified_type
     - entity.name.type
 - source: '='
   scopes:

language_examples/#283.spec.yaml

@@ -257,23 +257,35 @@
   scopesEnd:
     - comment.block.documentation
 - source: using
+  scopesBegin:
+    - meta.declaration.type.alias
   scopes:
     - keyword.other.using.directive
-- source: 'error '
+- source: error
+  scopes:
+    - entity.name.type
 - source: '='
   scopes:
     - keyword.operator.assignment
 - source: std
+  scopesBegin:
+    - meta.qualified_type
   scopes:
     - entity.name.scope-resolution
 - source: '::'
   scopes:
     - punctuation.separator.namespace.access
     - punctuation.separator.scope-resolution
 - source: errc
+  scopes:
+    - entity.name.type
+  scopesEnd:
+    - meta.qualified_type
 - source: ;
   scopes:
     - punctuation.terminator.statement
+  scopesEnd:
+    - meta.declaration.type.alias
 - source: namespace
   scopesBegin:
     - meta.block.namespace
@@ -346,7 +358,6 @@
     - keyword.other.using.directive
 - source: milliseconds
   scopes:
-    - meta.qualified_type
     - entity.name.type
 - source: '='
   scopes:

language_examples/#442.spec.yaml

@@ -482,7 +482,6 @@
     - keyword.other.using.directive
 - source: traits_type
   scopes:
-    - meta.qualified_type
     - entity.name.type
 - source: '='
   scopes:
@@ -499,7 +498,6 @@
     - keyword.other.using.directive
 - source: value_type
   scopes:
-    - meta.qualified_type
     - entity.name.type
 - source: '='
   scopes:
@@ -516,7 +514,6 @@
     - keyword.other.using.directive
 - source: allocator_type
   scopes:
-    - meta.qualified_type
     - entity.name.type
 - source: '='
   scopes:
@@ -533,7 +530,6 @@
     - keyword.other.using.directive
 - source: size_type
   scopes:
-    - meta.qualified_type
     - entity.name.type
 - source: '='
   scopes:
@@ -586,7 +582,6 @@
     - keyword.other.using.directive
 - source: difference_type
   scopes:
-    - meta.qualified_type
     - entity.name.type
 - source: '='
   scopes:
@@ -643,7 +638,6 @@
     - keyword.other.using.directive
 - source: reference
   scopes:
-    - meta.qualified_type
     - entity.name.type
 - source: '='
   scopes:
@@ -663,7 +657,6 @@
     - keyword.other.using.directive
 - source: const_reference
   scopes:
-    - meta.qualified_type
     - entity.name.type
 - source: '='
   scopes:
@@ -686,7 +679,6 @@
     - keyword.other.using.directive
 - source: pointer
   scopes:
-    - meta.qualified_type
     - entity.name.type
 - source: '='
   scopes:
@@ -739,7 +731,6 @@
     - keyword.other.using.directive
 - source: const_pointer
   scopes:
-    - meta.qualified_type
     - entity.name.type
 - source: '='
   scopes:
@@ -796,7 +787,6 @@
     - keyword.other.using.directive
 - source: iterator
   scopes:
-    - meta.qualified_type
     - entity.name.type
 - source: '='
   scopes:
@@ -816,7 +806,6 @@
     - keyword.other.using.directive
 - source: const_iterator
   scopes:
-    - meta.qualified_type
     - entity.name.type
 - source: '='
   scopes:
@@ -839,7 +828,6 @@
     - keyword.other.using.directive
 - source: reverse_iterator
   scopes:
-    - meta.qualified_type
     - entity.name.type
 - source: '='
   scopes:
@@ -879,7 +867,6 @@
     - keyword.other.using.directive
 - source: const_reverse_iterator
   scopes:
-    - meta.qualified_type
     - entity.name.type
 - source: '='
   scopes:
@@ -1048,7 +1035,6 @@
     - keyword.other.using.directive
 - source: _Sat
   scopes:
-    - meta.qualified_type
     - entity.name.type
 - source: '='
   scopes:
@@ -1088,7 +1074,6 @@
     - keyword.other.using.directive
 - source: _Sv
   scopes:
-    - meta.qualified_type
     - entity.name.type
 - source: '='
   scopes:
@@ -1135,7 +1120,6 @@
     - keyword.other.using.directive
 - source: _UCharT
   scopes:
-    - meta.qualified_type
     - entity.name.type
 - source: '='
   scopes:

language_examples/feature_basic_string_sso.spec.yaml

@@ -4871,7 +4871,6 @@
     - keyword.other.using.directive
 - source: type
   scopes:
-    - meta.qualified_type
     - entity.name.type
 - source: '='
   scopes:

language_examples/misc_000.spec.yaml

@@ -3012,7 +3012,6 @@
     - keyword.other.using.directive
 - source: type
   scopes:
-    - meta.qualified_type
     - entity.name.type
 - source: '='
   scopes:

language_examples/misc_005.spec.yaml

@@ -4871,7 +4871,6 @@
     - keyword.other.using.directive
 - source: type
   scopes:
-    - meta.qualified_type
     - entity.name.type
 - source: '='
   scopes:

language_examples/misc_006.spec.yaml

@@ -5,7 +5,6 @@
     - keyword.other.using.directive
 - source: A
   scopes:
-    - meta.qualified_type
     - entity.name.type
 - source: '='
   scopes:
@@ -22,7 +21,6 @@
     - keyword.other.using.directive
 - source: B
   scopes:
-    - meta.qualified_type
     - entity.name.type
 - source: '='
   scopes:
@@ -49,7 +47,6 @@
     - keyword.other.using.directive
 - source: C
   scopes:
-    - meta.qualified_type
     - entity.name.type
 - source: '='
   scopes:
@@ -108,7 +105,6 @@
     - keyword.other.using.directive
 - source: A
   scopes:
-    - meta.qualified_type
     - entity.name.type
 - source: '='
   scopes:
@@ -125,7 +121,6 @@
     - keyword.other.using.directive
 - source: B
   scopes:
-    - meta.qualified_type
     - entity.name.type
 - source: '='
   scopes:
@@ -152,7 +147,6 @@
     - keyword.other.using.directive
 - source: C
   scopes:
-    - meta.qualified_type
     - entity.name.type
 - source: '='
   scopes:
@@ -227,7 +221,6 @@
     - keyword.other.using.directive
 - source: A
   scopes:
-    - meta.qualified_type
     - entity.name.type
 - source: '='
   scopes:
@@ -244,7 +237,6 @@
     - keyword.other.using.directive
 - source: B
   scopes:
-    - meta.qualified_type
     - entity.name.type
 - source: '='
   scopes:
@@ -271,7 +263,6 @@
     - keyword.other.using.directive
 - source: C
   scopes:
-    - meta.qualified_type
     - entity.name.type
 - source: '='
   scopes:

language_examples/pr_161.spec.yaml

@@ -1019,8 +1019,13 @@ def generateBlockFinder( name:"", tag_as:"", start_pattern:nil, needs_semicolon:
         match: Pattern.new(
                 match:/using/,
                 tag_as: "keyword.other.using.directive",
-            ).maybe(@spaces).lookAheadToAvoid(/namespace/).then(
-                qualified_type
+            ).then(@spaces).lookAheadToAvoid(/namespace/).then(
+                Pattern.new(
+                    match: identifier,
+                    tag_as: "entity.name.type",
+                ),
+            ).maybe(@spaces).maybe(
+                inline_attribute
             ).maybe(@spaces).then(
                 assignment_operator
             ).maybe(@spaces).maybe(