@mirascript/textmate 0.1.86 → 0.1.88

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mirascript/textmate",
-  "version": "0.1.86",
+  "version": "0.1.88",
   "author": "CloudPSS",
   "license": "MIT",
   "description": "TextMate grammars for MiraScript.",
@@ -26,7 +26,7 @@
   },
   "dependencies": {
     "@shikijs/types": "^4.4.3",
-    "@mirascript/constants": "~0.1.86"
+    "@mirascript/constants": "~0.1.88"
   },
   "devDependencies": {
     "shiki": "^4.4.3",

package/src/grammar.ts

@@ -87,7 +87,7 @@ function interpolationPatterns(dollarCount: number) {
     const dollars = String.raw`\$`.repeat(dollarCount);
     return [
         {
-            name: `meta.interpolation.simple.mira`,
+            name: `meta.embedded.interpolation.simple.mira`,
             match: `(${dollars})(${IDENTIFIER})`,
             captures: {
                 1: { name: `punctuation.definition.template-expression.begin.mira` },
@@ -95,19 +95,17 @@ function interpolationPatterns(dollarCount: number) {
             },
         },
         {
-            name: `meta.interpolation.block.mira`,
+            name: `meta.embedded.interpolation.block.mira`,
             begin: String.raw`(${dollars}\{)`,
             beginCaptures: { 1: { name: `punctuation.definition.template-expression.begin.mira` } },
-            contentName: `meta.embedded.expression.mira`,
             end: String.raw`\}`,
             endCaptures: { 0: { name: `punctuation.definition.template-expression.end.mira` } },
             patterns: [{ include: '#braced-content' }],
         },
         {
-            name: `meta.interpolation.expression.mira`,
+            name: `meta.embedded.interpolation.expression.mira`,
             begin: String.raw`(${dollars}\()`,
             beginCaptures: { 1: { name: `punctuation.definition.template-expression.begin.mira` } },
-            contentName: `meta.embedded.expression.mira`,
             end: String.raw`\)`,
             endCaptures: { 0: { name: `punctuation.definition.template-expression.end.mira` } },
             patterns: [
@@ -327,7 +325,7 @@ function sourceRepository(): LanguageRegistration['repository'] {
         keywordRule(CONTROL_KEYWORDS, 'keyword.control'),
         keywordRule(wordOperators, 'keyword.operator.wordlike'),
         keywordRule(declarationKeywords, 'keyword.declaration'),
-        keywordRule(moduleKeywords, 'keyword.control.module'),
+        keywordRule(moduleKeywords, 'keyword.module'),
         keywordRule(RESERVED_KEYWORDS, 'keyword.reserved'),
         keywordRule(languageVariables, 'variable.language'),
         keywordRule(otherKeywords, 'keyword.other'),
@@ -451,7 +449,7 @@ function sourceRepository(): LanguageRegistration['repository'] {
                 {
                     match: String.raw`${IDENTIFIER_START}(mod)(\s+)(${IDENTIFIER})`,
                     captures: {
-                        1: { name: `keyword.control.module.mira` },
+                        1: { name: `keyword.module.mira` },
                         3: { name: `entity.name.namespace.mira` },
                     },
                 },
@@ -822,7 +820,7 @@ export function createMiraScriptDocGrammar(): LanguageRegistration {
                     {
                         match: String.raw`${IDENTIFIER_START}(?:(pub)(\s+))?(fn)(\s+)(${IDENTIFIER})(?=\s*(?:<|\())`,
                         captures: {
-                            1: { name: 'keyword.control.module.mira' },
+                            1: { name: 'keyword.module.mira' },
                             3: { name: 'keyword.declaration.function.mira' },
                             5: { name: 'entity.name.function.mira' },
                         },

package/tests/grammar/documentation-mode.ts

@@ -64,9 +64,9 @@ test('distinguishes doc declarations, globals, and nested function types', (t) =
         ].join('\n'),
         'mirascript-doc',
     );
-    expectScope(t, tokens, 'mod', 'keyword.control.module.mira', 0);
+    expectScope(t, tokens, 'mod', 'keyword.module.mira', 0);
     expectScope(t, tokens, 'matrix', 'entity.name.namespace.mira', 0);
-    expectScope(t, tokens, 'pub', 'keyword.control.module.mira');
+    expectScope(t, tokens, 'pub', 'keyword.module.mira');
     expectScope(t, tokens, 'PI', 'variable.other.constant.mira', 0);
     expectScope(t, tokens, 'PI', 'variable.other.constant.mira', 1);
     expectScope(t, tokens, '(global)', 'entity.name.label.mira', 0);

package/tests/grammar/language.ts

@@ -3,9 +3,11 @@ import { tokenize, expectScope } from '../_engine.ts';
 
 test('classifies declarations, parameters, properties, calls, and Unicode identifiers', (t) => {
     const tokens = tokenize('mod 数学 { fn 加法(mut 左, ..其余) { 对象.方法(左).属性 } }');
-    expectScope(t, tokens, 'mod', 'keyword.control.module.mira');
+    expectScope(t, tokens, 'mod', 'keyword.module.mira');
     expectScope(t, tokens, '数学', 'entity.name.namespace.mira');
+    expectScope(t, tokens, 'fn', 'keyword.declaration.function.mira');
     expectScope(t, tokens, '加法', 'entity.name.function.mira');
+    expectScope(t, tokens, 'mut', 'keyword.declaration.mutable.mira');
     expectScope(t, tokens, '左', 'variable.emphasis.mira');
     expectScope(t, tokens, '其余', 'variable.other.constant.emphasis.mira');
     expectScope(t, tokens, '方法', 'entity.name.function.member.mira');

package/tests/grammar/strings.ts

@@ -14,7 +14,7 @@ test('scopes nested interpolation delimiters and strings', (t) => {
     const tokens = tokenize('"$(len([1,2,3])) ${let a = "x${\'y\'}"; a}"');
     expectScope(t, tokens, '(', 'punctuation.section.parens.begin.mira');
     expectScope(t, tokens, '[', 'punctuation.section.brackets.begin.mira');
-    expectScope(t, tokens, ',', 'meta.embedded.expression.mira');
+    expectScope(t, tokens, ',', 'meta.embedded.interpolation.expression.mira');
     expectScope(t, tokens, ']', 'punctuation.section.brackets.end.mira');
     expectScope(t, tokens, ')', 'punctuation.section.parens.end.mira');
     expectScope(t, tokens, '"', 'string.quoted.double.mira', 1);