support ref/deref

matter123 · matter123 · commit 78b39d6e60de · 2019-05-21T19:17:31.000-07:00
diff --git a/cpp/generate.rb b/cpp/generate.rb
@@ -1367,10 +1367,11 @@ def blockFinderFor( name:"", tag_as:"", start_pattern:nil, needs_semicolon: true
             end_pattern: lookBehindFor(/;/),
             includes: [
                 generateClassOrStructBlockFinder[name, [
-                    newPattern(
+                    ref_deref_definition_pattern.then(
                         match: variable_name,
                         tag_as: "entity.name.type.alias"
-                    )
+                    ),
+                    /,/,
                 ]]
             ]
         )
diff --git a/syntaxes/cpp.tmLanguage.json b/syntaxes/cpp.tmLanguage.json
@@ -2964,8 +2964,21 @@
               "end": "[\\s\\n]*(?=;)",
               "patterns": [
                 {
-                  "match": "(?<!\\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)",
-                  "name": "entity.name.type.alias.cpp"
+                  "match": "(((?:\\*\\s*)*)((?:\\&\\s*?){0,2})\\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": {
+                    "2": {
+                      "name": "storage.modifier.pointer.cpp"
+                    },
+                    "3": {
+                      "name": "storage.modifier.reference.cpp"
+                    },
+                    "4": {
+                      "name": "entity.name.type.alias.cpp"
+                    }
+                  }
+                },
+                {
+                  "match": ","
                 }
               ]
             }
@@ -3090,8 +3103,21 @@
               "end": "[\\s\\n]*(?=;)",
               "patterns": [
                 {
-                  "match": "(?<!\\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)",
-                  "name": "entity.name.type.alias.cpp"
+                  "match": "(((?:\\*\\s*)*)((?:\\&\\s*?){0,2})\\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": {
+                    "2": {
+                      "name": "storage.modifier.pointer.cpp"
+                    },
+                    "3": {
+                      "name": "storage.modifier.reference.cpp"
+                    },
+                    "4": {
+                      "name": "entity.name.type.alias.cpp"
+                    }
+                  }
+                },
+                {
+                  "match": ","
                 }
               ]
             }
@@ -3216,8 +3242,21 @@
               "end": "[\\s\\n]*(?=;)",
               "patterns": [
                 {
-                  "match": "(?<!\\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)",
-                  "name": "entity.name.type.alias.cpp"
+                  "match": "(((?:\\*\\s*)*)((?:\\&\\s*?){0,2})\\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": {
+                    "2": {
+                      "name": "storage.modifier.pointer.cpp"
+                    },
+                    "3": {
+                      "name": "storage.modifier.reference.cpp"
+                    },
+                    "4": {
+                      "name": "entity.name.type.alias.cpp"
+                    }
+                  }
+                },
+                {
+                  "match": ","
                 }
               ]
             }
diff --git a/syntaxes/cpp.tmLanguage.yaml b/syntaxes/cpp.tmLanguage.yaml
@@ -1580,8 +1580,15 @@
         begin: "(?<=})[\\s\\n]*"
         end: "[\\s\\n]*(?=;)"
         patterns:
-        - match: "(?<!\\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)"
-          name: entity.name.type.alias.cpp
+        - match: "(((?:\\*\\s*)*)((?:\\&\\s*?){0,2})\\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:
+            '2':
+              name: storage.modifier.pointer.cpp
+            '3':
+              name: storage.modifier.reference.cpp
+            '4':
+              name: entity.name.type.alias.cpp
+        - match: ","
   typedef_struct:
     begin: "((?<!\\w)typedef(?!\\w))\\s*(?=(?<!\\w)struct(?!\\w))"
     beginCaptures:
@@ -1645,8 +1652,15 @@
         begin: "(?<=})[\\s\\n]*"
         end: "[\\s\\n]*(?=;)"
         patterns:
-        - match: "(?<!\\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)"
-          name: entity.name.type.alias.cpp
+        - match: "(((?:\\*\\s*)*)((?:\\&\\s*?){0,2})\\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:
+            '2':
+              name: storage.modifier.pointer.cpp
+            '3':
+              name: storage.modifier.reference.cpp
+            '4':
+              name: entity.name.type.alias.cpp
+        - match: ","
   typedef_union:
     begin: "((?<!\\w)typedef(?!\\w))\\s*(?=(?<!\\w)union(?!\\w))"
     beginCaptures:
@@ -1710,8 +1724,15 @@
         begin: "(?<=})[\\s\\n]*"
         end: "[\\s\\n]*(?=;)"
         patterns:
-        - match: "(?<!\\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)"
-          name: entity.name.type.alias.cpp
+        - match: "(((?:\\*\\s*)*)((?:\\&\\s*?){0,2})\\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:
+            '2':
+              name: storage.modifier.pointer.cpp
+            '3':
+              name: storage.modifier.reference.cpp
+            '4':
+              name: entity.name.type.alias.cpp
+        - match: ","
   hacky_fix_for_stray_directive:
     match: "(?<!\\w)#(?:endif|else|elif)(?!\\w)"
     name: keyword.control.directive.$0.cpp
diff --git a/test/fixtures/features/typedef_alias.cpp b/test/fixtures/features/typedef_alias.cpp
@@ -8,4 +8,7 @@ typedef class bar {
 
 typedef union foobar {
 
-} foobar;
+} foobar;
+typedef struct _OVERLAPPED {
+
+} OVERLAPPED, *LPOVERLAPPED;

Original file line number	Diff line number	Diff line change
`@@ -1367,10 +1367,11 @@ def blockFinderFor( name:"", tag_as:"", start_pattern:nil, needs_semicolon: true`
`1367`	`1367`	`end_pattern: lookBehindFor(/;/),`
`1368`	`1368`	`includes: [`
`1369`	`1369`	`generateClassOrStructBlockFinder[name, [`
`1370`		`- newPattern(`
	`1370`	`+ ref_deref_definition_pattern.then(`
`1371`	`1371`	`match: variable_name,`
`1372`	`1372`	`tag_as: "entity.name.type.alias"`
`1373`		`- )`
	`1373`	`+ ),`
	`1374`	`+ /,/,`
`1374`	`1375`	`]]`
`1375`	`1376`	`]`
`1376`	`1377`	`)`