[Mlir-commits] [mlir] [mlir][vscode] Update to capture angle brackets in types/attrs (PR #176665)

[llvmlistbot at llvm.org]

llvmbot wrote:


<!--LLVM PR SUMMARY COMMENT-->

@llvm/pr-subscribers-mlir

Author: Jacques Pienaar (jpienaar)

<details>
<summary>Changes</summary>

This updates the grammar of these types so that it is shown. Expanding what scopes are shown.

Also enabled skipLibCheck.

---
Full diff: https://github.com/llvm/llvm-project/pull/176665.diff


3 Files Affected:

- (modified) mlir/utils/textmate/mlir.json (+62-12) 
- (modified) mlir/utils/vscode/package.json (+1-1) 
- (modified) mlir/utils/vscode/tsconfig.json (+2-1) 


``````````diff
diff --git a/mlir/utils/textmate/mlir.json b/mlir/utils/textmate/mlir.json
index 820f8921cf237..7c60f63f360dc 100644
--- a/mlir/utils/textmate/mlir.json
+++ b/mlir/utils/textmate/mlir.json
@@ -197,10 +197,13 @@
           "name": "constant.language.mlir"
         },
         {
-          "begin": "\\b(affine_map|affine_set)\\s*\\<",
+          "begin": "\\b(affine_map|affine_set)\\s*(\\<)",
           "beginCaptures": {
             "1": {
               "name": "constant.language.mlir"
+            },
+            "2": {
+              "name": "punctuation.bracket.angle.begin.mlir"
             }
           },
           "patterns": [
@@ -216,13 +219,21 @@
               "include": "#number"
             }
           ],
-          "end": "\\)\\>"
+          "end": "\\)(\\>)",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.bracket.angle.end.mlir"
+            }
+          }
         },
         {
-          "begin": "\\b(dense|opaque|sparse)\\s*\\<",
+          "begin": "\\b(dense|opaque|sparse)\\s*(\\<)",
           "beginCaptures": {
             "1": {
               "name": "constant.language.mlir"
+            },
+            "2": {
+              "name": "punctuation.bracket.angle.begin.mlir"
             }
           },
           "patterns": [
@@ -230,7 +241,12 @@
               "include": "#attribute_value"
             }
           ],
-          "end": "\\>"
+          "end": "(\\>)",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.bracket.angle.end.mlir"
+            }
+          }
         },
         {
           "begin": "\\[",
@@ -258,10 +274,13 @@
           "name": "entity.name.function.mlir"
         },
         {
-          "begin": "(\\#[\\w\\$\\-\\.]+)\\<",
+          "begin": "(\\#[\\w\\$\\-\\.]+)(\\<)",
           "beginCaptures": {
             "1": {
               "name": "constant.language.mlir"
+            },
+            "2": {
+              "name": "punctuation.bracket.angle.begin.mlir"
             }
           },
           "patterns": [
@@ -275,7 +294,12 @@
               "include": "#bare_identifier"
             }
           ],
-          "end": "\\>"
+          "end": "(\\>)",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.bracket.angle.end.mlir"
+            }
+          }
         },
         {
           "match": "\\#[\\w\\$\\-\\.]+\\b",
@@ -285,7 +309,12 @@
           "include": "#type_value"
         },
         {
-          "begin": "\\<",
+          "begin": "(\\<)",
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.bracket.angle.begin.mlir"
+            }
+          },
           "patterns": [
             {
               "include": "#attribute_value"
@@ -294,7 +323,12 @@
               "include": "#bare_identifier"
             }
           ],
-          "end": "\\>"
+          "end": "(\\>)",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.bracket.angle.end.mlir"
+            }
+          }
         }
       ]
     },
@@ -318,10 +352,13 @@
     "type_value": {
       "patterns": [
         {
-          "begin": "(\\![\\w\\$\\-\\.]+)\\<",
+          "begin": "(\\![\\w\\$\\-\\.]+)(\\<)",
           "beginCaptures": {
             "1": {
               "name": "entity.name.type.mlir"
+            },
+            "2": {
+              "name": "punctuation.bracket.angle.begin.mlir"
             }
           },
           "patterns": [
@@ -336,17 +373,25 @@
               "include": "#bare_identifier"
             }
           ],
-          "end": "\\>"
+          "end": "(\\>)",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.bracket.angle.end.mlir"
+            }
+          }
         },
         {
           "match": "\\![\\w\\$\\-\\.]+\\b",
           "name": "entity.name.type.mlir"
         },
         {
-          "begin": "(complex|memref|tensor|tuple|vector)\\<",
+          "begin": "(complex|memref|tensor|tuple|vector)(\\<)",
           "beginCaptures": {
             "1": {
               "name": "entity.name.type.mlir"
+            },
+            "2": {
+              "name": "punctuation.bracket.angle.begin.mlir"
             }
           },
           "patterns": [
@@ -373,7 +418,12 @@
               "include": "#bare_identifier"
             }
           ],
-          "end": "\\>"
+          "end": "(\\>)",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.bracket.angle.end.mlir"
+            }
+          }
         },
         {
           "match": "bf16|f16|f32|f64|f80|f128|index|none|(u|s)?i[0-9]+",
diff --git a/mlir/utils/vscode/package.json b/mlir/utils/vscode/package.json
index 5535a262f8a98..c52da0af1b18b 100644
--- a/mlir/utils/vscode/package.json
+++ b/mlir/utils/vscode/package.json
@@ -2,7 +2,7 @@
   "name": "vscode-mlir",
   "displayName": "MLIR",
   "description": "MLIR Language Extension",
-  "version": "0.0.13",
+  "version": "0.0.14",
   "publisher": "llvm-vs-code-extensions",
   "homepage": "https://mlir.llvm.org/",
   "icon": "icon.png",
diff --git a/mlir/utils/vscode/tsconfig.json b/mlir/utils/vscode/tsconfig.json
index f913b0d2d9da4..5fb5c238652c3 100644
--- a/mlir/utils/vscode/tsconfig.json
+++ b/mlir/utils/vscode/tsconfig.json
@@ -4,7 +4,8 @@
 		"target": "es6",
 		"outDir": "out",
 		"rootDir": "src",
-		"sourceMap": true
+		"sourceMap": true,
+		"skipLibCheck": true
 	},
 	"include": [
 		"src"

``````````

</details>


https://github.com/llvm/llvm-project/pull/176665