Fix tests to use latest vscode-textmate extension

Author: sheetalkamat

.travis.yml

@@ -2,7 +2,7 @@ language: node_js
 
 node_js:
   - 'stable'
-  - '8'
+  - '10'
 
 sudo: false
 

appveyor.yml

@@ -1,6 +1,6 @@
 # Test against this version of Node.js
 environment:
-  nodejs_version: "8"
+  nodejs_version: "10"
 
 # Install scripts. (runs after repo cloning)
 install:

azure-pipelines.yml

@@ -6,9 +6,9 @@ jobs:
 
 # All tasks on Linux
 - job: build_all_linux_legacy
-  displayName: Build all tasks using node 8 (Linux)
+  displayName: Build all tasks using node 10 (Linux)
   variables:
-    node_version: '8.x'
+    node_version: '10.x'
   pool:
     vmImage: 'Ubuntu 16.04'
   steps:
@@ -18,7 +18,7 @@ jobs:
 - job: build_all_windows
   displayName: Build all tasks (Windows)
   variables:
-    node_version: '11.x'
+    node_version: '12.x'
   pool:
     vmImage: vs2017-win2016
   steps:
@@ -28,7 +28,7 @@ jobs:
 - job: build_all_linux
   displayName: Build all tasks (Linux)
   variables:
-    node_version: '11.x'
+    node_version: '12.x'
   pool:
     vmImage: 'Ubuntu 16.04'
   steps:
@@ -38,7 +38,7 @@ jobs:
 - job: build_all_darwin
   displayName: Build all tasks (macOS)
   variables:
-    node_version: '11.x'
+    node_version: '12.x'
   pool:
     vmImage: macos-10.13
   steps:

build/build.ts

@@ -66,7 +66,7 @@ function getTsxGrammar() {
         }
         return variables;
     });
-    const tsxUpdates = updateGrammarVariables(tsxUpdatesBeforeTransformation, variables);
+    const tsxUpdates = updateGrammarVariables(tsxUpdatesBeforeTransformation, variables!);
 
     // Update name, file types, scope name and uuid
     grammar.name = tsxUpdates.name;

build/tsconfig.json

@@ -2,7 +2,7 @@
     "compilerOptions": {
         "target": "ES5",
         "module": "commonjs",
-        "noImplicitAny": true,
+        "strict": true,
         "skipLibCheck":  true
     },
     "exclude": [

tests/build.ts

@@ -1,12 +1,52 @@
 import * as vt from 'vscode-textmate/release/main';
 import path = require('path');
+import fs = require('fs');
 
-const tsGrammarFileName = "TypeScript.tmLanguage"
-const tsReactGrammarFileName = "TypeScriptReact.tmLanguage"
+enum GrammarKind {
+    ts = 'source.ts',
+    tsx = 'source.tsx'
+}
+const grammarFileNames: Record<GrammarKind, string> = {
+    [GrammarKind.ts]: "TypeScript.tmLanguage",
+    [GrammarKind.tsx]: "TypeScriptReact.tmLanguage"
+};
+function grammarPath(kind: GrammarKind) {
+    return path.join(__dirname, '..', grammarFileNames[kind]);
+}
+const grammarPaths = {
+    [GrammarKind.ts]: grammarPath(GrammarKind.ts),
+    [GrammarKind.tsx]: grammarPath(GrammarKind.tsx)
+};
+
+const registery = new vt.Registry({
+    loadGrammar: function (scopeName: GrammarKind) {
+        const path = grammarPaths[scopeName];
+        if (path) {
+            return new Promise((resolve, reject) => {
+                fs.readFile(path, (error, content) => {
+                    if (error) {
+                        reject(error);
+                    } else {
+                        const rawGrammar = vt.parseRawGrammar(content.toString(), path);
+                        resolve(rawGrammar);
+                    }
+                });
+            });
+        }
 
-const register = new vt.Registry();
-const tsGrammar = register.loadGrammarFromPathSync(path.join(__dirname, '..', tsGrammarFileName));
-const tsReactGrammar = register.loadGrammarFromPathSync(path.join(__dirname, '..', tsReactGrammarFileName));
+        return Promise.resolve(null);
+    }
+});
+
+interface ThenableGrammar {
+    kind: GrammarKind;
+    grammar: vt.Thenable<vt.IGrammar>;
+}
+function thenableGrammar(kind: GrammarKind): ThenableGrammar {
+    return { kind, grammar: registery.loadGrammar(kind) };
+}
+const tsGrammar = thenableGrammar(GrammarKind.ts);
+const tsReactGrammar = thenableGrammar(GrammarKind.tsx);
 
 const marker = '^^';
 
@@ -31,24 +71,21 @@ function getInputFile(oriLines: string[]): string {
         "\n-----------------------------------\n\n";
 }
 
-function getGrammarInfo(grammarFileName: string) {
-    return "Grammar: " + grammarFileName + "\n-----------------------------------\n";
+function getGrammarInfo(kind: GrammarKind) {
+    return "Grammar: " + grammarFileNames[kind] + "\n-----------------------------------\n";
 }
 
-const tsGrammarInfo = getGrammarInfo(tsGrammarFileName);
-const tsReactGrammarInfo = getGrammarInfo(tsReactGrammarFileName);
-
 interface Grammar {
+    kind: GrammarKind;
     grammar: vt.IGrammar;
     ruleStack?: vt.StackElement;
 }
-
-function initGrammar(grammar: vt.IGrammar): Grammar {
-    return { grammar };
+function initGrammar(kind: GrammarKind, grammar: vt.IGrammar): Grammar {
+    return { kind, grammar };
 }
 
 function tokenizeLine(grammar: Grammar, line: string) {
-    const lineTokens = grammar.grammar.tokenizeLine(line, grammar.ruleStack);
+    const lineTokens = grammar.grammar.tokenizeLine(line, grammar.ruleStack!);
     grammar.ruleStack = lineTokens.ruleStack;
     return lineTokens.tokens;
 }
@@ -82,20 +119,29 @@ function hasDiffLineToken(first: vt.IToken, second: vt.IToken) {
 }
 
 function getBaseline(grammar: Grammar, outputLines: string[]) {
-    const grammarInfo = grammar.grammar === tsGrammar ? tsGrammarInfo : tsReactGrammarInfo;
-    return grammarInfo + outputLines.join('\n');
+    return getGrammarInfo(grammar.kind) + outputLines.join('\n');
 }
 
-export function generateScopes(text: string, parsedFileName: path.ParsedPath): { markerScopes: string, wholeBaseline: string } {
-    const grammar = parsedFileName.ext === '.tsx' ? tsReactGrammar : tsGrammar;
+export function generateScopes(text: string, parsedFileName: path.ParsedPath) {
+    const mainGrammar = parsedFileName.ext === '.tsx' ? tsReactGrammar : tsGrammar;
     const oriLines = text.split(/\r\n|\r|\n/);
+    const otherGrammar = oriLines[0].search(/\/\/\s*@onlyOwnGrammar/i) < 0 ?
+        mainGrammar === tsGrammar ? tsReactGrammar : tsGrammar :
+        undefined;
+
+    return Promise.all([
+        mainGrammar.grammar,
+        otherGrammar ?
+            otherGrammar.grammar :
+            Promise.resolve(undefined)
+    ]).then(([mainIGrammar, otherIGrammar]) => generateScopesWorker(
+        initGrammar(mainGrammar.kind, mainIGrammar),
+        otherIGrammar && initGrammar(otherGrammar!.kind, otherIGrammar),
+        oriLines
+    ));
+}
 
-    let mainGrammar = initGrammar(grammar);
-    let otherGrammar: Grammar = null;
-    if (oriLines[0].search(/\/\/\s*@onlyOwnGrammar/i) < 0) {
-        otherGrammar = initGrammar(grammar === tsGrammar ? tsReactGrammar : tsGrammar);
-    }
-
+function generateScopesWorker(mainGrammar: Grammar, otherGrammar: Grammar | undefined, oriLines: string[]): { markerScopes: string | undefined, wholeBaseline: string } {
     let outputLines: string[] = [];
     let cleanLines: string[] = [];
     let baselineLines: string[] = [];
@@ -136,9 +182,9 @@ export function generateScopes(text: string, parsedFileName: path.ParsedPath): {
         }
     }
 
-    const otherDiffBaseline = foundDiff ? "\n\n\n" + getBaseline(otherGrammar, otherBaselines) : "";
+    const otherDiffBaseline = foundDiff ? "\n\n\n" + getBaseline(otherGrammar!, otherBaselines) : "";
     return {
-        markerScopes: markers ? (getInputFile(oriLines) + getBaseline(mainGrammar, outputLines)) : null,
+        markerScopes: markers ? (getInputFile(oriLines) + getBaseline(mainGrammar, outputLines)) : undefined,
         wholeBaseline: getInputFile(cleanLines) + getBaseline(mainGrammar, baselineLines) + otherDiffBaseline
     };
 }

tests/test.ts

@@ -22,17 +22,24 @@ ensureCleanGeneratedFolder();
 
 // Generate the new baselines
 for (const fileName of fs.readdirSync(casesFolder)) {
-    const text = fs.readFileSync(path.join(casesFolder, fileName), 'utf8');
-    const parsedFileName = path.parse(fileName);
-
-    let wholeBaseline: string;
-    let markerScopes: string;
-
     describe("Generating baseline for " + fileName, () => {
-        before(() =>  {
-            const result = build.generateScopes(text, parsedFileName)
-            wholeBaseline = result.wholeBaseline;
-            markerScopes = result.markerScopes;
+        let wholeBaseline: string;
+        let markerScopes: string | undefined;
+        let parsedFileName: path.ParsedPath;
+
+        before(done => {
+            const text = fs.readFileSync(path.join(casesFolder, fileName), 'utf8');
+            parsedFileName  = path.parse(fileName);
+            build.generateScopes(text, parsedFileName).then(result => {
+                wholeBaseline = result.wholeBaseline;
+                markerScopes = result.markerScopes;
+                done();
+            })
+        });
+        after(() => {
+            wholeBaseline = undefined!;
+            markerScopes = undefined!;
+            parsedFileName = undefined!;
         });
 
         it('Comparing whole baseline', () => {

tests/tsconfig.json

@@ -2,7 +2,7 @@
     "compilerOptions": {
         "target": "ES5",
         "module": "commonjs",
-        "noImplicitAny": true,
+        "strict": true,
         "skipLibCheck": true
     },
     "exclude": [