Merge pull request #339 from FedericoPonzi/issue-284

Fix broken syntax highlighting after the first submodule

Author: FedericoPonzi

languages/tlaplus-grammar.json

@@ -170,6 +170,9 @@
                 }
             },
             "patterns": [
+                {
+                    "include" : "#module"
+                },
                 {
                     "include": "#pluscal"
                 },

package.json

@@ -507,7 +507,7 @@
         "watch": "npm run compile -- --watch",
         "pretest": "tsc -p ./",
         "test": "node ./out/tests/runTest.js",
-        "test:tlaplus-grammar": "vscode-tmgrammar-test ./tests/suite/languages/tlaplus-grammar-test.tla -g ./languages/tlaplus-grammar.json -g ./languages/pluscal-grammar.json"
+        "test:tlaplus-grammar": "vscode-tmgrammar-test ./tests/suite/languages/tlaplus-grammar-test.tla ./tests/suite/languages/tlaplus-grammar-test-submodule.tla -g ./languages/tlaplus-grammar.json -g ./languages/pluscal-grammar.json"
     },
     "devDependencies": {
         "@types/glob": "^8.1.0",

src/tla2tools.ts

@@ -34,7 +34,7 @@ const cmodsJarPath = path.resolve(__dirname, '../tools/' + TLA_CMODS_LIB_NAME);
 const javaCmd = 'java' + (process.platform === 'win32' ? '.exe' : '');
 const javaVersionChannel = new ToolOutputChannel('TLA+ Java version');
 const TLA_TOOLS_STANDARD_MODULES = '/tla2sany/StandardModules';
-const TLA_TOOLS_PLUSCAL_PARAM_SKIP_CFG_CREATION = "-nocfg";
+const TLA_TOOLS_PLUSCAL_PARAM_SKIP_CFG_CREATION = '-nocfg';
 
 let lastUsedJavaHome: string | undefined;
 let cachedJavaPath: string | undefined;

tests/suite/languages/GrammarTests.md

@@ -8,7 +8,7 @@ Grammar tests are defined under [tests/suite/languages](.)
 
 A grammar test is a test file that includes annotation of the expected assigned scopes. One example is the [tlaplus-grammar-test.tla](tlaplus-grammar-test.tla).
 
-For more information on how to write a test see [vscode-tmgrammar-test](thttps://github.com/PanAeon/vscode-tmgrammar-test).
+For more information on how to write a test see [vscode-tmgrammar-test](https://github.com/PanAeon/vscode-tmgrammar-test).
 
 ## Run the tests
 To run from the command line:

tests/suite/languages/tlaplus-grammar-test-submodule.tla

@@ -0,0 +1,37 @@
+// SYNTAX TEST "source.tlaplus" "tlaplus language grammar testcase"
+
+---- MODULE SubmoduleTest ----
+// <---- comment.line 
+//   ^^^^^^ keyword.other
+//          ^^^^^^^^^^^^^ entity.name.class
+---- MODULE InnerModule1 ----
+// <---- comment.line
+//   ^^^^^^ keyword.other
+//          ^^^^^^^^^^^^ entity.name.class
+
+Op1 == FALSE
+//<-- support.type.primitive
+//     ^^^^^ support.constant.tlaplus
+
+====
+// <---- comment.line
+
+---- MODULE InnerModule2 ----
+// <---- comment.line
+//   ^^^^^^ keyword.other
+//          ^^^^^^^^^^^^ entity.name.class
+
+Op2 == FALSE
+//<-- support.type.primitive
+//     ^^^^^ support.constant.tlaplus
+
+
+====
+// <---- comment.line
+
+Op == FALSE
+//<-- support.type.primitive
+//    ^^^^^ support.constant.tlaplus
+
+====
+// <---- comment.line