Fix type argument tmlanguage (#4089)

Fix #3524
microsoft · Aug 8, 2024 · 675e6d4 · 675e6d4
1 parent 630bdd4
commit 675e6d4
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 22 deletions.
diff --git a/.chronus/changes/fix-type-argument-tmlanguage-2024-7-5-16-16-4.md b/.chronus/changes/fix-type-argument-tmlanguage-2024-7-5-16-16-4.md
@@ -0,0 +1,8 @@
+---
+# Change versionKind to one of: internal, fix, dependencies, feature, deprecation, breaking
+changeKind: fix
+packages:
+  - "@typespec/compiler"
+---
+
+Fix tmlanguage for named type argument in type reference.
diff --git a/grammars/typespec.json b/grammars/typespec.json
@@ -1398,7 +1398,7 @@
           "name": "keyword.operator.assignment.tsp"
         }
       },
-      "end": "=",
+      "end": "(?=>)|(?=,|;|@|\\)|\\}|\\b(?:extern)\\b|\\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\\b)",
       "endCaptures": {
         "0": {
           "name": "keyword.operator.assignment.tsp"

diff --git a/packages/compiler/src/server/tmlanguage.ts b/packages/compiler/src/server/tmlanguage.ts
@@ -343,7 +343,7 @@ const typeArgument: BeginEndRule = {
     "1": { scope: "entity.name.type.tsp" },
     "2": { scope: "keyword.operator.assignment.tsp" },
   },
-  end: `=`,
+  end: `(?=>)|${universalEnd}`,
   endCaptures: {
     "0": { scope: "keyword.operator.assignment.tsp" },
   },

diff --git a/packages/compiler/test/server/colorization.test.ts b/packages/compiler/test/server/colorization.test.ts
@@ -827,26 +827,58 @@ function testColorization(description: string, tokenize: Tokenize) {
       });
     });
 
-    it("named template argument list", async () => {
-      const tokens = await tokenize("alias X = Foo<boolean, T = string, U = int32>;");
-      deepStrictEqual(tokens, [
-        Token.keywords.alias,
-        Token.identifiers.type("X"),
-        Token.operators.assignment,
-        Token.identifiers.type("Foo"),
-        Token.punctuation.typeParameters.begin,
-        Token.identifiers.type("boolean"),
-        Token.punctuation.comma,
-        Token.identifiers.type("T"),
-        Token.operators.assignment,
-        Token.identifiers.type("string"),
-        Token.punctuation.comma,
-        Token.identifiers.type("U"),
-        Token.operators.assignment,
-        Token.identifiers.type("int32"),
-        Token.punctuation.typeParameters.end,
-        Token.punctuation.semicolon,
-      ]);
+    describe("template argument", () => {
+      it("multiple named arguments", async () => {
+        const tokens = await tokenize("alias X = Foo<boolean, T = string, U = int32>;");
+        deepStrictEqual(tokens, [
+          Token.keywords.alias,
+          Token.identifiers.type("X"),
+          Token.operators.assignment,
+          Token.identifiers.type("Foo"),
+          Token.punctuation.typeParameters.begin,
+          Token.identifiers.type("boolean"),
+          Token.punctuation.comma,
+          Token.identifiers.type("T"),
+          Token.operators.assignment,
+          Token.identifiers.type("string"),
+          Token.punctuation.comma,
+          Token.identifiers.type("U"),
+          Token.operators.assignment,
+          Token.identifiers.type("int32"),
+          Token.punctuation.typeParameters.end,
+          Token.punctuation.semicolon,
+        ]);
+      });
+
+      it("multiple references", async () => {
+        const tokens = await tokenize(`
+          alias A = Foo<Parameters=string>;
+          alias B = Foo<Parameters=string>;  
+        `);
+        deepStrictEqual(tokens, [
+          Token.keywords.alias,
+          Token.identifiers.type("A"),
+          Token.operators.assignment,
+          Token.identifiers.type("Foo"),
+          Token.punctuation.typeParameters.begin,
+          Token.identifiers.type("Parameters"),
+          Token.operators.assignment,
+          Token.identifiers.type("string"),
+          Token.punctuation.typeParameters.end,
+          Token.punctuation.semicolon,
+          // --
+          Token.keywords.alias,
+          Token.identifiers.type("B"),
+          Token.operators.assignment,
+          Token.identifiers.type("Foo"),
+          Token.punctuation.typeParameters.begin,
+          Token.identifiers.type("Parameters"),
+          Token.operators.assignment,
+          Token.identifiers.type("string"),
+          Token.punctuation.typeParameters.end,
+          Token.punctuation.semicolon,
+        ]);
+      });
     });
 
     describe("enums", () => {