🔧 MAINTAIN: Pin integration tests to VS Code 1.47.0

.github/workflows/ci_tests.yml

@@ -1,7 +1,11 @@
 # see https://github.com/sdras/awesome-actions for a good list of available action
 name: Github-CI
 
-on: [push, pull_request]
+on:
+  push:
+    branches: [master, ci-*]
+  pull_request:
+    branches: [master]
 
 jobs:
 
@@ -11,10 +15,16 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     strategy:
+      fail-fast: false
       matrix:
         os: [macos-latest, ubuntu-latest, windows-latest]
         node-version: [10.x]  # [8.x, 10.x]
         # code-version: [stable, insiders]
+        include:
+        - os: ubuntu-latest
+          node-version: 12.x
+        - os: ubuntu-latest
+          node-version: 14.x
 
     steps:
     - uses: actions/checkout@v2

src/readTemplates.ts

@@ -13,13 +13,13 @@ export function readGrammar(asPlist: boolean = false) {
     const directiveYaml = fs.readFileSync(path.join(__dirname, '../template/directives.yaml'), 'utf8')
 
     // read variables
-    const languages = yaml.safeLoad(languageYaml)
-    const directives = yaml.safeLoad(directiveYaml)
+    const languages = yaml.safeLoad(languageYaml) as {[key: string]: any}
+    const directives = yaml.safeLoad(directiveYaml) as {[key: string]: any}
 
     // inject variables
     // eslint-disable-next-line @typescript-eslint/camelcase
     const inputYaml = jinja.renderString(templateYaml, { admonition_classes: directives['admonition_classes'], code_classes: directives['code_classes'], languages }).toString()
-    const grammar = yaml.safeLoad(inputYaml)
+    const grammar = yaml.safeLoad(inputYaml) as {[key: string]: any}
     if (asPlist) {
         return plist.build(grammar)
     }
@@ -36,7 +36,7 @@ function getDefault(obj: any, name: any, defaultValue: any = null) {
 
 export function readSnippets(asJson: boolean = false) {
     const snippetsYaml = fs.readFileSync(path.join(__dirname, '../snippets/dir.template.yaml'), 'utf8')
-    const snippets = yaml.safeLoad(snippetsYaml)
+    const snippets = yaml.safeLoad(snippetsYaml) as {[key: string]: any}
     const finalData: { [index: string]: any } = {}
     for (const name in snippets) {
         const data = snippets[name]

src/test/runIntergration.ts

@@ -13,7 +13,7 @@ async function main() {
         const extensionTestsPath = path.resolve(__dirname, './integration/index')
 
         // Download VS Code, unzip it and run the integration test
-        await runTests({ extensionDevelopmentPath, extensionTestsPath })
+        await runTests({ extensionDevelopmentPath, extensionTestsPath, version: '1.47.0' })
     } catch (err) {
         console.error(err)
         console.error('Failed to run tests')

src/test/standalone/build.test.ts

@@ -15,7 +15,7 @@ suite('Build Tests', () => {
 
     test('Build directives', () => {
         const expected = fs.readFileSync(path.join(__dirname, '../../../syntaxes', 'myst.tmLanguage'), 'utf8')
-        const plistString = readGrammar(true)
+        const plistString = readGrammar(true) as string
         assert.equal(sanitize(plistString), sanitize(expected))
     })
 

test_static/colorize-results/pr-57_myst.md.json

@@ -56,7 +56,7 @@
 	},
 	{
 		"c": "(",
-		"t": "text.html.markdown markup.fenced_code.block.markdown meta.embedded.block.python meta.function.python punctuation.definition.parameters.begin.python",
+		"t": "text.html.markdown markup.fenced_code.block.markdown meta.embedded.block.python meta.function.python meta.function.parameters.python punctuation.definition.parameters.begin.python",
 		"r": {
 			"dark_plus": "meta.embedded: #D4D4D4",
 			"light_plus": "meta.embedded: #000000",
@@ -67,7 +67,7 @@
 	},
 	{
 		"c": "x",
-		"t": "text.html.markdown markup.fenced_code.block.markdown meta.embedded.block.python meta.function.python meta.function.parameters.python variable.parameter.function.python",
+		"t": "text.html.markdown markup.fenced_code.block.markdown meta.embedded.block.python meta.function.python meta.function.parameters.python variable.parameter.function.language.python",
 		"r": {
 			"dark_plus": "variable: #9CDCFE",
 			"light_plus": "variable: #001080",
@@ -78,7 +78,7 @@
 	},
 	{
 		"c": ")",
-		"t": "text.html.markdown markup.fenced_code.block.markdown meta.embedded.block.python meta.function.python punctuation.definition.parameters.end.python",
+		"t": "text.html.markdown markup.fenced_code.block.markdown meta.embedded.block.python meta.function.python meta.function.parameters.python punctuation.definition.parameters.end.python",
 		"r": {
 			"dark_plus": "meta.embedded: #D4D4D4",
 			"light_plus": "meta.embedded: #000000",
@@ -256,8 +256,8 @@
 		"c": "var",
 		"t": "text.html.markdown markup.fenced_code.block.markdown meta.embedded.block.javascript meta.var.expr.js meta.var-single-variable.expr.js meta.definition.variable.js variable.other.constant.js",
 		"r": {
-			"dark_plus": "variable: #9CDCFE",
-			"light_plus": "variable: #001080",
+			"dark_plus": "variable.other.constant: #4FC1FF",
+			"light_plus": "variable.other.constant: #0070C1",
 			"dark_vs": "meta.embedded: #D4D4D4",
 			"light_vs": "meta.embedded: #000000",
 			"hc_black": "variable: #9CDCFE"

test_static/colorize-results/role-span_myst.md.json

@@ -59,7 +59,7 @@
 		"t": "text.html.markdown meta.paragraph.markdown constant.character.escape.markdown",
 		"r": {
 			"dark_plus": "constant.character.escape: #D7BA7D",
-			"light_plus": "constant.character.escape: #FF0000",
+			"light_plus": "constant.character.escape: #EE0000",
 			"dark_vs": "default: #D4D4D4",
 			"light_vs": "default: #000000",
 			"hc_black": "constant.character: #569CD6"

test_static/failing-fixtures/readme.md

@@ -1,2 +1,2 @@
-skipping these tests because they are failing on travis (both color python code)
+skipping these tests because they are failing on CI (both color python code)
 TODO work out why these are failing