add highlighting for typedef when used before class/struct/union

Author: matter123

cpp/generate.rb

@@ -289,7 +289,7 @@ def blockFinderFor( name:"", tag_as:"", start_pattern:nil, needs_semicolon: true
         tag_as: "keyword.control.exception.$match"
         )
     cpp_grammar[:other_keywords] = newPattern(
-        match: variableBounds[ /(using|typedef)/ ],
+        match: variableBounds[ /(typedef)/ ],
         tag_as: "keyword.other.$match"
         )
     cpp_grammar[:the_this_keyword] = the_this_keyword = newPattern(
@@ -1283,7 +1283,7 @@ def blockFinderFor( name:"", tag_as:"", start_pattern:nil, needs_semicolon: true
         match: /final/,
         tag_as: "storage.type.modifier.final",
     )
-    generateClassOrStructBlockFinder = ->(name) do
+    generateClassOrStructBlockFinder = ->(name, tail_includes = [:$initial_context]) do
         return blockFinderFor(
             tag_as: "meta.block.#{name}",
             name: name,
@@ -1340,6 +1340,7 @@ def blockFinderFor( name:"", tag_as:"", start_pattern:nil, needs_semicolon: true
                 :comments_context,
             ],
             body_includes: [ :function_pointer, :constructor_context, :$initial_context ],
+            tail_includes: tail_includes
         )
     end
     cpp_grammar[:class_block] = generateClassOrStructBlockFinder["class"]
@@ -1357,7 +1358,26 @@ def blockFinderFor( name:"", tag_as:"", start_pattern:nil, needs_semicolon: true
         head_includes: [ :$initial_context ],
         secondary_includes: [ :$initial_context ]
         )
-
+    generateTypedefClassOrStructBlockFinder =-> (name) do
+        return PatternRange.new(
+            start_pattern: newPattern(
+                match: variableBounds[/typedef/],
+                tag_as: "keyword.other.typedef"
+            ).maybe(@spaces).lookAheadFor(variableBounds[/#{name}/]),
+            end_pattern: lookBehindFor(/;/),
+            includes: [
+                generateClassOrStructBlockFinder[name, [
+                    newPattern(
+                        match: variable_name,
+                        tag_as: "entity.name.type.alias"
+                    )
+                ]]
+            ]
+        )
+    end
+    cpp_grammar[:typedef_class] = generateTypedefClassOrStructBlockFinder["class"]
+    cpp_grammar[:typedef_struct] = generateTypedefClassOrStructBlockFinder["struct"]
+    cpp_grammar[:typedef_union] = generateTypedefClassOrStructBlockFinder["union"]
 #
 # preprocessor directives
 #
@@ -1727,6 +1747,9 @@ def blockFinderFor( name:"", tag_as:"", start_pattern:nil, needs_semicolon: true
             :using_namespace,
             :type_alias,
             :namespace_block,
+            :typedef_class,
+            :typedef_struct,
+            :typedef_union,
             :class_block,
             :struct_block,
             :union_block,

cpp/tags.txt

@@ -26,6 +26,7 @@ entity.name.function.preprocessor.cpp
 entity.name.operator.overloadee.cpp
 entity.name.tag.pragma-mark.cpp
 entity.name.type.$3.cpp
+entity.name.type.alias.cpp
 entity.name.type.cpp
 entity.name.type.enum.cpp
 entity.name.type.inherited.cpp
@@ -86,6 +87,7 @@ keyword.other.namespace.definition.cpp
 keyword.other.namespace.directive.cpp
 keyword.other.operator.overload.cpp
 keyword.other.static_assert.cpp
+keyword.other.typedef.cpp
 keyword.other.typename.cpp
 keyword.other.unit.binary.cpp
 keyword.other.unit.exponent.decimal.cpp