Merge remote-tracking branch 'origin/master' into pr/gloss-water/58324

.eslintignore

@@ -0,0 +1,16 @@
+**/vs/nls.build.js
+**/vs/nls.js
+**/vs/css.build.js
+**/vs/css.js
+**/vs/loader.js
+**/promise-polyfill/**
+**/insane/**
+**/marked/**
+**/test/**/*.js
+**/node_modules/**
+**/vscode-api-tests/testWorkspace/**
+**/vscode-api-tests/testWorkspace2/**
+**/extensions/**/out/**
+**/extensions/**/build/**
+**/extensions/markdown-language-features/media/**
+**/extensions/typescript-basics/test/colorize-fixtures/**

.eslintrc.json

@@ -1,20 +1,685 @@
 {
-	"root": true,
-	"env": {
-		"node": true,
-		"es6": true
-	},
-	"rules": {
-		"no-console": 0,
-		"no-cond-assign": 0,
-		"no-unused-vars": 1,
-		"no-extra-semi": "warn",
-		"semi": "warn"
-	},
-	"extends": "eslint:recommended",
-	"parserOptions": {
-		"ecmaFeatures": {
-			"experimentalObjectRestSpread": true
-		}
-	}
+    "root": true,
+    "parser": "@typescript-eslint/parser",
+    "parserOptions": {
+        "ecmaVersion": 6,
+        "sourceType": "module"
+    },
+    "plugins": [
+        "@typescript-eslint",
+        "jsdoc"
+    ],
+    "rules": {
+        "constructor-super": "warn",
+        "curly": "warn",
+        "eqeqeq": "warn",
+        "no-buffer-constructor": "warn",
+        "no-caller": "warn",
+        "no-debugger": "warn",
+        "no-duplicate-case": "warn",
+        "no-duplicate-imports": "warn",
+        "no-eval": "warn",
+        "no-extra-semi": "warn",
+        "no-new-wrappers": "warn",
+        "no-redeclare": "off",
+        "no-sparse-arrays": "warn",
+        "no-throw-literal": "warn",
+        "no-unsafe-finally": "warn",
+        "no-unused-labels": "warn",
+        "no-restricted-globals": [
+            "warn",
+            "name",
+            "length",
+            "event",
+            "closed",
+            "external",
+            "status",
+            "origin",
+            "orientation"
+        ], // non-complete list of globals that are easy to access unintentionally
+        "no-var": "warn",
+        "jsdoc/no-types": "warn",
+        "semi": "off",
+        "@typescript-eslint/semi": "warn",
+        "@typescript-eslint/class-name-casing": "warn",
+        "code-no-unused-expressions": [
+            "warn",
+            {
+                "allowTernary": true
+            }
+        ],
+        "code-translation-remind": "warn",
+        "code-no-nls-in-standalone-editor": "warn",
+        "code-no-standalone-editor": "warn",
+        "code-no-unexternalized-strings": "warn",
+        "code-layering": [
+            "warn",
+            {
+                "common": [],
+                "node": [
+                    "common"
+                ],
+                "browser": [
+                    "common"
+                ],
+                "electron-main": [
+                    "common",
+                    "node"
+                ],
+                "electron-browser": [
+                    "common",
+                    "browser",
+                    "node"
+                ]
+            }
+        ],
+        "code-import-patterns": [
+            "warn",
+            // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+            // !!! Do not relax these rules !!!
+            // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+            {
+                "target": "**/vs/base/common/**",
+                "restrictions": [
+                    "vs/nls",
+                    "**/vs/base/common/**"
+                ]
+            },
+            {
+                "target": "**/vs/base/test/common/**",
+                "restrictions": [
+                    "assert",
+                    "sinon",
+                    "vs/nls",
+                    "**/vs/base/common/**",
+                    "**/vs/base/test/common/**"
+                ]
+            },
+            {
+                "target": "**/vs/base/browser/**",
+                "restrictions": [
+                    "vs/nls",
+                    "vs/css!./**/*",
+                    "**/vs/base/{common,browser}/**"
+                ]
+            },
+            {
+                "target": "**/vs/base/node/**",
+                "restrictions": [
+                    "vs/nls",
+                    "**/vs/base/{common,node}/**",
+                    "!path" // node modules (except path where we have our own impl)
+                ]
+            },
+            {
+                // vs/base/test/browser contains tests for vs/base/browser
+                "target": "**/vs/base/test/browser/**",
+                "restrictions": [
+                    "assert",
+                    "sinon",
+                    "vs/nls",
+                    "**/vs/base/{common,browser}/**",
+                    "**/vs/base/test/{common,browser}/**"
+                ]
+            },
+            {
+                "target": "**/vs/base/parts/*/common/**",
+                "restrictions": [
+                    "vs/nls",
+                    "**/vs/base/common/**",
+                    "**/vs/base/parts/*/common/**"
+                ]
+            },
+            {
+                "target": "**/vs/base/parts/*/browser/**",
+                "restrictions": [
+                    "vs/nls",
+                    "vs/css!./**/*",
+                    "**/vs/base/{common,browser}/**",
+                    "**/vs/base/parts/*/{common,browser}/**"
+                ]
+            },
+            {
+                "target": "**/vs/base/parts/*/node/**",
+                "restrictions": [
+                    "vs/nls",
+                    "**/vs/base/{common,node}/**",
+                    "**/vs/base/parts/*/{common,node}/**",
+                    "!path" // node modules (except path where we have our own impl)
+                ]
+            },
+            {
+                "target": "**/vs/base/parts/*/electron-browser/**",
+                "restrictions": [
+                    "vs/nls",
+                    "vs/css!./**/*",
+                    "**/vs/base/{common,browser,node,electron-browser}/**",
+                    "**/vs/base/parts/*/{common,browser,node,electron-browser}/**",
+                    "!path" // node modules (except path where we have our own impl)
+                ]
+            },
+            {
+                "target": "**/vs/base/parts/*/electron-main/**",
+                "restrictions": [
+                    "vs/nls",
+                    "**/vs/base/{common,node,electron-main}/**",
+                    "**/vs/base/parts/*/{common,node,electron-main}/**",
+                    "!path" // node modules (except path where we have our own impl)
+                ]
+            },
+            {
+                "target": "**/vs/platform/*/common/**",
+                "restrictions": [
+                    "vs/nls",
+                    "**/vs/base/common/**",
+                    "**/vs/base/parts/*/common/**",
+                    "**/vs/platform/*/common/**"
+                ]
+            },
+            {
+                "target": "**/vs/platform/*/test/common/**",
+                "restrictions": [
+                    "assert",
+                    "sinon",
+                    "vs/nls",
+                    "**/vs/base/common/**",
+                    "**/vs/platform/*/common/**",
+                    "**/vs/platform/*/test/common/**"
+                ]
+            },
+            {
+                "target": "**/vs/platform/*/browser/**",
+                "restrictions": [
+                    "vs/nls",
+                    "vs/css!./**/*",
+                    "**/vs/base/{common,browser}/**",
+                    "**/vs/base/parts/*/{common,browser}/**",
+                    "**/vs/platform/*/{common,browser}/**"
+                ]
+            },
+            {
+                "target": "**/vs/platform/*/node/**",
+                "restrictions": [
+                    "vs/nls",
+                    "**/vs/base/{common,node}/**",
+                    "**/vs/base/parts/*/{common,node}/**",
+                    "**/vs/platform/*/{common,node}/**",
+                    "!path" // node modules (except path where we have our own impl)
+                ]
+            },
+            {
+                "target": "**/vs/platform/*/electron-browser/**",
+                "restrictions": [
+                    "vs/nls",
+                    "vs/css!./**/*",
+                    "**/vs/base/{common,browser,node}/**",
+                    "**/vs/base/parts/*/{common,browser,node,electron-browser}/**",
+                    "**/vs/platform/*/{common,browser,node,electron-browser}/**",
+                    "!path" // node modules (except path where we have our own impl)
+                ]
+            },
+            {
+                "target": "**/vs/platform/*/electron-main/**",
+                "restrictions": [
+                    "vs/nls",
+                    "**/vs/base/{common,node,electron-main}/**",
+                    "**/vs/base/parts/*/{common,node,electron-main}/**",
+                    "**/vs/platform/*/{common,node,electron-main}/**",
+                    "!path" // node modules (except path where we have our own impl)
+                ]
+            },
+            {
+                "target": "**/vs/platform/*/test/browser/**",
+                "restrictions": [
+                    "assert",
+                    "sinon",
+                    "vs/nls",
+                    "**/vs/base/{common,browser}/**",
+                    "**/vs/platform/*/{common,browser}/**",
+                    "**/vs/platform/*/test/{common,browser}/**"
+                ]
+            },
+            {
+                "target": "**/vs/editor/common/**",
+                "restrictions": [
+                    "vs/nls",
+                    "**/vs/base/common/**",
+                    "**/vs/base/worker/**",
+                    "**/vs/platform/*/common/**",
+                    "**/vs/editor/common/**"
+                ]
+            },
+            {
+                "target": "**/vs/editor/test/common/**",
+                "restrictions": [
+                    "assert",
+                    "sinon",
+                    "vs/nls",
+                    "**/vs/base/common/**",
+                    "**/vs/platform/*/common/**",
+                    "**/vs/platform/*/test/common/**",
+                    "**/vs/editor/common/**",
+                    "**/vs/editor/test/common/**"
+                ]
+            },
+            {
+                "target": "**/vs/editor/browser/**",
+                "restrictions": [
+                    "vs/nls",
+                    "vs/css!./**/*",
+                    "**/vs/base/{common,browser}/**",
+                    "**/vs/platform/*/{common,browser}/**",
+                    "**/vs/editor/{common,browser}/**"
+                ]
+            },
+            {
+                "target": "**/vs/editor/test/browser/**",
+                "restrictions": [
+                    "assert",
+                    "sinon",
+                    "vs/nls",
+                    "**/vs/base/{common,browser}/**",
+                    "**/vs/platform/*/{common,browser}/**",
+                    "**/vs/platform/*/test/{common,browser}/**",
+                    "**/vs/editor/{common,browser}/**",
+                    "**/vs/editor/test/{common,browser}/**"
+                ]
+            },
+            {
+                "target": "**/vs/editor/standalone/common/**",
+                "restrictions": [
+                    "vs/nls",
+                    "**/vs/base/common/**",
+                    "**/vs/platform/*/common/**",
+                    "**/vs/editor/common/**",
+                    "**/vs/editor/standalone/common/**"
+                ]
+            },
+            {
+                "target": "**/vs/editor/standalone/test/common/**",
+                "restrictions": [
+                    "assert",
+                    "sinon",
+                    "vs/nls",
+                    "**/vs/base/common/**",
+                    "**/vs/platform/*/common/**",
+                    "**/vs/platform/*/test/common/**",
+                    "**/vs/editor/common/**",
+                    "**/vs/editor/test/common/**"
+                ]
+            },
+            {
+                "target": "**/vs/editor/standalone/browser/**",
+                "restrictions": [
+                    "vs/nls",
+                    "vs/css!./**/*",
+                    "**/vs/base/{common,browser}/**",
+                    "**/vs/base/parts/*/{common,browser}/**",
+                    "**/vs/platform/*/{common,browser}/**",
+                    "**/vs/editor/{common,browser}/**",
+                    "**/vs/editor/contrib/**",
+                    "**/vs/editor/standalone/{common,browser}/**"
+                ]
+            },
+            {
+                "target": "**/vs/editor/standalone/test/browser/**",
+                "restrictions": [
+                    "assert",
+                    "sinon",
+                    "vs/nls",
+                    "**/vs/base/{common,browser}/**",
+                    "**/vs/platform/*/{common,browser}/**",
+                    "**/vs/platform/*/test/{common,browser}/**",
+                    "**/vs/editor/{common,browser}/**",
+                    "**/vs/editor/standalone/{common,browser}/**",
+                    "**/vs/editor/test/{common,browser}/**"
+                ]
+            },
+            {
+                "target": "**/vs/editor/contrib/*/test/**",
+                "restrictions": [
+                    "assert",
+                    "sinon",
+                    "vs/nls",
+                    "**/vs/base/{common,browser}/**",
+                    "**/vs/base/test/{common,browser}/**",
+                    "**/vs/base/parts/*/{common,browser}/**",
+                    "**/vs/platform/*/{common,browser}/**",
+                    "**/vs/platform/*/test/{common,browser}/**",
+                    "**/vs/editor/{common,browser}/**",
+                    "**/vs/editor/test/{common,browser}/**",
+                    "**/vs/editor/contrib/**"
+                ]
+            },
+            {
+                "target": "**/vs/editor/contrib/**",
+                "restrictions": [
+                    "vs/nls",
+                    "vs/css!./**/*",
+                    "**/vs/base/{common,browser}/**",
+                    "**/vs/base/parts/*/{common,browser}/**",
+                    "**/vs/platform/{common,browser}/**",
+                    "**/vs/platform/*/{common,browser}/**",
+                    "**/vs/editor/{common,browser}/**",
+                    "**/vs/editor/contrib/**"
+                ]
+            },
+            {
+                "target": "**/vs/workbench/common/**",
+                "restrictions": [
+                    "vs/nls",
+                    "**/vs/base/common/**",
+                    "**/vs/base/parts/*/common/**",
+                    "**/vs/platform/*/common/**",
+                    "**/vs/editor/common/**",
+                    "**/vs/editor/contrib/*/common/**",
+                    "**/vs/workbench/common/**",
+                    "**/vs/workbench/services/*/common/**",
+                    "assert"
+                ]
+            },
+            {
+                "target": "**/vs/workbench/browser/**",
+                "restrictions": [
+                    "vs/nls",
+                    "vs/css!./**/*",
+                    "**/vs/base/{common,browser}/**",
+                    "**/vs/base/parts/*/{common,browser}/**",
+                    "**/vs/platform/*/{common,browser}/**",
+                    "**/vs/editor/{common,browser}/**",
+                    "**/vs/editor/contrib/**", // editor/contrib is equivalent to /browser/ by convention
+                    "**/vs/workbench/workbench.web.api",
+                    "**/vs/workbench/{common,browser}/**",
+                    "**/vs/workbench/services/*/{common,browser}/**",
+                    "assert"
+                ]
+            },
+            {
+                "target": "**/vs/workbench/workbench.desktop.main.ts",
+                "restrictions": [
+                    "**"
+                ]
+            },
+            {
+                "target": "**/vs/workbench/api/common/**",
+                "restrictions": [
+                    "vscode",
+                    "vs/nls",
+                    "**/vs/base/common/**",
+                    "**/vs/platform/*/common/**",
+                    "**/vs/editor/common/**",
+                    "**/vs/editor/contrib/*/common/**",
+                    "**/vs/workbench/api/common/**",
+                    "**/vs/workbench/common/**",
+                    "**/vs/workbench/services/*/common/**",
+                    "**/vs/workbench/contrib/*/common/**"
+                ]
+            },
+            {
+                "target": "**/vs/workbench/api/worker/**",
+                "restrictions": [
+                    "vscode",
+                    "vs/nls",
+                    "**/vs/**/{common,worker}/**"
+                ]
+            },
+            {
+                "target": "**/vs/workbench/electron-browser/**",
+                "restrictions": [
+                    "vs/nls",
+                    "vs/css!./**/*",
+                    "**/vs/base/{common,browser,node,electron-browser}/**",
+                    "**/vs/base/parts/*/{common,browser,node,electron-browser}/**",
+                    "**/vs/platform/*/{common,browser,node,electron-browser}/**",
+                    "**/vs/editor/{common,browser,node,electron-browser}/**",
+                    "**/vs/editor/contrib/**", // editor/contrib is equivalent to /browser/ by convention
+                    "**/vs/workbench/{common,browser,node,electron-browser,api}/**",
+                    "**/vs/workbench/services/*/{common,browser,node,electron-browser}/**",
+                    "!path" // node modules (except path where we have our own impl)
+                ]
+            },
+            {
+                "target": "**/vs/workbench/services/**/test/**",
+                "restrictions": [
+                    "vs/nls",
+                    "vs/css!./**/*",
+                    "**/vs/base/**",
+                    "**/vs/platform/**",
+                    "**/vs/editor/**",
+                    "**/vs/workbench/{common,browser,node,electron-browser}/**",
+                    "vs/workbench/contrib/files/common/editors/fileEditorInput",
+                    "**/vs/workbench/services/**",
+                    "**/vs/workbench/test/**",
+                    "!path" // node modules (except path where we have our own impl)
+                ]
+            },
+            {
+                "target": "**/vs/workbench/services/**/common/**",
+                "restrictions": [
+                    "vs/nls",
+                    "**/vs/base/**/common/**",
+                    "**/vs/platform/**/common/**",
+                    "**/vs/editor/common/**",
+                    "**/vs/workbench/workbench.web.api",
+                    "**/vs/workbench/common/**",
+                    "**/vs/workbench/services/**/common/**",
+                    "**/vs/workbench/api/**/common/**",
+                    "vscode-textmate"
+                ]
+            },
+            {
+                "target": "**/vs/workbench/services/**/worker/**",
+                "restrictions": [
+                    "vs/nls",
+                    "**/vs/base/**/common/**",
+                    "**/vs/platform/**/common/**",
+                    "**/vs/editor/common/**",
+                    "**/vs/workbench/**/common/**",
+                    "**/vs/workbench/**/worker/**",
+                    "**/vs/workbench/services/**/common/**",
+                    "vscode"
+                ]
+            },
+            {
+                "target": "**/vs/workbench/services/**/browser/**",
+                "restrictions": [
+                    "vs/nls",
+                    "vs/css!./**/*",
+                    "**/vs/base/**/{common,browser,worker}/**",
+                    "**/vs/platform/**/{common,browser}/**",
+                    "**/vs/editor/{common,browser}/**",
+                    "**/vs/workbench/workbench.web.api",
+                    "**/vs/workbench/{common,browser}/**",
+                    "**/vs/workbench/api/{common,browser}/**",
+                    "**/vs/workbench/services/**/{common,browser}/**",
+                    "vscode-textmate",
+                    "onigasm-umd"
+                ]
+            },
+            {
+                "target": "**/vs/workbench/services/**/node/**",
+                "restrictions": [
+                    "vs/nls",
+                    "**/vs/base/**/{common,node}/**",
+                    "**/vs/platform/**/{common,node}/**",
+                    "**/vs/editor/{common,node}/**",
+                    "**/vs/workbench/{common,node}/**",
+                    "**/vs/workbench/api/{common,node}/**",
+                    "**/vs/workbench/services/**/{common,node}/**",
+                    "!path" // node modules (except path where we have our own impl)
+                ]
+            },
+            {
+                "target": "**/vs/workbench/services/**/electron-browser/**",
+                "restrictions": [
+                    "vs/nls",
+                    "vs/css!./**/*",
+                    "**/vs/base/**/{common,browser,worker,node,electron-browser}/**",
+                    "**/vs/platform/**/{common,browser,node,electron-browser}/**",
+                    "**/vs/editor/**",
+                    "**/vs/workbench/{common,browser,node,electron-browser,api}/**",
+                    "**/vs/workbench/services/**/{common,browser,node,electron-browser}/**",
+                    "!path" // node modules (except path where we have our own impl)
+                ]
+            },
+            {
+                "target": "**/vs/workbench/contrib/terminal/browser/**",
+                "restrictions": [
+                    // xterm and its addons are strictly browser-only components
+                    "xterm",
+                    "xterm-addon-*",
+                    "**/vs/**"
+                ]
+            },
+            {
+                "target": "**/vs/workbench/contrib/extensions/browser/**",
+                "restrictions": [
+                    "semver-umd",
+                    "**/vs/**"
+                ]
+            },
+            {
+                "target": "**/vs/workbench/contrib/update/browser/update.ts",
+                "restrictions": [
+                    "semver-umd",
+                    "**/vs/**"
+                ]
+            },
+            {
+                "target": "**/vs/code/node/**",
+                "restrictions": [
+                    "vs/nls",
+                    "**/vs/base/**/{common,node}/**",
+                    "**/vs/base/parts/**/{common,node}/**",
+                    "**/vs/platform/**/{common,node}/**",
+                    "**/vs/code/**/{common,node}/**",
+                    "!path" // node modules (except path where we have our own impl)
+                ]
+            },
+            {
+                "target": "**/vs/code/electron-browser/**",
+                "restrictions": [
+                    "vs/nls",
+                    "vs/css!./**/*",
+                    "**/vs/base/**/{common,browser,node,electron-browser}/**",
+                    "**/vs/base/parts/**/{common,browser,node,electron-browser}/**",
+                    "**/vs/platform/**/{common,browser,node,electron-browser}/**",
+                    "**/vs/code/**/{common,browser,node,electron-browser}/**",
+                    "!path" // node modules (except path where we have our own impl)
+                ]
+            },
+            {
+                "target": "**/vs/code/electron-main/**",
+                "restrictions": [
+                    "vs/nls",
+                    "**/vs/base/**/{common,node,electron-main}/**",
+                    "**/vs/base/parts/**/{common,node,electron-main}/**",
+                    "**/vs/platform/**/{common,node,electron-main}/**",
+                    "**/vs/code/**/{common,node,electron-main}/**",
+                    "!path" // node modules (except path where we have our own impl)
+                ]
+            },
+            {
+                "target": "**/vs/server/**",
+                "restrictions": [
+                    "vs/nls",
+                    "**/vs/base/**/{common,node}/**",
+                    "**/vs/base/parts/**/{common,node}/**",
+                    "**/vs/platform/**/{common,node}/**",
+                    "**/vs/workbench/**/{common,node}/**",
+                    "**/vs/server/**",
+                    "**/vs/code/**/{common,node}/**",
+                    "!path" // node modules (except path where we have our own impl)
+                ]
+            },
+            {
+                "target": "**/{node,electron-browser,electron-main}/**",
+                "restrictions": "**/*"
+            },
+            {
+                "target": "**/extensions/**",
+                "restrictions": "**/*"
+            },
+            {
+                "target": "**/test/smoke/**",
+                "restrictions": [
+                    "**/test/smoke/**",
+                    "*"
+                ]
+            },
+            {
+                "target": "**/test/automation/**",
+                "restrictions": [
+                    "**/test/automation/**",
+                    "*"
+                ]
+            },
+            {
+                "target": "{**/api/**.test.ts,}",
+                "restrictions": "{**/vs/**,assert,sinon,crypto,vscode}"
+            },
+            {
+                "target": "{**/**.test.ts,**/test/**}",
+                "restrictions": "{**/vs/**,assert,sinon,crypto}"
+            },
+            {
+                "target": "**/{common,browser,workbench}/**",
+                "restrictions": "**/vs/**"
+            }
+        ]
+    },
+    "overrides": [
+        {
+            "files": [
+                "*.js"
+            ],
+            "rules": {
+                "jsdoc/no-types": "off"
+            }
+        },
+        {
+            "files": [
+                "**/vscode.d.ts",
+                "**/vscode.proposed.d.ts"
+            ],
+            "rules": {
+                "vscode-dts-create-func": "warn",
+                "vscode-dts-literal-or-types": "warn",
+                "vscode-dts-interface-naming": "warn",
+                "vscode-dts-event-naming": [
+                    "warn",
+                    {
+                        "allowed": [
+                            "onCancellationRequested",
+                            "event"
+                        ],
+                        "verbs": [
+                            "accept",
+                            "change",
+                            "close",
+                            "collapse",
+                            "create",
+                            "delete",
+                            "dispose",
+                            "end",
+                            "expand",
+                            "hide",
+                            "open",
+                            "override",
+                            "receive",
+                            "register",
+                            "rename",
+                            "save",
+                            "send",
+                            "start",
+                            "terminate",
+                            "trigger",
+                            "unregister",
+                            "write"
+                        ]
+                    }
+                ]
+            }
+        }
+    ]
 }

.github/ISSUE_TEMPLATE/bug_report.md

@@ -2,7 +2,7 @@
 name: Bug report
 about: Create a report to help us improve
 ---
-
+<!-- Please read our Rules of Conduct: https://opensource.microsoft.com/codeofconduct/ -->
 <!-- Please search existing issues to avoid creating duplicates. -->
 <!-- Also please test using the latest insiders build to make sure your issue has not already been fixed: https://code.visualstudio.com/insiders/ -->
 

.github/ISSUE_TEMPLATE/feature_request.md

@@ -4,6 +4,7 @@ about: Suggest an idea for this project
 
 ---
 
+<!-- Please read our Rules of Conduct: https://opensource.microsoft.com/codeofconduct/ -->
 <!-- Please search existing issues to avoid creating duplicates. -->
 
 <!-- Describe the feature you'd like. -->

.github/classifier.yml

@@ -1,5 +1,5 @@
 {
-    perform: true,
+    perform: false,
     alwaysRequireAssignee: false,
     labelsRequiringAssignee: [],
     autoAssignees: {
@@ -207,7 +207,7 @@
         quick-pick: [ chrmarti ],
         release-notes: [],
         remote: {
-            assignees: [ jrieken ],
+            assignees: [  ],
             assignLabel: false
         },
         rename: [],

.github/commands.yml

@@ -131,5 +131,11 @@
             action: 'updateLabels',
             addLabel: 'a11ymas'
         },
+        {
+            type: 'label',
+            name: '*off-topic',
+            action: 'close',
+            comment: "Thanks for creating this issue. We think this issue is unactionable or unrelated to the goals of this project. Please follow our [issue reporting](https://aka.ms/vscodeissuereporting) guidelines.\n\nHappy Coding!"
+        }
     ]
 }

.github/copycat.yml

@@ -2,4 +2,4 @@
     perform: true,
     target_owner: 'chrmarti',
     target_repo: 'testissues'
-}
+}

.github/feature-requests.yml

@@ -0,0 +1,34 @@
+{
+  typeLabel: {
+    name: 'feature-request'
+  },
+  candidateMilestone: {
+    number: 107,
+    name: 'Backlog Candidates'
+  },
+  approvedMilestone: {
+    number: 8,
+    name: 'Backlog'
+  },
+  onLabeled: {
+    delay: 60,
+    perform: true
+  },
+  onCandidateMilestoned: {
+    candidatesComment: "This feature request is now a candidate for our backlog. The community has 60 days to upvote the issue. If it receives 20 upvotes we will move it to our backlog. If not, we will close it. To learn more about how we handle feature requests, please see our [documentation](https://aka.ms/vscode-issue-lifecycle).\n\nHappy Coding!",
+    perform: true
+  },
+  onMonitorUpvotes: {
+    upvoteThreshold: 20,
+    acceptanceComment: ":slightly_smiling_face: This feature request received a sufficient number of community upvotes and we moved it to our backlog. To learn more about how we handle feature requests, please see our [documentation](https://aka.ms/vscode-issue-lifecycle).\n\nHappy Coding!",
+    perform: true
+  },
+  onMonitorDaysOnCandidateMilestone: {
+    daysOnMilestone: 60,
+    warningPeriod: 10,
+    numberOfCommentsToPreventAutomaticRejection: 20,
+    rejectionComment: ":slightly_frowning_face: In the last 60 days, this feature request has received less than 20 community upvotes and we closed it. Still a big Thank You to you for taking the time to create this issue! To learn more about how we handle feature requests, please see our [documentation](https://aka.ms/vscode-issue-lifecycle).\n\nHappy Coding!",
+    warningComment: "This feature request has not yet received the 20 community upvotes it takes to make to our backlog. 10 days to go. To learn more about how we handle feature requests, please see our [documentation](https://aka.ms/vscode-issue-lifecycle).\n\nHappy Coding",
+    perform: true
+  }
+}

.github/workflows/ci.yml

@@ -35,12 +35,12 @@ jobs:
       name: Install Dependencies
     - run: yarn electron x64
       name: Download Electron
-    - run: yarn gulp hygiene --skip-tslint
+    - run: yarn gulp hygiene
       name: Run Hygiene Checks
-    - run: yarn gulp tslint
-      name: Run TSLint Checks
     - run: yarn monaco-compile-check
       name: Run Monaco Editor Checks
+    - run: yarn valid-layers-check
+      name: Run Valid Layers Checks
     - run: yarn compile
       name: Compile Sources
     - run: yarn download-builtin-extensions
@@ -67,12 +67,12 @@ jobs:
       name: Install Dependencies
     - run: yarn electron
       name: Download Electron
-    - run: yarn gulp hygiene --skip-tslint
+    - run: yarn gulp hygiene
       name: Run Hygiene Checks
-    - run: yarn gulp tslint
-      name: Run TSLint Checks
     - run: yarn monaco-compile-check
       name: Run Monaco Editor Checks
+    - run: yarn valid-layers-check
+      name: Run Valid Layers Checks
     - run: yarn compile
       name: Compile Sources
     - run: yarn download-builtin-extensions
@@ -96,12 +96,12 @@ jobs:
       name: Install Dependencies
     - run: yarn electron x64
       name: Download Electron
-    - run: yarn gulp hygiene --skip-tslint
+    - run: yarn gulp hygiene
       name: Run Hygiene Checks
-    - run: yarn gulp tslint
-      name: Run TSLint Checks
     - run: yarn monaco-compile-check
       name: Run Monaco Editor Checks
+    - run: yarn valid-layers-check
+      name: Run Valid Layers Checks
     - run: yarn compile
       name: Compile Sources
     - run: yarn download-builtin-extensions

.mailmap

@@ -1 +1,2 @@
 Eric Amodio <eamodio@microsoft.com> Eric Amodio <eamodio@gmail.com>
+Daniel Imms <daimms@microsoft.com> Daniel Imms <tyriar@tyriar.com>

.vscode/extensions.json

@@ -2,7 +2,6 @@
 	// See https://go.microsoft.com/fwlink/?LinkId=827846
 	// for the documentation about the extensions.json format
 	"recommendations": [
-		"ms-vscode.vscode-typescript-tslint-plugin",
 		"dbaeumer.vscode-eslint",
 		"EditorConfig.EditorConfig",
 		"msjsdiag.debugger-for-chrome"

.vscode/launch.json

@@ -35,7 +35,10 @@
 			"port": 5876,
 			"outFiles": [
 				"${workspaceFolder}/out/**/*.js"
-			]
+			],
+			"presentation": {
+				"hidden": true,
+			}
 		},
 		{
 			"type": "node",
@@ -53,7 +56,10 @@
 			"port": 5875,
 			"outFiles": [
 				"${workspaceFolder}/out/**/*.js"
-			]
+			],
+			"presentation": {
+				"hidden": true,
+			}
 		},
 		{
 			"type": "extensionHost",
@@ -67,7 +73,29 @@
 			],
 			"outFiles": [
 				"${workspaceFolder}/out/**/*.js"
-			]
+			],
+			"presentation": {
+				"group": "5_tests",
+				"order": 6
+			}
+		},
+		{
+			"type": "extensionHost",
+			"request": "launch",
+			"name": "VS Code Git Tests",
+			"runtimeExecutable": "${execPath}",
+			"args": [
+				"/tmp/my4g9l",
+				"--extensionDevelopmentPath=${workspaceFolder}/extensions/git",
+				"--extensionTestsPath=${workspaceFolder}/extensions/git/out/test"
+			],
+			"outFiles": [
+				"${workspaceFolder}/extensions/git/out/**/*.js"
+			],
+			"presentation": {
+				"group": "5_tests",
+				"order": 6
+			}
 		},
 		{
 			"type": "extensionHost",
@@ -82,7 +110,11 @@
 			],
 			"outFiles": [
 				"${workspaceFolder}/out/**/*.js"
-			]
+			],
+			"presentation": {
+				"group": "5_tests",
+				"order": 3
+			}
 		},
 		{
 			"type": "extensionHost",
@@ -96,7 +128,11 @@
 			],
 			"outFiles": [
 				"${workspaceFolder}/out/**/*.js"
-			]
+			],
+			"presentation": {
+				"group": "5_tests",
+				"order": 4
+			}
 		},
 		{
 			"type": "extensionHost",
@@ -110,7 +146,11 @@
 			],
 			"outFiles": [
 				"${workspaceFolder}/out/**/*.js"
-			]
+			],
+			"presentation": {
+				"group": "5_tests",
+				"order": 5
+			}
 		},
 		{
 			"type": "chrome",
@@ -140,9 +180,14 @@
 			"urlFilter": "*workbench.html*",
 			"runtimeArgs": [
 				"--inspect=5875",
-				"--no-cached-data"
+				"--no-cached-data",
+			],
+			"webRoot": "${workspaceFolder}",
+			// Settings for js-debug:
+			"pauseForSourceMap": false,
+			"outFiles": [
+				"${workspaceFolder}/out/**/*.js"
 			],
-			"webRoot": "${workspaceFolder}"
 		},
 		{
 			"type": "node",
@@ -157,7 +202,11 @@
 			],
 			"outFiles": [
 				"${workspaceFolder}/out/**/*.js"
-			]
+			],
+			"presentation": {
+				"group": "2_launch",
+				"order": 1
+			}
 		},
 		{
 			"type": "node",
@@ -167,13 +216,21 @@
 			"runtimeArgs": [
 				"web"
 			],
+			"presentation": {
+				"group": "2_launch",
+				"order": 2
+			}
 		},
 		{
 			"type": "chrome",
 			"request": "launch",
 			"name": "Launch VS Code (Web, Chrome)",
 			"url": "http://localhost:8080",
-			"preLaunchTask": "Run web"
+			"preLaunchTask": "Run web",
+			"presentation": {
+				"group": "2_launch",
+				"order": 3
+			}
 		},
 		{
 			"type": "node",
@@ -184,7 +241,26 @@
 			"cwd": "${workspaceFolder}/extensions/git",
 			"outFiles": [
 				"${workspaceFolder}/extensions/git/out/**/*.js"
-			]
+			],
+			"presentation": {
+				"group": "5_tests",
+				"order": 10
+			}
+		},
+		{
+			"type": "node",
+			"request": "launch",
+			"name": "HTML Unit Tests",
+			"program": "${workspaceFolder}/extensions/html-language-features/server/test/index.js",
+			"stopOnEntry": false,
+			"cwd": "${workspaceFolder}/extensions/html-language-features/server",
+			"outFiles": [
+				"${workspaceFolder}/extensions/html-language-features/server/out/**/*.js"
+			],
+			"presentation": {
+				"group": "5_tests",
+				"order": 10
+			}
 		},
 		{
 			"type": "extensionHost",
@@ -198,7 +274,11 @@
 			],
 			"outFiles": [
 				"${workspaceFolder}/extensions/markdown-language-features/out/**/*.js"
-			]
+			],
+			"presentation": {
+				"group": "5_tests",
+				"order": 7
+			}
 		},
 		{
 			"type": "extensionHost",
@@ -212,7 +292,11 @@
 			],
 			"outFiles": [
 				"${workspaceFolder}/extensions/typescript-language-features/out/**/*.js"
-			]
+			],
+			"presentation": {
+				"group": "5_tests",
+				"order": 8
+			}
 		},
 		{
 			"type": "node",
@@ -236,6 +320,9 @@
 			],
 			"env": {
 				"MOCHA_COLORS": "true"
+			},
+			"presentation": {
+				"hidden": true
 			}
 		},
 		{
@@ -276,28 +363,44 @@
 				"Launch VS Code",
 				"Attach to Main Process",
 				"Attach to Extension Host"
-			]
+			],
+			"presentation": {
+				"group": "1_vscode",
+				"order": 1
+			}
 		},
 		{
 			"name": "Search and Renderer processes",
 			"configurations": [
 				"Launch VS Code",
 				"Attach to Search Process"
-			]
+			],
+			"presentation": {
+				"group": "1_vscode",
+				"order": 4
+			}
 		},
 		{
 			"name": "Renderer and Extension Host processes",
 			"configurations": [
 				"Launch VS Code",
 				"Attach to Extension Host"
-			]
+			],
+			"presentation": {
+				"group": "1_vscode",
+				"order": 3
+			}
 		},
 		{
 			"name": "Debug Unit Tests",
 			"configurations": [
 				"Attach to VS Code",
 				"Run Unit Tests"
-			]
-		},
+			],
+			"presentation": {
+				"group": "1_vscode",
+				"order": 2
+			}
+		}
 	]
 }

.vscode/searches/ts36031.code-search

@@ -0,0 +1,9 @@
+# Query: \\w+\\?\\..+![(.[]
+# Flags: RegExp
+# ContextLines: 2
+src/vs/base/browser/ui/tree/asyncDataTree.ts:
+  270  			} : undefined,
+  271  			isChecked: options.ariaProvider!.isChecked ? (e) => {
+  272: 				return options.ariaProvider?.isChecked!(e.element as T);
+  273  			} : undefined
+  274  		},

.vscode/settings.json

@@ -37,6 +37,11 @@
 			}
 		}
 	],
+	"eslint.options": {
+		"rulePaths": [
+			"./build/lib/eslint"
+		]
+	},
 	"typescript.tsdk": "node_modules/typescript/lib",
 	"npm.exclude": "**/extensions/**",
 	"npm.packageManager": "yarn",

.vscode/tasks.json

@@ -45,14 +45,6 @@
 				"applyTo": "allDocuments"
 			}
 		},
-		{
-			"type": "gulp",
-			"task": "tslint",
-			"label": "Run tslint",
-			"problemMatcher": [
-				"$tslint5"
-			]
-		},
 		{
 			"label": "Run tests",
 			"type": "shell",
@@ -90,7 +82,6 @@
 			"command": "yarn web -- --no-launch",
 			"label": "Run web",
 			"isBackground": true,
-			// This section to make error go away when launching the debug config
 			"problemMatcher": {
 				"pattern": {
 					"regexp": ""
@@ -104,5 +95,13 @@
 				"reveal": "never"
 			}
 		},
+		{
+			"type": "npm",
+			"script": "eslint",
+			"problemMatcher": {
+				"source": "eslint",
+				"base": "$eslint-stylish"
+			}
+		}
 	]
 }

.yarnrc

@@ -1,3 +1,3 @@
 disturl "https://atom.io/download/electron"
-target "6.1.5"
+target "7.1.11"
 runtime "electron"

ThirdPartyNotices.txt

@@ -7,31 +7,31 @@ This project incorporates components from the projects listed below. The origina
 
 1.	atom/language-clojure version 0.22.7 (https://github.com/atom/language-clojure)
 2.	atom/language-coffee-script version 0.49.3 (https://github.com/atom/language-coffee-script)
-3.	atom/language-java version 0.31.3 (https://github.com/atom/language-java)
+3.	atom/language-java version 0.31.4 (https://github.com/atom/language-java)
 4.	atom/language-sass version 0.62.1 (https://github.com/atom/language-sass)
 5.	atom/language-shellscript version 0.26.0 (https://github.com/atom/language-shellscript)
 6.	atom/language-xml version 0.35.2 (https://github.com/atom/language-xml)
-7.	Colorsublime-Themes version 0.1.0 (https://github.com/Colorsublime/Colorsublime-Themes)
-8.	daaain/Handlebars version 1.8.0 (https://github.com/daaain/Handlebars)
-9.	davidrios/pug-tmbundle (https://github.com/davidrios/pug-tmbundle)
-10.	definitelytyped (https://github.com/DefinitelyTyped/DefinitelyTyped)
-11.	demyte/language-cshtml version 0.3.0 (https://github.com/demyte/language-cshtml)
-12.	Document Object Model version 4.0.0 (https://www.w3.org/DOM/)
-13.	dotnet/csharp-tmLanguage version 0.1.0 (https://github.com/dotnet/csharp-tmLanguage)
-14.	expand-abbreviation version 0.5.8 (https://github.com/emmetio/expand-abbreviation)
-15.	fadeevab/make.tmbundle (https://github.com/fadeevab/make.tmbundle)
-16.	freebroccolo/atom-language-swift (https://github.com/freebroccolo/atom-language-swift)
-17.	HTML 5.1 W3C Working Draft version 08 October 2015 (http://www.w3.org/TR/2015/WD-html51-20151008/)
-18.	Ikuyadeu/vscode-R version 0.5.5 (https://github.com/Ikuyadeu/vscode-R)
-19.	insane version 2.6.2 (https://github.com/bevacqua/insane)
-20.	Ionic documentation version 1.2.4 (https://github.com/ionic-team/ionic-site)
-21.	ionide/ionide-fsgrammar (https://github.com/ionide/ionide-fsgrammar)
-22.	jeff-hykin/cpp-textmate-grammar version 1.12.11 (https://github.com/jeff-hykin/cpp-textmate-grammar)
-23.	jeff-hykin/cpp-textmate-grammar version 1.14.13 (https://github.com/jeff-hykin/cpp-textmate-grammar)
-24.	js-beautify version 1.6.8 (https://github.com/beautify-web/js-beautify)
-25.	Jxck/assert version 1.0.0 (https://github.com/Jxck/assert)
-26.	language-docker (https://github.com/moby/moby)
-27.	language-go version 0.44.3 (https://github.com/atom/language-go)
+7.	better-go-syntax version 1.0.0 (https://github.com/jeff-hykin/better-go-syntax/ )
+8.	Colorsublime-Themes version 0.1.0 (https://github.com/Colorsublime/Colorsublime-Themes)
+9.	daaain/Handlebars version 1.8.0 (https://github.com/daaain/Handlebars)
+10.	davidrios/pug-tmbundle (https://github.com/davidrios/pug-tmbundle)
+11.	definitelytyped (https://github.com/DefinitelyTyped/DefinitelyTyped)
+12.	demyte/language-cshtml version 0.3.0 (https://github.com/demyte/language-cshtml)
+13.	Document Object Model version 4.0.0 (https://www.w3.org/DOM/)
+14.	dotnet/csharp-tmLanguage version 0.1.0 (https://github.com/dotnet/csharp-tmLanguage)
+15.	expand-abbreviation version 0.5.8 (https://github.com/emmetio/expand-abbreviation)
+16.	fadeevab/make.tmbundle (https://github.com/fadeevab/make.tmbundle)
+17.	freebroccolo/atom-language-swift (https://github.com/freebroccolo/atom-language-swift)
+18.	HTML 5.1 W3C Working Draft version 08 October 2015 (http://www.w3.org/TR/2015/WD-html51-20151008/)
+19.	Ikuyadeu/vscode-R version 0.5.5 (https://github.com/Ikuyadeu/vscode-R)
+20.	insane version 2.6.2 (https://github.com/bevacqua/insane)
+21.	Ionic documentation version 1.2.4 (https://github.com/ionic-team/ionic-site)
+22.	ionide/ionide-fsgrammar (https://github.com/ionide/ionide-fsgrammar)
+23.	jeff-hykin/cpp-textmate-grammar version 1.12.11 (https://github.com/jeff-hykin/cpp-textmate-grammar)
+24.	jeff-hykin/cpp-textmate-grammar version 1.14.15 (https://github.com/jeff-hykin/cpp-textmate-grammar)
+25.	js-beautify version 1.6.8 (https://github.com/beautify-web/js-beautify)
+26.	Jxck/assert version 1.0.0 (https://github.com/Jxck/assert)
+27.	language-docker (https://github.com/moby/moby)
 28.	language-less version 0.34.2 (https://github.com/atom/language-less)
 29.	language-php version 0.44.3 (https://github.com/atom/language-php)
 30.	language-rust version 0.4.12 (https://github.com/zargony/atom-language-rust)
@@ -340,6 +340,32 @@ suitability for any purpose.
 =========================================
 END OF atom/language-xml NOTICES AND INFORMATION
 
+%% better-go-syntax NOTICES AND INFORMATION BEGIN HERE
+=========================================
+MIT License
+
+Copyright (c) 2019 Jeff Hykin
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+=========================================
+END OF better-go-syntax NOTICES AND INFORMATION
+
 %% Colorsublime-Themes NOTICES AND INFORMATION BEGIN HERE
 =========================================
 Copyright (c) 2015 Colorsublime.com
@@ -987,83 +1013,6 @@ Apache License
 =========================================
 END OF language-docker NOTICES AND INFORMATION
 
-%% language-go NOTICES AND INFORMATION BEGIN HERE
-=========================================
-The MIT License (MIT)
-
-Copyright (c) 2014 GitHub Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-This package was derived from a TextMate bundle located at
-https://github.com/rsms/Go.tmbundle and distributed under the following
-license, located in `LICENSE`:
-
-Copyright (c) 2009 Rasmus Andersson
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-
-The Go Template grammar was derived from GoSublime located at
-https://github.com/DisposaBoy/GoSublime and distributed under the following
-license, located in `LICENSE.md`:
-
-Copyright (c) 2012 The GoSublime Authors
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-=========================================
-END OF language-go NOTICES AND INFORMATION
-
 %% language-less NOTICES AND INFORMATION BEGIN HERE
 =========================================
 The MIT License (MIT)
@@ -1692,10 +1641,10 @@ Copyright (c) Microsoft Corporation
 All rights reserved.
 MIT License
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the ""Software""), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-Copyright (c) 2016 Sanjay Nagamangalam
+Copyright (c) 2016 Microsoft
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
------------------------------------------------ END OF LICENSE ------------------------------------------
+----------------------------------------------- END OF LICENSE -----------------------------------------
 =========================================
 END OF Microsoft/vscode-mssql NOTICES AND INFORMATION
 
@@ -2858,4 +2807,4 @@ Apache License
    See the License for the specific language governing permissions and
    limitations under the License.
 =========================================
-END OF Web Background Synchronization NOTICES AND INFORMATION
+END OF Web Background Synchronization NOTICES AND INFORMATION

azure-pipelines.yml

@@ -13,6 +13,6 @@ jobs:
 
 - job: macOS
   pool:
-    vmImage: macOS 10.13
+    vmImage: macOS-latest
   steps:
-  - template: build/azure-pipelines/darwin/continuous-build-darwin.yml
+  - template: build/azure-pipelines/darwin/continuous-build-darwin.yml

build/azure-pipelines/common/createAsset.ts

@@ -44,15 +44,16 @@ async function doesAssetExist(blobService: azure.BlobService, quality: string, b
 	return existsResult.exists;
 }
 
-async function uploadBlob(blobService: azure.BlobService, quality: string, blobName: string, file: string): Promise<void> {
+async function uploadBlob(blobService: azure.BlobService, quality: string, blobName: string, filePath: string, fileName: string): Promise<void> {
 	const blobOptions: azure.BlobService.CreateBlockBlobRequestOptions = {
 		contentSettings: {
-			contentType: mime.lookup(file),
+			contentType: mime.lookup(filePath),
+			contentDisposition: `attachment; filename="${fileName}"`,
 			cacheControl: 'max-age=31536000, public'
 		}
 	};
 
-	await new Promise((c, e) => blobService.createBlockBlobFromLocalFile(quality, blobName, file, blobOptions, err => err ? e(err) : c()));
+	await new Promise((c, e) => blobService.createBlockBlobFromLocalFile(quality, blobName, filePath, blobOptions, err => err ? e(err) : c()));
 }
 
 function getEnv(name: string): string {
@@ -66,24 +67,24 @@ function getEnv(name: string): string {
 }
 
 async function main(): Promise<void> {
-	const [, , platform, type, name, file] = process.argv;
+	const [, , platform, type, fileName, filePath] = process.argv;
 	const quality = getEnv('VSCODE_QUALITY');
 	const commit = getEnv('BUILD_SOURCEVERSION');
 
 	console.log('Creating asset...');
 
-	const stat = await new Promise<fs.Stats>((c, e) => fs.stat(file, (err, stat) => err ? e(err) : c(stat)));
+	const stat = await new Promise<fs.Stats>((c, e) => fs.stat(filePath, (err, stat) => err ? e(err) : c(stat)));
 	const size = stat.size;
 
 	console.log('Size:', size);
 
-	const stream = fs.createReadStream(file);
+	const stream = fs.createReadStream(filePath);
 	const [sha1hash, sha256hash] = await Promise.all([hashStream('sha1', stream), hashStream('sha256', stream)]);
 
 	console.log('SHA1:', sha1hash);
 	console.log('SHA256:', sha256hash);
 
-	const blobName = commit + '/' + name;
+	const blobName = commit + '/' + fileName;
 	const storageAccount = process.env['AZURE_STORAGE_ACCOUNT_2']!;
 
 	const blobService = azure.createBlobService(storageAccount, process.env['AZURE_STORAGE_ACCESS_KEY_2']!)
@@ -98,7 +99,7 @@ async function main(): Promise<void> {
 
 	console.log('Uploading blobs to Azure storage...');
 
-	await uploadBlob(blobService, quality, blobName, file);
+	await uploadBlob(blobService, quality, blobName, filePath, fileName);
 
 	console.log('Blobs successfully uploaded.');
 

build/azure-pipelines/darwin/continuous-build-darwin.yml

@@ -24,14 +24,14 @@ steps:
     yarn electron x64
   displayName: Download Electron
 - script: |
-    yarn gulp hygiene --skip-tslint
+    yarn gulp hygiene
   displayName: Run Hygiene Checks
-- script: |
-    yarn gulp tslint
-  displayName: Run TSLint Checks
 - script: |
     yarn monaco-compile-check
   displayName: Run Monaco Editor Checks
+- script: |
+    yarn valid-layers-check
+  displayName: Run Valid Layers Checks
 - script: |
     yarn compile
   displayName: Compile Sources

build/azure-pipelines/darwin/product-build-darwin.yml

@@ -114,16 +114,16 @@ steps:
   displayName: Run integration tests
   condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
-# Web Smoke Tests disabled due to https://github.com/microsoft/vscode/issues/80308
-# - script: |
-#     set -e
-#     cd test/smoke
-#     yarn compile
-#     cd -
-#     yarn smoketest --web --headless
-#   continueOnError: true
-#   displayName: Run web smoke tests
-#   condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+- script: |
+    set -e
+    cd test/smoke
+    yarn compile
+    cd -
+    VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-web-darwin" \
+    yarn smoketest --web --headless
+  continueOnError: true
+  displayName: Run web smoke tests
+  condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
 - script: |
     set -e

build/azure-pipelines/linux/continuous-build-linux.yml

@@ -32,14 +32,14 @@ steps:
     yarn electron x64
   displayName: Download Electron
 - script: |
-    yarn gulp hygiene --skip-tslint
+    yarn gulp hygiene
   displayName: Run Hygiene Checks
-- script: |
-    yarn gulp tslint
-  displayName: Run TSLint Checks
 - script: |
     yarn monaco-compile-check
   displayName: Run Monaco Editor Checks
+- script: |
+    yarn valid-layers-check
+  displayName: Run Valid Layers Checks
 - script: |
     yarn compile
   displayName: Compile Sources

build/azure-pipelines/linux/xvfb.init

@@ -19,7 +19,7 @@
 [ "${NETWORKING}" = "no" ] && exit 0
 
 PROG="/usr/bin/Xvfb"
-PROG_OPTIONS=":10 -ac"
+PROG_OPTIONS=":10 -ac -screen 0 1024x768x24"
 PROG_OUTPUT="/tmp/Xvfb.out"
 
 case "$1" in
@@ -50,4 +50,4 @@ case "$1" in
 		exit 1
 esac
 
-exit $RETVAL
+exit $RETVAL

build/azure-pipelines/product-build.yml

@@ -102,7 +102,7 @@ jobs:
 - job: macOS
   condition: and(succeeded(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'), eq(variables['VSCODE_BUILD_MACOS'], 'true'))
   pool:
-    vmImage: macOS 10.13
+    vmImage: macOS-latest
   dependsOn:
   - Compile
   steps:

build/azure-pipelines/product-compile.yml

@@ -88,10 +88,10 @@ steps:
 
 - script: |
     set -e
-    yarn gulp hygiene --skip-tslint
-    yarn gulp tslint
+    yarn gulp hygiene
     yarn monaco-compile-check
-  displayName: Run hygiene, tslint and monaco compile checks
+    yarn valid-layers-check
+  displayName: Run hygiene, monaco compile & valid layers checks
   condition: and(succeeded(), ne(variables['CacheExists-Compilation'], 'true'), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
 - script: |

build/azure-pipelines/win32/continuous-build-win32.yml

@@ -29,14 +29,14 @@ steps:
 - powershell: |
     yarn electron
 - script: |
-    yarn gulp hygiene --skip-tslint
+    yarn gulp hygiene
   displayName: Run Hygiene Checks
-- script: |
-    yarn gulp tslint
-  displayName: Run TSLint Checks
 - powershell: |
     yarn monaco-compile-check
   displayName: Run Monaco Editor Checks
+- script: |
+    yarn valid-layers-check
+  displayName: Run Valid Layers Checks
 - powershell: |
     yarn compile
   displayName: Compile Sources

build/builtInExtensions.json

@@ -1,7 +1,7 @@
 [
 	{
 		"name": "ms-vscode.node-debug",
-		"version": "1.41.1",
+		"version": "1.42.0",
 		"repo": "https://github.com/Microsoft/vscode-node-debug",
 		"metadata": {
 			"id": "b6ded8fb-a0a0-4c1c-acbd-ab2a3bc995a6",
@@ -16,7 +16,7 @@
 	},
 	{
 		"name": "ms-vscode.node-debug2",
-		"version": "1.41.2",
+		"version": "1.42.1",
 		"repo": "https://github.com/Microsoft/vscode-node-debug2",
 		"metadata": {
 			"id": "36d19e17-7569-4841-a001-947eb18602b2",
@@ -31,7 +31,7 @@
 	},
 	{
 		"name": "ms-vscode.references-view",
-		"version": "0.0.39",
+		"version": "0.0.47",
 		"repo": "https://github.com/Microsoft/vscode-reference-view",
 		"metadata": {
 			"id": "dc489f46-520d-4556-ae85-1f9eab3c412d",
@@ -43,5 +43,23 @@
 			},
 			"publisherDisplayName": "Microsoft"
 		}
+	},
+	{
+		"name": "ms-vscode.js-debug-nightly",
+		"version": "2020.2.408",
+		"forQualities": [
+			"insider"
+		],
+		"repo": "https://github.com/Microsoft/vscode-js-debug",
+		"metadata": {
+			"id": "7acbb4ce-c85a-49d4-8d95-a8054406ae97",
+			"publisherId": {
+				"publisherId": "5f5636e7-69ed-4afe-b5d6-8d231fb3d3ee",
+				"publisherName": "ms-vscode",
+				"displayName": "Microsoft",
+				"flags": "verified"
+			},
+			"publisherDisplayName": "Microsoft"
+		}
 	}
 ]

build/builtin/browser-main.js

@@ -10,6 +10,7 @@ const os = require('os');
 const { remote } = require('electron');
 const dialog = remote.dialog;
 
+const productJsonPath = path.join(__dirname, '..', '..', 'product.json');
 const builtInExtensionsPath = path.join(__dirname, '..', 'builtInExtensions.json');
 const controlFilePath = path.join(os.homedir(), '.vscode-oss-dev', 'extensions', 'control.json');
 
@@ -51,6 +52,7 @@ function render(el, state) {
 	}
 
 	const ul = document.createElement('ul');
+	const { quality } = readJson(productJsonPath);
 	const { builtin, control } = state;
 
 	for (const ext of builtin) {
@@ -61,6 +63,10 @@ function render(el, state) {
 
 		const name = document.createElement('code');
 		name.textContent = ext.name;
+		if (quality && ext.forQualities && !ext.forQualities.includes(quality)) {
+			name.textContent += ` (only on ${ext.forQualities.join(', ')})`;
+		}
+
 		li.appendChild(name);
 
 		const form = document.createElement('form');
@@ -123,4 +129,4 @@ function main() {
 	render(el, { builtin, control });
 }
 
-window.onload = main;
+window.onload = main;

build/gulpfile.editor.js

@@ -17,14 +17,14 @@ const compilation = require('./lib/compilation');
 const monacoapi = require('./monaco/api');
 const fs = require('fs');
 
-var root = path.dirname(__dirname);
-var sha1 = util.getVersion(root);
-var semver = require('./monaco/package.json').version;
-var headerVersion = semver + '(' + sha1 + ')';
+let root = path.dirname(__dirname);
+let sha1 = util.getVersion(root);
+let semver = require('./monaco/package.json').version;
+let headerVersion = semver + '(' + sha1 + ')';
 
 // Build
 
-var editorEntryPoints = [
+let editorEntryPoints = [
 	{
 		name: 'vs/editor/editor.main',
 		include: [],
@@ -40,11 +40,11 @@ var editorEntryPoints = [
 	}
 ];
 
-var editorResources = [
+let editorResources = [
 	'out-editor-build/vs/base/browser/ui/codiconLabel/**/*.ttf'
 ];
 
-var BUNDLED_FILE_HEADER = [
+let BUNDLED_FILE_HEADER = [
 	'/*!-----------------------------------------------------------',
 	' * Copyright (c) Microsoft Corporation. All rights reserved.',
 	' * Version: ' + headerVersion,
@@ -197,7 +197,7 @@ const compileEditorESMTask = task.define('compile-editor-esm', () => {
 });
 
 function toExternalDTS(contents) {
-	let lines = contents.split('\n');
+	let lines = contents.split(/\r\n|\r|\n/);
 	let killNextCloseCurlyBrace = false;
 	for (let i = 0; i < lines.length; i++) {
 		let line = lines[i];
@@ -227,8 +227,13 @@ function toExternalDTS(contents) {
 		if (line.indexOf('declare namespace monaco.') === 0) {
 			lines[i] = line.replace('declare namespace monaco.', 'export namespace ');
 		}
+
+		if (line.indexOf('declare let MonacoEnvironment') === 0) {
+			lines[i] = `declare global {\n    let MonacoEnvironment: Environment | undefined;\n}`;
+			// lines[i] = line.replace('declare namespace monaco.', 'export namespace ');
+		}
 	}
-	return lines.join('\n');
+	return lines.join('\n').replace(/\n\n\n+/g, '\n\n');
 }
 
 function filterStream(testFunc) {
@@ -263,7 +268,7 @@ const finalEditorResourcesTask = task.define('final-editor-resources', () => {
 		// package.json
 		gulp.src('build/monaco/package.json')
 			.pipe(es.through(function (data) {
-				var json = JSON.parse(data.contents.toString());
+				let json = JSON.parse(data.contents.toString());
 				json.private = false;
 				data.contents = Buffer.from(JSON.stringify(json, null, '  '));
 				this.emit('data', data);
@@ -307,10 +312,10 @@ const finalEditorResourcesTask = task.define('final-editor-resources', () => {
 				return;
 			}
 
-			var relativePathToMap = path.relative(path.join(data.relative), path.join('min-maps', data.relative + '.map'));
+			let relativePathToMap = path.relative(path.join(data.relative), path.join('min-maps', data.relative + '.map'));
 
-			var strContents = data.contents.toString();
-			var newStr = '//# sourceMappingURL=' + relativePathToMap.replace(/\\/g, '/');
+			let strContents = data.contents.toString();
+			let newStr = '//# sourceMappingURL=' + relativePathToMap.replace(/\\/g, '/');
 			strContents = strContents.replace(/\/\/# sourceMappingURL=[^ ]+$/, newStr);
 
 			data.contents = Buffer.from(strContents);
@@ -353,6 +358,13 @@ gulp.task('editor-distro',
 	)
 );
 
+gulp.task('monacodts', task.define('monacodts', () => {
+	const result = monacoapi.execute();
+	fs.writeFileSync(result.filePath, result.content);
+	fs.writeFileSync(path.join(root, 'src/vs/editor/common/standalone/standaloneEnums.ts'), result.enums);
+	return Promise.resolve(true);
+}));
+
 //#region monaco type checking
 
 function createTscCompileTask(watch) {

build/gulpfile.hygiene.js

@@ -8,10 +8,8 @@
 const gulp = require('gulp');
 const filter = require('gulp-filter');
 const es = require('event-stream');
-const gulptslint = require('gulp-tslint');
 const gulpeslint = require('gulp-eslint');
 const tsfmt = require('typescript-formatter');
-const tslint = require('tslint');
 const VinylFile = require('vinyl');
 const vfs = require('vinyl-fs');
 const path = require('path');
@@ -85,7 +83,7 @@ const indentationFilter = [
 	'!src/typings/**/*.d.ts',
 	'!extensions/**/*.d.ts',
 	'!**/*.{svg,exe,png,bmp,scpt,bat,cmd,cur,ttf,woff,eot,md,ps1,template,yaml,yml,d.ts.recipe,ico,icns}',
-	'!build/{lib,tslintRules,download}/**/*.js',
+	'!build/{lib,download}/**/*.js',
 	'!build/**/*.sh',
 	'!build/azure-pipelines/**/*.js',
 	'!build/azure-pipelines/**/*.config',
@@ -128,7 +126,7 @@ const copyrightFilter = [
 	'!scripts/code-web.js'
 ];
 
-const eslintFilter = [
+const jsHygieneFilter = [
 	'src/**/*.js',
 	'build/gulpfile.*.js',
 	'!src/vs/loader.js',
@@ -141,7 +139,10 @@ const eslintFilter = [
 	'!**/test/**'
 ];
 
-const tslintBaseFilter = [
+const tsHygieneFilter = [
+	'src/**/*.ts',
+	'test/**/*.ts',
+	'extensions/**/*.ts',
 	'!**/fixtures/**',
 	'!**/typings/**',
 	'!**/node_modules/**',
@@ -152,30 +153,6 @@ const tslintBaseFilter = [
 	'!extensions/html-language-features/server/lib/jquery.d.ts'
 ];
 
-const tslintCoreFilter = [
-	'src/**/*.ts',
-	'test/**/*.ts',
-	'!extensions/**/*.ts',
-	'!test/automation/**',
-	'!test/smoke/**',
-	...tslintBaseFilter
-];
-
-const tslintExtensionsFilter = [
-	'extensions/**/*.ts',
-	'!src/**/*.ts',
-	'!test/**/*.ts',
-	'test/automation/**/*.ts',
-	...tslintBaseFilter
-];
-
-const tslintHygieneFilter = [
-	'src/**/*.ts',
-	'test/**/*.ts',
-	'extensions/**/*.ts',
-	...tslintBaseFilter
-];
-
 const copyrightHeaderLines = [
 	'/*---------------------------------------------------------------------------------------------',
 	' *  Copyright (c) Microsoft Corporation. All rights reserved.',
@@ -185,27 +162,17 @@ const copyrightHeaderLines = [
 
 gulp.task('eslint', () => {
 	return vfs.src(all, { base: '.', follow: true, allowEmpty: true })
-		.pipe(filter(eslintFilter))
-		.pipe(gulpeslint('src/.eslintrc'))
+		.pipe(filter(jsHygieneFilter.concat(tsHygieneFilter)))
+		.pipe(gulpeslint({
+			configFile: '.eslintrc.json',
+			rulePaths: ['./build/lib/eslint']
+		}))
 		.pipe(gulpeslint.formatEach('compact'))
-		.pipe(gulpeslint.failAfterError());
-});
-
-gulp.task('tslint', () => {
-	return es.merge([
-
-		// Core: include type information (required by certain rules like no-nodejs-globals)
-		vfs.src(all, { base: '.', follow: true, allowEmpty: true })
-			.pipe(filter(tslintCoreFilter))
-			.pipe(gulptslint.default({ rulesDirectory: 'build/lib/tslint', program: tslint.Linter.createProgram('src/tsconfig.json') }))
-			.pipe(gulptslint.default.report({ emitError: true })),
-
-		// Exenstions: do not include type information
-		vfs.src(all, { base: '.', follow: true, allowEmpty: true })
-			.pipe(filter(tslintExtensionsFilter))
-			.pipe(gulptslint.default({ rulesDirectory: 'build/lib/tslint' }))
-			.pipe(gulptslint.default.report({ emitError: true }))
-	]).pipe(es.through());
+		.pipe(gulpeslint.results(results => {
+			if (results.warningCount > 0 || results.errorCount > 0) {
+				throw new Error('eslint failed with warnings and/or errors');
+			}
+		}));
 });
 
 function checkPackageJSON(actualPath) {
@@ -227,7 +194,7 @@ function checkPackageJSON(actualPath) {
 
 const checkPackageJSONTask = task.define('check-package-json', () => {
 	return gulp.src('package.json')
-		.pipe(es.through(function() {
+		.pipe(es.through(function () {
 			checkPackageJSON.call(this, 'remote/package.json');
 			checkPackageJSON.call(this, 'remote/web/package.json');
 		}));
@@ -294,8 +261,6 @@ function hygiene(some) {
 			replace: undefined,
 			tsconfig: undefined,
 			tsconfigFile: undefined,
-			tslint: undefined,
-			tslintFile: undefined,
 			tsfmtFile: undefined,
 			vscode: undefined,
 			vscodeFile: undefined
@@ -304,7 +269,7 @@ function hygiene(some) {
 			let formatted = result.dest.replace(/\r\n/gm, '\n');
 
 			if (original !== formatted) {
-				console.error("File not formatted. Run the 'Format Document' command to fix it:", file.relative);
+				console.error('File not formatted. Run the \'Format Document\' command to fix it:', file.relative);
 				errorCount++;
 			}
 			cb(null, file);
@@ -314,16 +279,6 @@ function hygiene(some) {
 		});
 	});
 
-	const tslintConfiguration = tslint.Configuration.findConfiguration('tslint.json', '.');
-	const tslintOptions = { fix: false, formatter: 'json' };
-	const tsLinter = new tslint.Linter(tslintOptions);
-
-	const tsl = es.through(function (file) {
-		const contents = file.contents.toString('utf8');
-		tsLinter.lint(file.relative, contents, tslintConfiguration.results);
-		this.emit('data', file);
-	});
-
 	let input;
 
 	if (Array.isArray(some) || typeof some === 'string' || !some) {
@@ -349,19 +304,21 @@ function hygiene(some) {
 		.pipe(filter(copyrightFilter))
 		.pipe(copyrights);
 
-	let typescript = result
-		.pipe(filter(tslintHygieneFilter))
+	const typescript = result
+		.pipe(filter(tsHygieneFilter))
 		.pipe(formatting);
 
-	if (!process.argv.some(arg => arg === '--skip-tslint')) {
-		typescript = typescript.pipe(tsl);
-	}
-
 	const javascript = result
-		.pipe(filter(eslintFilter))
-		.pipe(gulpeslint('src/.eslintrc'))
+		.pipe(filter(jsHygieneFilter.concat(tsHygieneFilter)))
+		.pipe(gulpeslint({
+			configFile: '.eslintrc.json',
+			rulePaths: ['./build/lib/eslint']
+		}))
 		.pipe(gulpeslint.formatEach('compact'))
-		.pipe(gulpeslint.failAfterError());
+		.pipe(gulpeslint.results(results => {
+			errorCount += results.warningCount;
+			errorCount += results.errorCount;
+		}));
 
 	let count = 0;
 	return es.merge(typescript, javascript)
@@ -373,20 +330,6 @@ function hygiene(some) {
 			this.emit('data', data);
 		}, function () {
 			process.stdout.write('\n');
-
-			const tslintResult = tsLinter.getResult();
-			if (tslintResult.failures.length > 0) {
-				for (const failure of tslintResult.failures) {
-					const name = failure.getFileName();
-					const position = failure.getStartPosition();
-					const line = position.getLineAndCharacter().line;
-					const character = position.getLineAndCharacter().character;
-
-					console.error(`${name}:${line + 1}:${character + 1}:${failure.getFailure()}`);
-				}
-				errorCount += tslintResult.failures.length;
-			}
-
 			if (errorCount > 0) {
 				this.emit('error', 'Hygiene failed with ' + errorCount + ' errors. Check \'build/gulpfile.hygiene.js\'.');
 			} else {

build/gulpfile.reh.js

@@ -118,7 +118,7 @@ function mixinServer(watch) {
 	const packageJSONPath = path.join(path.dirname(__dirname), 'package.json');
 	function exec(cmdLine) {
 		console.log(cmdLine);
-		cp.execSync(cmdLine, { stdio: "inherit" });
+		cp.execSync(cmdLine, { stdio: 'inherit' });
 	}
 	function checkout() {
 		const packageJSON = JSON.parse(fs.readFileSync(packageJSONPath).toString());

build/gulpfile.vscode.js

@@ -121,9 +121,9 @@ gulp.task(minifyVSCodeTask);
  * @return {Object} A map of paths to checksums.
  */
 function computeChecksums(out, filenames) {
-	var result = {};
+	let result = {};
 	filenames.forEach(function (filename) {
-		var fullPath = path.join(process.cwd(), out, filename);
+		let fullPath = path.join(process.cwd(), out, filename);
 		result[filename] = computeChecksum(fullPath);
 	});
 	return result;
@@ -136,9 +136,9 @@ function computeChecksums(out, filenames) {
  * @return {string} The checksum for `filename`.
  */
 function computeChecksum(filename) {
-	var contents = fs.readFileSync(filename);
+	let contents = fs.readFileSync(filename);
 
-	var hash = crypto
+	let hash = crypto
 		.createHash('md5')
 		.update(contents)
 		.digest('base64')
@@ -428,7 +428,7 @@ gulp.task('vscode-translations-pull', function () {
 });
 
 gulp.task('vscode-translations-import', function () {
-	var options = minimist(process.argv.slice(2), {
+	let options = minimist(process.argv.slice(2), {
 		string: 'location',
 		default: {
 			location: '../vscode-translations-import'

build/gulpfile.vscode.linux.js

@@ -23,7 +23,7 @@ const commit = util.getVersion(root);
 const linuxPackageRevision = Math.floor(new Date().getTime() / 1000);
 
 function getDebPackageArch(arch) {
-	return { x64: 'amd64', arm: 'armhf', arm64: "arm64" }[arch];
+	return { x64: 'amd64', arm: 'armhf', arm64: 'arm64' }[arch];
 }
 
 function prepareDebPackage(arch) {
@@ -117,7 +117,7 @@ function getRpmBuildPath(rpmArch) {
 }
 
 function getRpmPackageArch(arch) {
-	return { x64: 'x86_64', arm: 'armhf', arm64: "arm64" }[arch];
+	return { x64: 'x86_64', arm: 'armhf', arm64: 'arm64' }[arch];
 }
 
 function prepareRpmPackage(arch) {

build/lib/eslint/code-import-patterns.js

@@ -0,0 +1,59 @@
+"use strict";
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+const path_1 = require("path");
+const minimatch = require("minimatch");
+const utils_1 = require("./utils");
+module.exports = new class {
+    constructor() {
+        this.meta = {
+            messages: {
+                badImport: 'Imports violates \'{{restrictions}}\' restrictions. See https://github.com/microsoft/vscode/wiki/Source-Code-Organization'
+            },
+            docs: {
+                url: 'https://github.com/microsoft/vscode/wiki/Source-Code-Organization'
+            }
+        };
+    }
+    create(context) {
+        const configs = context.options;
+        for (const config of configs) {
+            if (minimatch(context.getFilename(), config.target)) {
+                return utils_1.createImportRuleListener((node, value) => this._checkImport(context, config, node, value));
+            }
+        }
+        return {};
+    }
+    _checkImport(context, config, node, path) {
+        // resolve relative paths
+        if (path[0] === '.') {
+            path = path_1.join(context.getFilename(), path);
+        }
+        let restrictions;
+        if (typeof config.restrictions === 'string') {
+            restrictions = [config.restrictions];
+        }
+        else {
+            restrictions = config.restrictions;
+        }
+        let matched = false;
+        for (const pattern of restrictions) {
+            if (minimatch(path, pattern)) {
+                matched = true;
+                break;
+            }
+        }
+        if (!matched) {
+            // None of the restrictions matched
+            context.report({
+                loc: node.loc,
+                messageId: 'badImport',
+                data: {
+                    restrictions: restrictions.join(' or ')
+                }
+            });
+        }
+    }
+};

build/lib/eslint/code-import-patterns.ts

@@ -0,0 +1,75 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as eslint from 'eslint';
+import { TSESTree } from '@typescript-eslint/experimental-utils';
+import { join } from 'path';
+import * as minimatch from 'minimatch';
+import { createImportRuleListener } from './utils';
+
+interface ImportPatternsConfig {
+	target: string;
+	restrictions: string | string[];
+}
+
+export = new class implements eslint.Rule.RuleModule {
+
+	readonly meta: eslint.Rule.RuleMetaData = {
+		messages: {
+			badImport: 'Imports violates \'{{restrictions}}\' restrictions. See https://github.com/microsoft/vscode/wiki/Source-Code-Organization'
+		},
+		docs: {
+			url: 'https://github.com/microsoft/vscode/wiki/Source-Code-Organization'
+		}
+	};
+
+	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
+
+		const configs = <ImportPatternsConfig[]>context.options;
+
+		for (const config of configs) {
+			if (minimatch(context.getFilename(), config.target)) {
+				return createImportRuleListener((node, value) => this._checkImport(context, config, node, value));
+			}
+		}
+
+		return {};
+	}
+
+	private _checkImport(context: eslint.Rule.RuleContext, config: ImportPatternsConfig, node: TSESTree.Node, path: string) {
+
+		// resolve relative paths
+		if (path[0] === '.') {
+			path = join(context.getFilename(), path);
+		}
+
+		let restrictions: string[];
+		if (typeof config.restrictions === 'string') {
+			restrictions = [config.restrictions];
+		} else {
+			restrictions = config.restrictions;
+		}
+
+		let matched = false;
+		for (const pattern of restrictions) {
+			if (minimatch(path, pattern)) {
+				matched = true;
+				break;
+			}
+		}
+
+		if (!matched) {
+			// None of the restrictions matched
+			context.report({
+				loc: node.loc,
+				messageId: 'badImport',
+				data: {
+					restrictions: restrictions.join(' or ')
+				}
+			});
+		}
+	}
+};
+

build/lib/eslint/code-layering.js

@@ -0,0 +1,68 @@
+"use strict";
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+const path_1 = require("path");
+const utils_1 = require("./utils");
+module.exports = new class {
+    constructor() {
+        this.meta = {
+            messages: {
+                layerbreaker: 'Bad layering. You are not allowed to access {{from}} from here, allowed layers are: [{{allowed}}]'
+            },
+            docs: {
+                url: 'https://github.com/microsoft/vscode/wiki/Source-Code-Organization'
+            }
+        };
+    }
+    create(context) {
+        const fileDirname = path_1.dirname(context.getFilename());
+        const parts = fileDirname.split(/\\|\//);
+        const ruleArgs = context.options[0];
+        let config;
+        for (let i = parts.length - 1; i >= 0; i--) {
+            if (ruleArgs[parts[i]]) {
+                config = {
+                    allowed: new Set(ruleArgs[parts[i]]).add(parts[i]),
+                    disallowed: new Set()
+                };
+                Object.keys(ruleArgs).forEach(key => {
+                    if (!config.allowed.has(key)) {
+                        config.disallowed.add(key);
+                    }
+                });
+                break;
+            }
+        }
+        if (!config) {
+            // nothing
+            return {};
+        }
+        return utils_1.createImportRuleListener((node, path) => {
+            if (path[0] === '.') {
+                path = path_1.join(path_1.dirname(context.getFilename()), path);
+            }
+            const parts = path_1.dirname(path).split(/\\|\//);
+            for (let i = parts.length - 1; i >= 0; i--) {
+                const part = parts[i];
+                if (config.allowed.has(part)) {
+                    // GOOD - same layer
+                    break;
+                }
+                if (config.disallowed.has(part)) {
+                    // BAD - wrong layer
+                    context.report({
+                        loc: node.loc,
+                        messageId: 'layerbreaker',
+                        data: {
+                            from: part,
+                            allowed: [...config.allowed.keys()].join(', ')
+                        }
+                    });
+                    break;
+                }
+            }
+        });
+    }
+};

build/lib/eslint/code-layering.ts

@@ -0,0 +1,83 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as eslint from 'eslint';
+import { join, dirname } from 'path';
+import { createImportRuleListener } from './utils';
+
+type Config = {
+	allowed: Set<string>;
+	disallowed: Set<string>;
+};
+
+export = new class implements eslint.Rule.RuleModule {
+
+	readonly meta: eslint.Rule.RuleMetaData = {
+		messages: {
+			layerbreaker: 'Bad layering. You are not allowed to access {{from}} from here, allowed layers are: [{{allowed}}]'
+		},
+		docs: {
+			url: 'https://github.com/microsoft/vscode/wiki/Source-Code-Organization'
+		}
+	};
+
+	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
+
+		const fileDirname = dirname(context.getFilename());
+		const parts = fileDirname.split(/\\|\//);
+		const ruleArgs = <Record<string, string[]>>context.options[0];
+
+		let config: Config | undefined;
+		for (let i = parts.length - 1; i >= 0; i--) {
+			if (ruleArgs[parts[i]]) {
+				config = {
+					allowed: new Set(ruleArgs[parts[i]]).add(parts[i]),
+					disallowed: new Set()
+				};
+				Object.keys(ruleArgs).forEach(key => {
+					if (!config!.allowed.has(key)) {
+						config!.disallowed.add(key);
+					}
+				});
+				break;
+			}
+		}
+
+		if (!config) {
+			// nothing
+			return {};
+		}
+
+		return createImportRuleListener((node, path) => {
+			if (path[0] === '.') {
+				path = join(dirname(context.getFilename()), path);
+			}
+
+			const parts = dirname(path).split(/\\|\//);
+			for (let i = parts.length - 1; i >= 0; i--) {
+				const part = parts[i];
+
+				if (config!.allowed.has(part)) {
+					// GOOD - same layer
+					break;
+				}
+
+				if (config!.disallowed.has(part)) {
+					// BAD - wrong layer
+					context.report({
+						loc: node.loc,
+						messageId: 'layerbreaker',
+						data: {
+							from: part,
+							allowed: [...config!.allowed.keys()].join(', ')
+						}
+					});
+					break;
+				}
+			}
+		});
+	}
+};
+

build/lib/eslint/code-no-nls-in-standalone-editor.js

@@ -0,0 +1,38 @@
+"use strict";
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+const path_1 = require("path");
+const utils_1 = require("./utils");
+module.exports = new class NoNlsInStandaloneEditorRule {
+    constructor() {
+        this.meta = {
+            messages: {
+                noNls: 'Not allowed to import vs/nls in standalone editor modules. Use standaloneStrings.ts'
+            }
+        };
+    }
+    create(context) {
+        const fileName = context.getFilename();
+        if (/vs(\/|\\)editor(\/|\\)standalone(\/|\\)/.test(fileName)
+            || /vs(\/|\\)editor(\/|\\)common(\/|\\)standalone(\/|\\)/.test(fileName)
+            || /vs(\/|\\)editor(\/|\\)editor.api/.test(fileName)
+            || /vs(\/|\\)editor(\/|\\)editor.main/.test(fileName)
+            || /vs(\/|\\)editor(\/|\\)editor.worker/.test(fileName)) {
+            return utils_1.createImportRuleListener((node, path) => {
+                // resolve relative paths
+                if (path[0] === '.') {
+                    path = path_1.join(context.getFilename(), path);
+                }
+                if (/vs(\/|\\)nls/.test(path)) {
+                    context.report({
+                        loc: node.loc,
+                        messageId: 'noNls'
+                    });
+                }
+            });
+        }
+        return {};
+    }
+};

build/lib/eslint/code-no-nls-in-standalone-editor.ts

@@ -0,0 +1,48 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as eslint from 'eslint';
+import { join } from 'path';
+import { createImportRuleListener } from './utils';
+
+export = new class NoNlsInStandaloneEditorRule implements eslint.Rule.RuleModule {
+
+	readonly meta: eslint.Rule.RuleMetaData = {
+		messages: {
+			noNls: 'Not allowed to import vs/nls in standalone editor modules. Use standaloneStrings.ts'
+		}
+	};
+
+	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
+
+		const fileName = context.getFilename();
+		if (
+			/vs(\/|\\)editor(\/|\\)standalone(\/|\\)/.test(fileName)
+			|| /vs(\/|\\)editor(\/|\\)common(\/|\\)standalone(\/|\\)/.test(fileName)
+			|| /vs(\/|\\)editor(\/|\\)editor.api/.test(fileName)
+			|| /vs(\/|\\)editor(\/|\\)editor.main/.test(fileName)
+			|| /vs(\/|\\)editor(\/|\\)editor.worker/.test(fileName)
+		) {
+			return createImportRuleListener((node, path) => {
+				// resolve relative paths
+				if (path[0] === '.') {
+					path = join(context.getFilename(), path);
+				}
+
+				if (
+					/vs(\/|\\)nls/.test(path)
+				) {
+					context.report({
+						loc: node.loc,
+						messageId: 'noNls'
+					});
+				}
+			});
+		}
+
+		return {};
+	}
+};
+

build/lib/eslint/code-no-standalone-editor.js

@@ -0,0 +1,41 @@
+"use strict";
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+const path_1 = require("path");
+const utils_1 = require("./utils");
+module.exports = new class NoNlsInStandaloneEditorRule {
+    constructor() {
+        this.meta = {
+            messages: {
+                badImport: 'Not allowed to import standalone editor modules.'
+            },
+            docs: {
+                url: 'https://github.com/microsoft/vscode/wiki/Source-Code-Organization'
+            }
+        };
+    }
+    create(context) {
+        if (/vs(\/|\\)editor/.test(context.getFilename())) {
+            // the vs/editor folder is allowed to use the standalone editor
+            return {};
+        }
+        return utils_1.createImportRuleListener((node, path) => {
+            // resolve relative paths
+            if (path[0] === '.') {
+                path = path_1.join(context.getFilename(), path);
+            }
+            if (/vs(\/|\\)editor(\/|\\)standalone(\/|\\)/.test(path)
+                || /vs(\/|\\)editor(\/|\\)common(\/|\\)standalone(\/|\\)/.test(path)
+                || /vs(\/|\\)editor(\/|\\)editor.api/.test(path)
+                || /vs(\/|\\)editor(\/|\\)editor.main/.test(path)
+                || /vs(\/|\\)editor(\/|\\)editor.worker/.test(path)) {
+                context.report({
+                    loc: node.loc,
+                    messageId: 'badImport'
+                });
+            }
+        });
+    }
+};

build/lib/eslint/code-no-standalone-editor.ts

@@ -0,0 +1,50 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as eslint from 'eslint';
+import { join } from 'path';
+import { createImportRuleListener } from './utils';
+
+export = new class NoNlsInStandaloneEditorRule implements eslint.Rule.RuleModule {
+
+	readonly meta: eslint.Rule.RuleMetaData = {
+		messages: {
+			badImport: 'Not allowed to import standalone editor modules.'
+		},
+		docs: {
+			url: 'https://github.com/microsoft/vscode/wiki/Source-Code-Organization'
+		}
+	};
+
+	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
+
+		if (/vs(\/|\\)editor/.test(context.getFilename())) {
+			// the vs/editor folder is allowed to use the standalone editor
+			return {};
+		}
+
+		return createImportRuleListener((node, path) => {
+
+			// resolve relative paths
+			if (path[0] === '.') {
+				path = join(context.getFilename(), path);
+			}
+
+			if (
+				/vs(\/|\\)editor(\/|\\)standalone(\/|\\)/.test(path)
+				|| /vs(\/|\\)editor(\/|\\)common(\/|\\)standalone(\/|\\)/.test(path)
+				|| /vs(\/|\\)editor(\/|\\)editor.api/.test(path)
+				|| /vs(\/|\\)editor(\/|\\)editor.main/.test(path)
+				|| /vs(\/|\\)editor(\/|\\)editor.worker/.test(path)
+			) {
+				context.report({
+					loc: node.loc,
+					messageId: 'badImport'
+				});
+			}
+		});
+	}
+};
+

build/lib/eslint/code-no-unexternalized-strings.js

@@ -0,0 +1,111 @@
+"use strict";
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+var _a;
+const experimental_utils_1 = require("@typescript-eslint/experimental-utils");
+function isStringLiteral(node) {
+    return !!node && node.type === experimental_utils_1.AST_NODE_TYPES.Literal && typeof node.value === 'string';
+}
+function isDoubleQuoted(node) {
+    return node.raw[0] === '"' && node.raw[node.raw.length - 1] === '"';
+}
+module.exports = new (_a = class NoUnexternalizedStrings {
+        constructor() {
+            this.meta = {
+                messages: {
+                    doubleQuoted: 'Only use double-quoted strings for externalized strings.',
+                    badKey: 'The key \'{{key}}\' doesn\'t conform to a valid localize identifier.',
+                    duplicateKey: 'Duplicate key \'{{key}}\' with different message value.',
+                    badMessage: 'Message argument to \'{{message}}\' must be a string literal.'
+                }
+            };
+        }
+        create(context) {
+            const externalizedStringLiterals = new Map();
+            const doubleQuotedStringLiterals = new Set();
+            function collectDoubleQuotedStrings(node) {
+                if (isStringLiteral(node) && isDoubleQuoted(node)) {
+                    doubleQuotedStringLiterals.add(node);
+                }
+            }
+            function visitLocalizeCall(node) {
+                // localize(key, message)
+                const [keyNode, messageNode] = node.arguments;
+                // (1)
+                // extract key so that it can be checked later
+                let key;
+                if (isStringLiteral(keyNode)) {
+                    doubleQuotedStringLiterals.delete(keyNode); //todo@joh reconsider
+                    key = keyNode.value;
+                }
+                else if (keyNode.type === experimental_utils_1.AST_NODE_TYPES.ObjectExpression) {
+                    for (let property of keyNode.properties) {
+                        if (property.type === experimental_utils_1.AST_NODE_TYPES.Property && !property.computed) {
+                            if (property.key.type === experimental_utils_1.AST_NODE_TYPES.Identifier && property.key.name === 'key') {
+                                if (isStringLiteral(property.value)) {
+                                    doubleQuotedStringLiterals.delete(property.value); //todo@joh reconsider
+                                    key = property.value.value;
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                }
+                if (typeof key === 'string') {
+                    let array = externalizedStringLiterals.get(key);
+                    if (!array) {
+                        array = [];
+                        externalizedStringLiterals.set(key, array);
+                    }
+                    array.push({ call: node, message: messageNode });
+                }
+                // (2)
+                // remove message-argument from doubleQuoted list and make
+                // sure it is a string-literal
+                doubleQuotedStringLiterals.delete(messageNode);
+                if (!isStringLiteral(messageNode)) {
+                    context.report({
+                        loc: messageNode.loc,
+                        messageId: 'badMessage',
+                        data: { message: context.getSourceCode().getText(node) }
+                    });
+                }
+            }
+            function reportBadStringsAndBadKeys() {
+                // (1)
+                // report all strings that are in double quotes
+                for (const node of doubleQuotedStringLiterals) {
+                    context.report({ loc: node.loc, messageId: 'doubleQuoted' });
+                }
+                for (const [key, values] of externalizedStringLiterals) {
+                    // (2)
+                    // report all invalid NLS keys
+                    if (!key.match(NoUnexternalizedStrings._rNlsKeys)) {
+                        for (let value of values) {
+                            context.report({ loc: value.call.loc, messageId: 'badKey', data: { key } });
+                        }
+                    }
+                    // (2)
+                    // report all invalid duplicates (same key, different message)
+                    if (values.length > 1) {
+                        for (let i = 1; i < values.length; i++) {
+                            if (context.getSourceCode().getText(values[i - 1].message) !== context.getSourceCode().getText(values[i].message)) {
+                                context.report({ loc: values[i].call.loc, messageId: 'duplicateKey', data: { key } });
+                            }
+                        }
+                    }
+                }
+            }
+            return {
+                ['Literal']: (node) => collectDoubleQuotedStrings(node),
+                ['ExpressionStatement[directive] Literal:exit']: (node) => doubleQuotedStringLiterals.delete(node),
+                ['CallExpression[callee.type="MemberExpression"][callee.object.name="nls"][callee.property.name="localize"]:exit']: (node) => visitLocalizeCall(node),
+                ['CallExpression[callee.name="localize"][arguments.length>=2]:exit']: (node) => visitLocalizeCall(node),
+                ['Program:exit']: reportBadStringsAndBadKeys,
+            };
+        }
+    },
+    _a._rNlsKeys = /^[_a-zA-Z0-9][ .\-_a-zA-Z0-9]*$/,
+    _a);

build/lib/eslint/code-no-unexternalized-strings.ts

@@ -0,0 +1,126 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as eslint from 'eslint';
+import { TSESTree, AST_NODE_TYPES } from '@typescript-eslint/experimental-utils';
+
+function isStringLiteral(node: TSESTree.Node | null | undefined): node is TSESTree.StringLiteral {
+	return !!node && node.type === AST_NODE_TYPES.Literal && typeof node.value === 'string';
+}
+
+function isDoubleQuoted(node: TSESTree.StringLiteral): boolean {
+	return node.raw[0] === '"' && node.raw[node.raw.length - 1] === '"';
+}
+
+export = new class NoUnexternalizedStrings implements eslint.Rule.RuleModule {
+
+	private static _rNlsKeys = /^[_a-zA-Z0-9][ .\-_a-zA-Z0-9]*$/;
+
+	readonly meta: eslint.Rule.RuleMetaData = {
+		messages: {
+			doubleQuoted: 'Only use double-quoted strings for externalized strings.',
+			badKey: 'The key \'{{key}}\' doesn\'t conform to a valid localize identifier.',
+			duplicateKey: 'Duplicate key \'{{key}}\' with different message value.',
+			badMessage: 'Message argument to \'{{message}}\' must be a string literal.'
+		}
+	};
+
+	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
+
+		const externalizedStringLiterals = new Map<string, { call: TSESTree.CallExpression, message: TSESTree.Node }[]>();
+		const doubleQuotedStringLiterals = new Set<TSESTree.Node>();
+
+		function collectDoubleQuotedStrings(node: TSESTree.Literal) {
+			if (isStringLiteral(node) && isDoubleQuoted(node)) {
+				doubleQuotedStringLiterals.add(node);
+			}
+		}
+
+		function visitLocalizeCall(node: TSESTree.CallExpression) {
+
+			// localize(key, message)
+			const [keyNode, messageNode] = (<TSESTree.CallExpression>node).arguments;
+
+			// (1)
+			// extract key so that it can be checked later
+			let key: string | undefined;
+			if (isStringLiteral(keyNode)) {
+				doubleQuotedStringLiterals.delete(keyNode); //todo@joh reconsider
+				key = keyNode.value;
+
+			} else if (keyNode.type === AST_NODE_TYPES.ObjectExpression) {
+				for (let property of keyNode.properties) {
+					if (property.type === AST_NODE_TYPES.Property && !property.computed) {
+						if (property.key.type === AST_NODE_TYPES.Identifier && property.key.name === 'key') {
+							if (isStringLiteral(property.value)) {
+								doubleQuotedStringLiterals.delete(property.value); //todo@joh reconsider
+								key = property.value.value;
+								break;
+							}
+						}
+					}
+				}
+			}
+			if (typeof key === 'string') {
+				let array = externalizedStringLiterals.get(key);
+				if (!array) {
+					array = [];
+					externalizedStringLiterals.set(key, array);
+				}
+				array.push({ call: node, message: messageNode });
+			}
+
+			// (2)
+			// remove message-argument from doubleQuoted list and make
+			// sure it is a string-literal
+			doubleQuotedStringLiterals.delete(messageNode);
+			if (!isStringLiteral(messageNode)) {
+				context.report({
+					loc: messageNode.loc,
+					messageId: 'badMessage',
+					data: { message: context.getSourceCode().getText(<any>node) }
+				});
+			}
+		}
+
+		function reportBadStringsAndBadKeys() {
+			// (1)
+			// report all strings that are in double quotes
+			for (const node of doubleQuotedStringLiterals) {
+				context.report({ loc: node.loc, messageId: 'doubleQuoted' });
+			}
+
+			for (const [key, values] of externalizedStringLiterals) {
+
+				// (2)
+				// report all invalid NLS keys
+				if (!key.match(NoUnexternalizedStrings._rNlsKeys)) {
+					for (let value of values) {
+						context.report({ loc: value.call.loc, messageId: 'badKey', data: { key } });
+					}
+				}
+
+				// (2)
+				// report all invalid duplicates (same key, different message)
+				if (values.length > 1) {
+					for (let i = 1; i < values.length; i++) {
+						if (context.getSourceCode().getText(<any>values[i - 1].message) !== context.getSourceCode().getText(<any>values[i].message)) {
+							context.report({ loc: values[i].call.loc, messageId: 'duplicateKey', data: { key } });
+						}
+					}
+				}
+			}
+		}
+
+		return {
+			['Literal']: (node: any) => collectDoubleQuotedStrings(node),
+			['ExpressionStatement[directive] Literal:exit']: (node: any) => doubleQuotedStringLiterals.delete(node),
+			['CallExpression[callee.type="MemberExpression"][callee.object.name="nls"][callee.property.name="localize"]:exit']: (node: any) => visitLocalizeCall(node),
+			['CallExpression[callee.name="localize"][arguments.length>=2]:exit']: (node: any) => visitLocalizeCall(node),
+			['Program:exit']: reportBadStringsAndBadKeys,
+		};
+	}
+};
+

build/lib/eslint/code-no-unused-expressions.js

@@ -0,0 +1,145 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+// FORKED FROM https://github.com/eslint/eslint/blob/b23ad0d789a909baf8d7c41a35bc53df932eaf30/lib/rules/no-unused-expressions.js
+// and added support for `OptionalCallExpression`, see https://github.com/facebook/create-react-app/issues/8107 and https://github.com/eslint/eslint/issues/12642
+
+/**
+ * @fileoverview Flag expressions in statement position that do not side effect
+ * @author Michael Ficarra
+ */
+
+'use strict';
+
+//------------------------------------------------------------------------------
+// Rule Definition
+//------------------------------------------------------------------------------
+
+module.exports = {
+	meta: {
+		type: 'suggestion',
+
+		docs: {
+			description: 'disallow unused expressions',
+			category: 'Best Practices',
+			recommended: false,
+			url: 'https://eslint.org/docs/rules/no-unused-expressions'
+		},
+
+		schema: [
+			{
+				type: 'object',
+				properties: {
+					allowShortCircuit: {
+						type: 'boolean',
+						default: false
+					},
+					allowTernary: {
+						type: 'boolean',
+						default: false
+					},
+					allowTaggedTemplates: {
+						type: 'boolean',
+						default: false
+					}
+				},
+				additionalProperties: false
+			}
+		]
+	},
+
+	create(context) {
+		const config = context.options[0] || {},
+			allowShortCircuit = config.allowShortCircuit || false,
+			allowTernary = config.allowTernary || false,
+			allowTaggedTemplates = config.allowTaggedTemplates || false;
+
+		// eslint-disable-next-line jsdoc/require-description
+        /**
+         * @param {ASTNode} node any node
+         * @returns {boolean} whether the given node structurally represents a directive
+         */
+		function looksLikeDirective(node) {
+			return node.type === 'ExpressionStatement' &&
+				node.expression.type === 'Literal' && typeof node.expression.value === 'string';
+		}
+
+		// eslint-disable-next-line jsdoc/require-description
+        /**
+         * @param {Function} predicate ([a] -> Boolean) the function used to make the determination
+         * @param {a[]} list the input list
+         * @returns {a[]} the leading sequence of members in the given list that pass the given predicate
+         */
+		function takeWhile(predicate, list) {
+			for (let i = 0; i < list.length; ++i) {
+				if (!predicate(list[i])) {
+					return list.slice(0, i);
+				}
+			}
+			return list.slice();
+		}
+
+		// eslint-disable-next-line jsdoc/require-description
+        /**
+         * @param {ASTNode} node a Program or BlockStatement node
+         * @returns {ASTNode[]} the leading sequence of directive nodes in the given node's body
+         */
+		function directives(node) {
+			return takeWhile(looksLikeDirective, node.body);
+		}
+
+		// eslint-disable-next-line jsdoc/require-description
+        /**
+         * @param {ASTNode} node any node
+         * @param {ASTNode[]} ancestors the given node's ancestors
+         * @returns {boolean} whether the given node is considered a directive in its current position
+         */
+		function isDirective(node, ancestors) {
+			const parent = ancestors[ancestors.length - 1],
+				grandparent = ancestors[ancestors.length - 2];
+
+			return (parent.type === 'Program' || parent.type === 'BlockStatement' &&
+				(/Function/u.test(grandparent.type))) &&
+				directives(parent).indexOf(node) >= 0;
+		}
+
+        /**
+         * Determines whether or not a given node is a valid expression. Recurses on short circuit eval and ternary nodes if enabled by flags.
+         * @param {ASTNode} node any node
+         * @returns {boolean} whether the given node is a valid expression
+         */
+		function isValidExpression(node) {
+			if (allowTernary) {
+
+				// Recursive check for ternary and logical expressions
+				if (node.type === 'ConditionalExpression') {
+					return isValidExpression(node.consequent) && isValidExpression(node.alternate);
+				}
+			}
+
+			if (allowShortCircuit) {
+				if (node.type === 'LogicalExpression') {
+					return isValidExpression(node.right);
+				}
+			}
+
+			if (allowTaggedTemplates && node.type === 'TaggedTemplateExpression') {
+				return true;
+			}
+
+			return /^(?:Assignment|OptionalCall|Call|New|Update|Yield|Await)Expression$/u.test(node.type) ||
+				(node.type === 'UnaryExpression' && ['delete', 'void'].indexOf(node.operator) >= 0);
+		}
+
+		return {
+			ExpressionStatement(node) {
+				if (!isValidExpression(node.expression) && !isDirective(node, context.getAncestors())) {
+					context.report({ node, message: 'Expected an assignment or function call and instead saw an expression.' });
+				}
+			}
+		};
+
+	}
+};

build/lib/eslint/code-translation-remind.js

@@ -0,0 +1,57 @@
+"use strict";
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+var _a;
+const fs_1 = require("fs");
+const utils_1 = require("./utils");
+module.exports = new (_a = class TranslationRemind {
+        constructor() {
+            this.meta = {
+                messages: {
+                    missing: 'Please add \'{{resource}}\' to ./build/lib/i18n.resources.json file to use translations here.'
+                }
+            };
+        }
+        create(context) {
+            return utils_1.createImportRuleListener((node, path) => this._checkImport(context, node, path));
+        }
+        _checkImport(context, node, path) {
+            if (path !== TranslationRemind.NLS_MODULE) {
+                return;
+            }
+            const currentFile = context.getFilename();
+            const matchService = currentFile.match(/vs\/workbench\/services\/\w+/);
+            const matchPart = currentFile.match(/vs\/workbench\/contrib\/\w+/);
+            if (!matchService && !matchPart) {
+                return;
+            }
+            const resource = matchService ? matchService[0] : matchPart[0];
+            let resourceDefined = false;
+            let json;
+            try {
+                json = fs_1.readFileSync('./build/lib/i18n.resources.json', 'utf8');
+            }
+            catch (e) {
+                console.error('[translation-remind rule]: File with resources to pull from Transifex was not found. Aborting translation resource check for newly defined workbench part/service.');
+                return;
+            }
+            const workbenchResources = JSON.parse(json).workbench;
+            workbenchResources.forEach((existingResource) => {
+                if (existingResource.name === resource) {
+                    resourceDefined = true;
+                    return;
+                }
+            });
+            if (!resourceDefined) {
+                context.report({
+                    loc: node.loc,
+                    messageId: 'missing',
+                    data: { resource }
+                });
+            }
+        }
+    },
+    _a.NLS_MODULE = 'vs/nls',
+    _a);

build/lib/eslint/code-translation-remind.ts

@@ -0,0 +1,67 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as eslint from 'eslint';
+import { TSESTree } from '@typescript-eslint/experimental-utils';
+import { readFileSync } from 'fs';
+import { createImportRuleListener } from './utils';
+
+
+export = new class TranslationRemind implements eslint.Rule.RuleModule {
+
+	private static NLS_MODULE = 'vs/nls';
+
+	readonly meta: eslint.Rule.RuleMetaData = {
+		messages: {
+			missing: 'Please add \'{{resource}}\' to ./build/lib/i18n.resources.json file to use translations here.'
+		}
+	};
+
+	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
+		return createImportRuleListener((node, path) => this._checkImport(context, node, path));
+	}
+
+	private _checkImport(context: eslint.Rule.RuleContext, node: TSESTree.Node, path: string) {
+
+		if (path !== TranslationRemind.NLS_MODULE) {
+			return;
+		}
+
+		const currentFile = context.getFilename();
+		const matchService = currentFile.match(/vs\/workbench\/services\/\w+/);
+		const matchPart = currentFile.match(/vs\/workbench\/contrib\/\w+/);
+		if (!matchService && !matchPart) {
+			return;
+		}
+
+		const resource = matchService ? matchService[0] : matchPart![0];
+		let resourceDefined = false;
+
+		let json;
+		try {
+			json = readFileSync('./build/lib/i18n.resources.json', 'utf8');
+		} catch (e) {
+			console.error('[translation-remind rule]: File with resources to pull from Transifex was not found. Aborting translation resource check for newly defined workbench part/service.');
+			return;
+		}
+		const workbenchResources = JSON.parse(json).workbench;
+
+		workbenchResources.forEach((existingResource: any) => {
+			if (existingResource.name === resource) {
+				resourceDefined = true;
+				return;
+			}
+		});
+
+		if (!resourceDefined) {
+			context.report({
+				loc: node.loc,
+				messageId: 'missing',
+				data: { resource }
+			});
+		}
+	}
+};
+

build/lib/eslint/utils.js

@@ -0,0 +1,36 @@
+"use strict";
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+Object.defineProperty(exports, "__esModule", { value: true });
+function createImportRuleListener(validateImport) {
+    function _checkImport(node) {
+        if (node && node.type === 'Literal' && typeof node.value === 'string') {
+            validateImport(node, node.value);
+        }
+    }
+    return {
+        // import ??? from 'module'
+        ImportDeclaration: (node) => {
+            _checkImport(node.source);
+        },
+        // import('module').then(...) OR await import('module')
+        ['CallExpression[callee.type="Import"][arguments.length=1] > Literal']: (node) => {
+            _checkImport(node);
+        },
+        // import foo = ...
+        ['TSImportEqualsDeclaration > TSExternalModuleReference > Literal']: (node) => {
+            _checkImport(node);
+        },
+        // export ?? from 'module'
+        ExportAllDeclaration: (node) => {
+            _checkImport(node.source);
+        },
+        // export {foo} from 'module'
+        ExportNamedDeclaration: (node) => {
+            _checkImport(node.source);
+        },
+    };
+}
+exports.createImportRuleListener = createImportRuleListener;

build/lib/eslint/utils.ts

@@ -0,0 +1,40 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as eslint from 'eslint';
+import { TSESTree } from '@typescript-eslint/experimental-utils';
+
+export function createImportRuleListener(validateImport: (node: TSESTree.Literal, value: string) => any): eslint.Rule.RuleListener {
+
+	function _checkImport(node: TSESTree.Node | null) {
+		if (node && node.type === 'Literal' && typeof node.value === 'string') {
+			validateImport(node, node.value);
+		}
+	}
+
+	return {
+		// import ??? from 'module'
+		ImportDeclaration: (node: any) => {
+			_checkImport((<TSESTree.ImportDeclaration>node).source);
+		},
+		// import('module').then(...) OR await import('module')
+		['CallExpression[callee.type="Import"][arguments.length=1] > Literal']: (node: any) => {
+			_checkImport(node);
+		},
+		// import foo = ...
+		['TSImportEqualsDeclaration > TSExternalModuleReference > Literal']: (node: any) => {
+			_checkImport(node);
+		},
+		// export ?? from 'module'
+		ExportAllDeclaration: (node: any) => {
+			_checkImport((<TSESTree.ExportAllDeclaration>node).source);
+		},
+		// export {foo} from 'module'
+		ExportNamedDeclaration: (node: any) => {
+			_checkImport((<TSESTree.ExportNamedDeclaration>node).source);
+		},
+
+	};
+}

build/lib/eslint/vscode-dts-create-func.js

@@ -0,0 +1,35 @@
+"use strict";
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+const experimental_utils_1 = require("@typescript-eslint/experimental-utils");
+module.exports = new class ApiLiteralOrTypes {
+    constructor() {
+        this.meta = {
+            docs: { url: 'https://github.com/microsoft/vscode/wiki/Extension-API-guidelines#creating-objects' },
+            messages: { sync: '`createXYZ`-functions are constructor-replacements and therefore must return sync', }
+        };
+    }
+    create(context) {
+        return {
+            ['TSDeclareFunction Identifier[name=/create.*/]']: (node) => {
+                var _a;
+                const decl = node.parent;
+                if (((_a = decl.returnType) === null || _a === void 0 ? void 0 : _a.typeAnnotation.type) !== experimental_utils_1.AST_NODE_TYPES.TSTypeReference) {
+                    return;
+                }
+                if (decl.returnType.typeAnnotation.typeName.type !== experimental_utils_1.AST_NODE_TYPES.Identifier) {
+                    return;
+                }
+                const ident = decl.returnType.typeAnnotation.typeName.name;
+                if (ident === 'Promise' || ident === 'Thenable') {
+                    context.report({
+                        node,
+                        messageId: 'sync'
+                    });
+                }
+            }
+        };
+    }
+};

build/lib/eslint/vscode-dts-create-func.ts

@@ -0,0 +1,40 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as eslint from 'eslint';
+import { TSESTree, AST_NODE_TYPES } from '@typescript-eslint/experimental-utils';
+
+export = new class ApiLiteralOrTypes implements eslint.Rule.RuleModule {
+
+	readonly meta: eslint.Rule.RuleMetaData = {
+		docs: { url: 'https://github.com/microsoft/vscode/wiki/Extension-API-guidelines#creating-objects' },
+		messages: { sync: '`createXYZ`-functions are constructor-replacements and therefore must return sync', }
+	};
+
+	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
+
+		return {
+			['TSDeclareFunction Identifier[name=/create.*/]']: (node: any) => {
+
+				const decl = <TSESTree.FunctionDeclaration>(<TSESTree.Identifier>node).parent;
+
+				if (decl.returnType?.typeAnnotation.type !== AST_NODE_TYPES.TSTypeReference) {
+					return;
+				}
+				if (decl.returnType.typeAnnotation.typeName.type !== AST_NODE_TYPES.Identifier) {
+					return;
+				}
+
+				const ident = decl.returnType.typeAnnotation.typeName.name;
+				if (ident === 'Promise' || ident === 'Thenable') {
+					context.report({
+						node,
+						messageId: 'sync'
+					});
+				}
+			}
+		};
+	}
+};

build/lib/eslint/vscode-dts-event-naming.js

@@ -0,0 +1,81 @@
+"use strict";
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+var _a;
+const experimental_utils_1 = require("@typescript-eslint/experimental-utils");
+module.exports = new (_a = class ApiEventNaming {
+        constructor() {
+            this.meta = {
+                docs: {
+                    url: 'https://github.com/microsoft/vscode/wiki/Extension-API-guidelines#event-naming'
+                },
+                messages: {
+                    naming: 'Event names must follow this patten: `on[Did|Will]<Verb><Subject>`',
+                    verb: 'Unknown verb \'{{verb}}\' - is this really a verb? Iff so, then add this verb to the configuration',
+                    subject: 'Unknown subject \'{{subject}}\' - This subject has not been used before but it should refer to something in the API',
+                    unknown: 'UNKNOWN event declaration, lint-rule needs tweaking'
+                }
+            };
+        }
+        create(context) {
+            const config = context.options[0];
+            const allowed = new Set(config.allowed);
+            const verbs = new Set(config.verbs);
+            return {
+                ['TSTypeAnnotation TSTypeReference Identifier[name="Event"]']: (node) => {
+                    var _a, _b;
+                    const def = (_b = (_a = node.parent) === null || _a === void 0 ? void 0 : _a.parent) === null || _b === void 0 ? void 0 : _b.parent;
+                    let ident;
+                    if ((def === null || def === void 0 ? void 0 : def.type) === experimental_utils_1.AST_NODE_TYPES.Identifier) {
+                        ident = def;
+                    }
+                    else if (((def === null || def === void 0 ? void 0 : def.type) === experimental_utils_1.AST_NODE_TYPES.TSPropertySignature || (def === null || def === void 0 ? void 0 : def.type) === experimental_utils_1.AST_NODE_TYPES.ClassProperty) && def.key.type === experimental_utils_1.AST_NODE_TYPES.Identifier) {
+                        ident = def.key;
+                    }
+                    if (!ident) {
+                        // event on unknown structure...
+                        return context.report({
+                            node,
+                            message: 'unknown'
+                        });
+                    }
+                    if (allowed.has(ident.name)) {
+                        // configured exception
+                        return;
+                    }
+                    const match = ApiEventNaming._nameRegExp.exec(ident.name);
+                    if (!match) {
+                        context.report({
+                            node: ident,
+                            messageId: 'naming'
+                        });
+                        return;
+                    }
+                    // check that <verb> is spelled out (configured) as verb
+                    if (!verbs.has(match[2].toLowerCase())) {
+                        context.report({
+                            node: ident,
+                            messageId: 'verb',
+                            data: { verb: match[2] }
+                        });
+                    }
+                    // check that a subject (if present) has occurred
+                    if (match[3]) {
+                        const regex = new RegExp(match[3], 'ig');
+                        const parts = context.getSourceCode().getText().split(regex);
+                        if (parts.length < 3) {
+                            context.report({
+                                node: ident,
+                                messageId: 'subject',
+                                data: { subject: match[3] }
+                            });
+                        }
+                    }
+                }
+            };
+        }
+    },
+    _a._nameRegExp = /on(Did|Will)([A-Z][a-z]+)([A-Z][a-z]+)?/,
+    _a);

build/lib/eslint/vscode-dts-event-naming.ts

@@ -0,0 +1,91 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as eslint from 'eslint';
+import { TSESTree, AST_NODE_TYPES } from '@typescript-eslint/experimental-utils';
+
+export = new class ApiEventNaming implements eslint.Rule.RuleModule {
+
+	private static _nameRegExp = /on(Did|Will)([A-Z][a-z]+)([A-Z][a-z]+)?/;
+
+	readonly meta: eslint.Rule.RuleMetaData = {
+		docs: {
+			url: 'https://github.com/microsoft/vscode/wiki/Extension-API-guidelines#event-naming'
+		},
+		messages: {
+			naming: 'Event names must follow this patten: `on[Did|Will]<Verb><Subject>`',
+			verb: 'Unknown verb \'{{verb}}\' - is this really a verb? Iff so, then add this verb to the configuration',
+			subject: 'Unknown subject \'{{subject}}\' - This subject has not been used before but it should refer to something in the API',
+			unknown: 'UNKNOWN event declaration, lint-rule needs tweaking'
+		}
+	};
+
+	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
+
+		const config = <{ allowed: string[], verbs: string[] }>context.options[0];
+		const allowed = new Set(config.allowed);
+		const verbs = new Set(config.verbs);
+
+		return {
+			['TSTypeAnnotation TSTypeReference Identifier[name="Event"]']: (node: any) => {
+
+				const def = (<TSESTree.Identifier>node).parent?.parent?.parent;
+				let ident: TSESTree.Identifier | undefined;
+
+				if (def?.type === AST_NODE_TYPES.Identifier) {
+					ident = def;
+
+				} else if ((def?.type === AST_NODE_TYPES.TSPropertySignature || def?.type === AST_NODE_TYPES.ClassProperty) && def.key.type === AST_NODE_TYPES.Identifier) {
+					ident = def.key;
+				}
+
+				if (!ident) {
+					// event on unknown structure...
+					return context.report({
+						node,
+						message: 'unknown'
+					});
+				}
+
+				if (allowed.has(ident.name)) {
+					// configured exception
+					return;
+				}
+
+				const match = ApiEventNaming._nameRegExp.exec(ident.name);
+				if (!match) {
+					context.report({
+						node: ident,
+						messageId: 'naming'
+					});
+					return;
+				}
+
+				// check that <verb> is spelled out (configured) as verb
+				if (!verbs.has(match[2].toLowerCase())) {
+					context.report({
+						node: ident,
+						messageId: 'verb',
+						data: { verb: match[2] }
+					});
+				}
+
+				// check that a subject (if present) has occurred
+				if (match[3]) {
+					const regex = new RegExp(match[3], 'ig');
+					const parts = context.getSourceCode().getText().split(regex);
+					if (parts.length < 3) {
+						context.report({
+							node: ident,
+							messageId: 'subject',
+							data: { subject: match[3] }
+						});
+					}
+				}
+			}
+		};
+	}
+};
+

build/lib/eslint/vscode-dts-interface-naming.js

@@ -0,0 +1,30 @@
+"use strict";
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+var _a;
+module.exports = new (_a = class ApiInterfaceNaming {
+        constructor() {
+            this.meta = {
+                messages: {
+                    naming: 'Interfaces must not be prefixed with uppercase `I`',
+                }
+            };
+        }
+        create(context) {
+            return {
+                ['TSInterfaceDeclaration Identifier']: (node) => {
+                    const name = node.name;
+                    if (ApiInterfaceNaming._nameRegExp.test(name)) {
+                        context.report({
+                            node,
+                            messageId: 'naming'
+                        });
+                    }
+                }
+            };
+        }
+    },
+    _a._nameRegExp = /I[A-Z]/,
+    _a);

build/lib/eslint/vscode-dts-interface-naming.ts

@@ -0,0 +1,35 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as eslint from 'eslint';
+import { TSESTree } from '@typescript-eslint/experimental-utils';
+
+export = new class ApiInterfaceNaming implements eslint.Rule.RuleModule {
+
+	private static _nameRegExp = /I[A-Z]/;
+
+	readonly meta: eslint.Rule.RuleMetaData = {
+		messages: {
+			naming: 'Interfaces must not be prefixed with uppercase `I`',
+		}
+	};
+
+	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
+
+		return {
+			['TSInterfaceDeclaration Identifier']: (node: any) => {
+
+				const name = (<TSESTree.Identifier>node).name;
+				if (ApiInterfaceNaming._nameRegExp.test(name)) {
+					context.report({
+						node,
+						messageId: 'naming'
+					});
+				}
+			}
+		};
+	}
+};
+

build/lib/eslint/vscode-dts-literal-or-types.js

@@ -0,0 +1,23 @@
+"use strict";
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+module.exports = new class ApiLiteralOrTypes {
+    constructor() {
+        this.meta = {
+            docs: { url: 'https://github.com/microsoft/vscode/wiki/Extension-API-guidelines#enums' },
+            messages: { useEnum: 'Use enums, not literal-or-types', }
+        };
+    }
+    create(context) {
+        return {
+            ['TSTypeAnnotation TSUnionType TSLiteralType']: (node) => {
+                context.report({
+                    node: node,
+                    messageId: 'useEnum'
+                });
+            }
+        };
+    }
+};

build/lib/eslint/vscode-dts-literal-or-types.ts

@@ -0,0 +1,25 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as eslint from 'eslint';
+
+export = new class ApiLiteralOrTypes implements eslint.Rule.RuleModule {
+
+	readonly meta: eslint.Rule.RuleMetaData = {
+		docs: { url: 'https://github.com/microsoft/vscode/wiki/Extension-API-guidelines#enums' },
+		messages: { useEnum: 'Use enums, not literal-or-types', }
+	};
+
+	create(context: eslint.Rule.RuleContext): eslint.Rule.RuleListener {
+		return {
+			['TSTypeAnnotation TSUnionType TSLiteralType']: (node: any) => {
+				context.report({
+					node: node,
+					messageId: 'useEnum'
+				});
+			}
+		};
+	}
+};

build/lib/extensions.js

@@ -27,6 +27,7 @@ const util = require('./util');
 const root = path.dirname(path.dirname(__dirname));
 const commit = util.getVersion(root);
 const sourceMappingURLBase = `https://ticino.blob.core.windows.net/sourcemaps/${commit}`;
+const product = require('../../product.json');
 function fromLocal(extensionPath) {
     const webpackFilename = path.join(extensionPath, 'extension.webpack.config.js');
     const input = fs.existsSync(webpackFilename)
@@ -184,8 +185,10 @@ const excludedExtensions = [
     'vscode-test-resolver',
     'ms-vscode.node-debug',
     'ms-vscode.node-debug2',
+    'ms.vscode.js-debug-nightly'
 ];
-const builtInExtensions = require('../builtInExtensions.json');
+const builtInExtensions = require('../builtInExtensions.json')
+    .filter(({ forQualities }) => { var _a; return !product.quality || ((_a = forQualities === null || forQualities === void 0 ? void 0 : forQualities.includes) === null || _a === void 0 ? void 0 : _a.call(forQualities, product.quality)) !== false; });
 function packageLocalExtensionsStream() {
     const localExtensionDescriptions = glob.sync('extensions/*/package.json')
         .map(manifestPath => {

build/lib/extensions.ts

@@ -27,6 +27,7 @@ const util = require('./util');
 const root = path.dirname(path.dirname(__dirname));
 const commit = util.getVersion(root);
 const sourceMappingURLBase = `https://ticino.blob.core.windows.net/sourcemaps/${commit}`;
+const product = require('../../product.json');
 
 function fromLocal(extensionPath: string): Stream {
 	const webpackFilename = path.join(extensionPath, 'extension.webpack.config.js');
@@ -219,16 +220,19 @@ const excludedExtensions = [
 	'vscode-test-resolver',
 	'ms-vscode.node-debug',
 	'ms-vscode.node-debug2',
+	'ms.vscode.js-debug-nightly'
 ];
 
 interface IBuiltInExtension {
 	name: string;
 	version: string;
 	repo: string;
+	forQualities?: ReadonlyArray<string>;
 	metadata: any;
 }
 
-const builtInExtensions: IBuiltInExtension[] = require('../builtInExtensions.json');
+const builtInExtensions = (<IBuiltInExtension[]>require('../builtInExtensions.json'))
+	.filter(({ forQualities }) => !product.quality || forQualities?.includes?.(product.quality) !== false);
 
 export function packageLocalExtensionsStream(): NodeJS.ReadWriteStream {
 	const localExtensionDescriptions = (<string[]>glob.sync('extensions/*/package.json'))

build/lib/i18n.resources.json

@@ -30,6 +30,14 @@
 			"name": "vs/workbench/api/common",
 			"project": "vscode-workbench"
 		},
+		{
+			"name": "vs/workbench/contrib/backup",
+			"project": "vscode-workbench"
+		},
+		{
+			"name": "vs/workbench/contrib/bulkEdit",
+			"project": "vscode-workbench"
+		},
 		{
 			"name": "vs/workbench/contrib/cli",
 			"project": "vscode-workbench"
@@ -58,6 +66,10 @@
 			"name": "vs/workbench/contrib/emmet",
 			"project": "vscode-workbench"
 		},
+		{
+			"name": "vs/workbench/contrib/experiments",
+			"project": "vscode-workbench"
+		},
 		{
 			"name": "vs/workbench/contrib/extensions",
 			"project": "vscode-workbench"
@@ -266,6 +278,10 @@
 			"name": "vs/workbench/services/remote",
 			"project": "vscode-workbench"
 		},
+		{
+			"name": "vs/workbench/services/search",
+			"project": "vscode-workbench"
+		},
 		{
 			"name": "vs/workbench/services/textfile",
 			"project": "vscode-workbench"
@@ -301,6 +317,14 @@
 		{
 			"name": "vs/workbench/services/userData",
 			"project": "vscode-workbench"
+		},
+		{
+			"name": "vs/workbench/services/userDataSync",
+			"project": "vscode-workbench"
+		},
+		{
+			"name": "vs/workbench/contrib/timeline",
+			"project": "vscode-workbench"
 		}
 	]
 }

build/lib/layersChecker.js

@@ -0,0 +1,218 @@
+"use strict";
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+Object.defineProperty(exports, "__esModule", { value: true });
+const ts = require("typescript");
+const fs_1 = require("fs");
+const path_1 = require("path");
+const minimatch_1 = require("minimatch");
+//
+// #############################################################################################
+//
+// A custom typescript checker for the specific task of detecting the use of certain types in a
+// layer that does not allow such use. For example:
+// - using DOM globals in common/node/electron-main layer (e.g. HTMLElement)
+// - using node.js globals in common/browser layer (e.g. process)
+//
+// Make changes to below RULES to lift certain files from these checks only if absolutely needed
+//
+// #############################################################################################
+//
+// Types we assume are present in all implementations of JS VMs (node.js, browsers)
+// Feel free to add more core types as you see needed if present in node.js and browsers
+const CORE_TYPES = [
+    'require',
+    'atob',
+    'btoa',
+    'setTimeout',
+    'clearTimeout',
+    'setInterval',
+    'clearInterval',
+    'console',
+    'log',
+    'info',
+    'warn',
+    'error',
+    'group',
+    'groupEnd',
+    'table',
+    'assert',
+    'Error',
+    'String',
+    'throws',
+    'stack',
+    'captureStackTrace',
+    'stackTraceLimit',
+    'TextDecoder',
+    'TextEncoder',
+    'encode',
+    'decode',
+    'self',
+    'trimLeft',
+    'trimRight'
+];
+const RULES = [
+    // Tests: skip
+    {
+        target: '**/vs/**/test/**',
+        skip: true // -> skip all test files
+    },
+    // Common: vs/base/common/platform.ts
+    {
+        target: '**/vs/base/common/platform.ts',
+        allowedTypes: [
+            ...CORE_TYPES,
+            // Safe access to postMessage() and friends
+            'MessageEvent',
+            'data'
+        ],
+        disallowedDefinitions: [
+            'lib.dom.d.ts',
+            '@types/node' // no node.js
+        ]
+    },
+    // Common: vs/workbench/api/common/extHostExtensionService.ts
+    {
+        target: '**/vs/workbench/api/common/extHostExtensionService.ts',
+        allowedTypes: [
+            ...CORE_TYPES,
+            // Safe access to global
+            'global'
+        ],
+        disallowedDefinitions: [
+            'lib.dom.d.ts',
+            '@types/node' // no node.js
+        ]
+    },
+    // Common
+    {
+        target: '**/vs/**/common/**',
+        allowedTypes: CORE_TYPES,
+        disallowedDefinitions: [
+            'lib.dom.d.ts',
+            '@types/node' // no node.js
+        ]
+    },
+    // Browser
+    {
+        target: '**/vs/**/browser/**',
+        allowedTypes: CORE_TYPES,
+        disallowedDefinitions: [
+            '@types/node' // no node.js
+        ]
+    },
+    // Browser (editor contrib)
+    {
+        target: '**/src/vs/editor/contrib/**',
+        allowedTypes: CORE_TYPES,
+        disallowedDefinitions: [
+            '@types/node' // no node.js
+        ]
+    },
+    // node.js
+    {
+        target: '**/vs/**/node/**',
+        allowedTypes: [
+            ...CORE_TYPES,
+            // --> types from node.d.ts that duplicate from lib.dom.d.ts
+            'URL',
+            'protocol',
+            'hostname',
+            'port',
+            'pathname',
+            'search',
+            'username',
+            'password'
+        ],
+        disallowedDefinitions: [
+            'lib.dom.d.ts' // no DOM
+        ]
+    },
+    // Electron (renderer): skip
+    {
+        target: '**/vs/**/electron-browser/**',
+        skip: true // -> supports all types
+    },
+    // Electron (main)
+    {
+        target: '**/vs/**/electron-main/**',
+        allowedTypes: [
+            ...CORE_TYPES,
+            // --> types from electron.d.ts that duplicate from lib.dom.d.ts
+            'Event',
+            'Request'
+        ],
+        disallowedDefinitions: [
+            'lib.dom.d.ts' // no DOM
+        ]
+    }
+];
+const TS_CONFIG_PATH = path_1.join(__dirname, '../../', 'src', 'tsconfig.json');
+let hasErrors = false;
+function checkFile(program, sourceFile, rule) {
+    checkNode(sourceFile);
+    function checkNode(node) {
+        var _a;
+        if (node.kind !== ts.SyntaxKind.Identifier) {
+            return ts.forEachChild(node, checkNode); // recurse down
+        }
+        const text = node.getText(sourceFile);
+        if ((_a = rule.allowedTypes) === null || _a === void 0 ? void 0 : _a.some(allowed => allowed === text)) {
+            return; // override
+        }
+        const checker = program.getTypeChecker();
+        const symbol = checker.getSymbolAtLocation(node);
+        if (symbol) {
+            const declarations = symbol.declarations;
+            if (Array.isArray(declarations)) {
+                for (const declaration of declarations) {
+                    if (declaration) {
+                        const parent = declaration.parent;
+                        if (parent) {
+                            const parentSourceFile = parent.getSourceFile();
+                            if (parentSourceFile) {
+                                const definitionFileName = parentSourceFile.fileName;
+                                if (rule.disallowedDefinitions) {
+                                    for (const disallowedDefinition of rule.disallowedDefinitions) {
+                                        if (definitionFileName.indexOf(disallowedDefinition) >= 0) {
+                                            const { line, character } = sourceFile.getLineAndCharacterOfPosition(node.getStart());
+                                            console.log(`[build/lib/layersChecker.ts]: Reference to '${text}' from '${disallowedDefinition}' violates layer '${rule.target}' (${sourceFile.fileName} (${line + 1},${character + 1})`);
+                                            hasErrors = true;
+                                            return;
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+function createProgram(tsconfigPath) {
+    const tsConfig = ts.readConfigFile(tsconfigPath, ts.sys.readFile);
+    const configHostParser = { fileExists: fs_1.existsSync, readDirectory: ts.sys.readDirectory, readFile: file => fs_1.readFileSync(file, 'utf8'), useCaseSensitiveFileNames: process.platform === 'linux' };
+    const tsConfigParsed = ts.parseJsonConfigFileContent(tsConfig.config, configHostParser, path_1.resolve(path_1.dirname(tsconfigPath)), { noEmit: true });
+    const compilerHost = ts.createCompilerHost(tsConfigParsed.options, true);
+    return ts.createProgram(tsConfigParsed.fileNames, tsConfigParsed.options, compilerHost);
+}
+//
+// Create program and start checking
+//
+const program = createProgram(TS_CONFIG_PATH);
+for (const sourceFile of program.getSourceFiles()) {
+    for (const rule of RULES) {
+        if (minimatch_1.match([sourceFile.fileName], rule.target).length > 0) {
+            if (!rule.skip) {
+                checkFile(program, sourceFile, rule);
+            }
+            break;
+        }
+    }
+}
+if (hasErrors) {
+    process.exit(1);
+}

build/lib/layersChecker.ts

@@ -0,0 +1,255 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as ts from 'typescript';
+import { readFileSync, existsSync } from 'fs';
+import { resolve, dirname, join } from 'path';
+import { match } from 'minimatch';
+
+//
+// #############################################################################################
+//
+// A custom typescript checker for the specific task of detecting the use of certain types in a
+// layer that does not allow such use. For example:
+// - using DOM globals in common/node/electron-main layer (e.g. HTMLElement)
+// - using node.js globals in common/browser layer (e.g. process)
+//
+// Make changes to below RULES to lift certain files from these checks only if absolutely needed
+//
+// #############################################################################################
+//
+
+// Types we assume are present in all implementations of JS VMs (node.js, browsers)
+// Feel free to add more core types as you see needed if present in node.js and browsers
+const CORE_TYPES = [
+	'require', // from our AMD loader
+	'atob',
+	'btoa',
+	'setTimeout',
+	'clearTimeout',
+	'setInterval',
+	'clearInterval',
+	'console',
+	'log',
+	'info',
+	'warn',
+	'error',
+	'group',
+	'groupEnd',
+	'table',
+	'assert',
+	'Error',
+	'String',
+	'throws',
+	'stack',
+	'captureStackTrace',
+	'stackTraceLimit',
+	'TextDecoder',
+	'TextEncoder',
+	'encode',
+	'decode',
+	'self',
+	'trimLeft',
+	'trimRight'
+];
+
+const RULES = [
+
+	// Tests: skip
+	{
+		target: '**/vs/**/test/**',
+		skip: true // -> skip all test files
+	},
+
+	// Common: vs/base/common/platform.ts
+	{
+		target: '**/vs/base/common/platform.ts',
+		allowedTypes: [
+			...CORE_TYPES,
+
+			// Safe access to postMessage() and friends
+			'MessageEvent',
+			'data'
+		],
+		disallowedDefinitions: [
+			'lib.dom.d.ts', // no DOM
+			'@types/node'	// no node.js
+		]
+	},
+
+	// Common: vs/workbench/api/common/extHostExtensionService.ts
+	{
+		target: '**/vs/workbench/api/common/extHostExtensionService.ts',
+		allowedTypes: [
+			...CORE_TYPES,
+
+			// Safe access to global
+			'global'
+		],
+		disallowedDefinitions: [
+			'lib.dom.d.ts', // no DOM
+			'@types/node'	// no node.js
+		]
+	},
+
+	// Common
+	{
+		target: '**/vs/**/common/**',
+		allowedTypes: CORE_TYPES,
+		disallowedDefinitions: [
+			'lib.dom.d.ts', // no DOM
+			'@types/node'	// no node.js
+		]
+	},
+
+	// Browser
+	{
+		target: '**/vs/**/browser/**',
+		allowedTypes: CORE_TYPES,
+		disallowedDefinitions: [
+			'@types/node'	// no node.js
+		]
+	},
+
+	// Browser (editor contrib)
+	{
+		target: '**/src/vs/editor/contrib/**',
+		allowedTypes: CORE_TYPES,
+		disallowedDefinitions: [
+			'@types/node'	// no node.js
+		]
+	},
+
+	// node.js
+	{
+		target: '**/vs/**/node/**',
+		allowedTypes: [
+			...CORE_TYPES,
+
+			// --> types from node.d.ts that duplicate from lib.dom.d.ts
+			'URL',
+			'protocol',
+			'hostname',
+			'port',
+			'pathname',
+			'search',
+			'username',
+			'password'
+		],
+		disallowedDefinitions: [
+			'lib.dom.d.ts'	// no DOM
+		]
+	},
+
+	// Electron (renderer): skip
+	{
+		target: '**/vs/**/electron-browser/**',
+		skip: true // -> supports all types
+	},
+
+	// Electron (main)
+	{
+		target: '**/vs/**/electron-main/**',
+		allowedTypes: [
+			...CORE_TYPES,
+
+			// --> types from electron.d.ts that duplicate from lib.dom.d.ts
+			'Event',
+			'Request'
+		],
+		disallowedDefinitions: [
+			'lib.dom.d.ts'	// no DOM
+		]
+	}
+];
+
+const TS_CONFIG_PATH = join(__dirname, '../../', 'src', 'tsconfig.json');
+
+interface IRule {
+	target: string;
+	skip?: boolean;
+	allowedTypes?: string[];
+	disallowedDefinitions?: string[];
+}
+
+let hasErrors = false;
+
+function checkFile(program: ts.Program, sourceFile: ts.SourceFile, rule: IRule) {
+	checkNode(sourceFile);
+
+	function checkNode(node: ts.Node): void {
+		if (node.kind !== ts.SyntaxKind.Identifier) {
+			return ts.forEachChild(node, checkNode); // recurse down
+		}
+
+		const text = node.getText(sourceFile);
+
+		if (rule.allowedTypes?.some(allowed => allowed === text)) {
+			return; // override
+		}
+
+		const checker = program.getTypeChecker();
+		const symbol = checker.getSymbolAtLocation(node);
+		if (symbol) {
+			const declarations = symbol.declarations;
+			if (Array.isArray(declarations)) {
+				for (const declaration of declarations) {
+					if (declaration) {
+						const parent = declaration.parent;
+						if (parent) {
+							const parentSourceFile = parent.getSourceFile();
+							if (parentSourceFile) {
+								const definitionFileName = parentSourceFile.fileName;
+								if (rule.disallowedDefinitions) {
+									for (const disallowedDefinition of rule.disallowedDefinitions) {
+										if (definitionFileName.indexOf(disallowedDefinition) >= 0) {
+											const { line, character } = sourceFile.getLineAndCharacterOfPosition(node.getStart());
+											console.log(`[build/lib/layersChecker.ts]: Reference to '${text}' from '${disallowedDefinition}' violates layer '${rule.target}' (${sourceFile.fileName} (${line + 1},${character + 1})`);
+
+											hasErrors = true;
+											return;
+										}
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
+function createProgram(tsconfigPath: string): ts.Program {
+	const tsConfig = ts.readConfigFile(tsconfigPath, ts.sys.readFile);
+
+	const configHostParser: ts.ParseConfigHost = { fileExists: existsSync, readDirectory: ts.sys.readDirectory, readFile: file => readFileSync(file, 'utf8'), useCaseSensitiveFileNames: process.platform === 'linux' };
+	const tsConfigParsed = ts.parseJsonConfigFileContent(tsConfig.config, configHostParser, resolve(dirname(tsconfigPath)), { noEmit: true });
+
+	const compilerHost = ts.createCompilerHost(tsConfigParsed.options, true);
+
+	return ts.createProgram(tsConfigParsed.fileNames, tsConfigParsed.options, compilerHost);
+}
+
+//
+// Create program and start checking
+//
+const program = createProgram(TS_CONFIG_PATH);
+
+for (const sourceFile of program.getSourceFiles()) {
+	for (const rule of RULES) {
+		if (match([sourceFile.fileName], rule.target).length > 0) {
+			if (!rule.skip) {
+				checkFile(program, sourceFile, rule);
+			}
+
+			break;
+		}
+	}
+}
+
+if (hasErrors) {
+	process.exit(1);
+}

build/lib/tslint/abstractGlobalsRule.js

@@ -1,45 +0,0 @@
-"use strict";
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-Object.defineProperty(exports, "__esModule", { value: true });
-const Lint = require("tslint");
-class AbstractGlobalsRuleWalker extends Lint.RuleWalker {
-    constructor(file, program, opts, _config) {
-        super(file, opts);
-        this.program = program;
-        this._config = _config;
-    }
-    visitIdentifier(node) {
-        if (this.getDisallowedGlobals().some(disallowedGlobal => disallowedGlobal === node.text)) {
-            if (this._config.allowed && this._config.allowed.some(allowed => allowed === node.text)) {
-                return; // override
-            }
-            const checker = this.program.getTypeChecker();
-            const symbol = checker.getSymbolAtLocation(node);
-            if (symbol) {
-                const declarations = symbol.declarations;
-                if (Array.isArray(declarations) && symbol.declarations.some(declaration => {
-                    if (declaration) {
-                        const parent = declaration.parent;
-                        if (parent) {
-                            const sourceFile = parent.getSourceFile();
-                            if (sourceFile) {
-                                const fileName = sourceFile.fileName;
-                                if (fileName && fileName.indexOf(this.getDefinitionPattern()) >= 0) {
-                                    return true;
-                                }
-                            }
-                        }
-                    }
-                    return false;
-                })) {
-                    this.addFailureAtNode(node, `Cannot use global '${node.text}' in '${this._config.target}'`);
-                }
-            }
-        }
-        super.visitIdentifier(node);
-    }
-}
-exports.AbstractGlobalsRuleWalker = AbstractGlobalsRuleWalker;

build/lib/tslint/abstractGlobalsRule.ts

@@ -1,57 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as ts from 'typescript';
-import * as Lint from 'tslint';
-
-interface AbstractGlobalsRuleConfig {
-	target: string;
-	allowed: string[];
-}
-
-export abstract class AbstractGlobalsRuleWalker extends Lint.RuleWalker {
-
-	constructor(file: ts.SourceFile, private program: ts.Program, opts: Lint.IOptions, private _config: AbstractGlobalsRuleConfig) {
-		super(file, opts);
-	}
-
-	protected abstract getDisallowedGlobals(): string[];
-
-	protected abstract getDefinitionPattern(): string;
-
-	visitIdentifier(node: ts.Identifier) {
-		if (this.getDisallowedGlobals().some(disallowedGlobal => disallowedGlobal === node.text)) {
-			if (this._config.allowed && this._config.allowed.some(allowed => allowed === node.text)) {
-				return; // override
-			}
-
-			const checker = this.program.getTypeChecker();
-			const symbol = checker.getSymbolAtLocation(node);
-			if (symbol) {
-				const declarations = symbol.declarations;
-				if (Array.isArray(declarations) && symbol.declarations.some(declaration => {
-					if (declaration) {
-						const parent = declaration.parent;
-						if (parent) {
-							const sourceFile = parent.getSourceFile();
-							if (sourceFile) {
-								const fileName = sourceFile.fileName;
-								if (fileName && fileName.indexOf(this.getDefinitionPattern()) >= 0) {
-									return true;
-								}
-							}
-						}
-					}
-
-					return false;
-				})) {
-					this.addFailureAtNode(node, `Cannot use global '${node.text}' in '${this._config.target}'`);
-				}
-			}
-		}
-
-		super.visitIdentifier(node);
-	}
-}

build/lib/tslint/duplicateImportsRule.js

@@ -1,32 +0,0 @@
-"use strict";
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-Object.defineProperty(exports, "__esModule", { value: true });
-const path_1 = require("path");
-const Lint = require("tslint");
-class Rule extends Lint.Rules.AbstractRule {
-    apply(sourceFile) {
-        return this.applyWithWalker(new ImportPatterns(sourceFile, this.getOptions()));
-    }
-}
-exports.Rule = Rule;
-class ImportPatterns extends Lint.RuleWalker {
-    constructor(file, opts) {
-        super(file, opts);
-        this.imports = Object.create(null);
-    }
-    visitImportDeclaration(node) {
-        let path = node.moduleSpecifier.getText();
-        // remove quotes
-        path = path.slice(1, -1);
-        if (path[0] === '.') {
-            path = path_1.join(path_1.dirname(node.getSourceFile().fileName), path);
-        }
-        if (this.imports[path]) {
-            this.addFailure(this.createFailure(node.getStart(), node.getWidth(), `Duplicate imports for '${path}'.`));
-        }
-        this.imports[path] = true;
-    }
-}

build/lib/tslint/duplicateImportsRule.ts

@@ -1,40 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as ts from 'typescript';
-import { join, dirname } from 'path';
-import * as Lint from 'tslint';
-
-export class Rule extends Lint.Rules.AbstractRule {
-	public apply(sourceFile: ts.SourceFile): Lint.RuleFailure[] {
-		return this.applyWithWalker(new ImportPatterns(sourceFile, this.getOptions()));
-	}
-}
-
-class ImportPatterns extends Lint.RuleWalker {
-
-	private imports: { [path: string]: boolean; } = Object.create(null);
-
-	constructor(file: ts.SourceFile, opts: Lint.IOptions) {
-		super(file, opts);
-	}
-
-	protected visitImportDeclaration(node: ts.ImportDeclaration): void {
-		let path = node.moduleSpecifier.getText();
-
-		// remove quotes
-		path = path.slice(1, -1);
-
-		if (path[0] === '.') {
-			path = join(dirname(node.getSourceFile().fileName), path);
-		}
-
-		if (this.imports[path]) {
-			this.addFailure(this.createFailure(node.getStart(), node.getWidth(), `Duplicate imports for '${path}'.`));
-		}
-
-		this.imports[path] = true;
-	}
-}

build/lib/tslint/importPatternsRule.js

@@ -1,70 +0,0 @@
-"use strict";
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-Object.defineProperty(exports, "__esModule", { value: true });
-const ts = require("typescript");
-const Lint = require("tslint");
-const minimatch = require("minimatch");
-const path_1 = require("path");
-class Rule extends Lint.Rules.AbstractRule {
-    apply(sourceFile) {
-        const configs = this.getOptions().ruleArguments;
-        for (const config of configs) {
-            if (minimatch(sourceFile.fileName, config.target)) {
-                return this.applyWithWalker(new ImportPatterns(sourceFile, this.getOptions(), config));
-            }
-        }
-        return [];
-    }
-}
-exports.Rule = Rule;
-class ImportPatterns extends Lint.RuleWalker {
-    constructor(file, opts, _config) {
-        super(file, opts);
-        this._config = _config;
-    }
-    visitImportEqualsDeclaration(node) {
-        if (node.moduleReference.kind === ts.SyntaxKind.ExternalModuleReference) {
-            this._validateImport(node.moduleReference.expression.getText(), node);
-        }
-    }
-    visitImportDeclaration(node) {
-        this._validateImport(node.moduleSpecifier.getText(), node);
-    }
-    visitCallExpression(node) {
-        super.visitCallExpression(node);
-        // import('foo') statements inside the code
-        if (node.expression.kind === ts.SyntaxKind.ImportKeyword) {
-            const [path] = node.arguments;
-            this._validateImport(path.getText(), node);
-        }
-    }
-    _validateImport(path, node) {
-        // remove quotes
-        path = path.slice(1, -1);
-        // resolve relative paths
-        if (path[0] === '.') {
-            path = path_1.join(this.getSourceFile().fileName, path);
-        }
-        let restrictions;
-        if (typeof this._config.restrictions === 'string') {
-            restrictions = [this._config.restrictions];
-        }
-        else {
-            restrictions = this._config.restrictions;
-        }
-        let matched = false;
-        for (const pattern of restrictions) {
-            if (minimatch(path, pattern)) {
-                matched = true;
-                break;
-            }
-        }
-        if (!matched) {
-            // None of the restrictions matched
-            this.addFailure(this.createFailure(node.getStart(), node.getWidth(), `Imports violates '${restrictions.join(' or ')}' restrictions. See https://github.com/Microsoft/vscode/wiki/Code-Organization`));
-        }
-    }
-}

build/lib/tslint/importPatternsRule.ts

@@ -1,87 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as ts from 'typescript';
-import * as Lint from 'tslint';
-import * as minimatch from 'minimatch';
-import { join } from 'path';
-
-interface ImportPatternsConfig {
-	target: string;
-	restrictions: string | string[];
-}
-
-export class Rule extends Lint.Rules.AbstractRule {
-	public apply(sourceFile: ts.SourceFile): Lint.RuleFailure[] {
-
-		const configs = <ImportPatternsConfig[]>this.getOptions().ruleArguments;
-
-
-		for (const config of configs) {
-			if (minimatch(sourceFile.fileName, config.target)) {
-				return this.applyWithWalker(new ImportPatterns(sourceFile, this.getOptions(), config));
-			}
-		}
-
-		return [];
-	}
-}
-
-class ImportPatterns extends Lint.RuleWalker {
-
-	constructor(file: ts.SourceFile, opts: Lint.IOptions, private _config: ImportPatternsConfig) {
-		super(file, opts);
-	}
-
-	protected visitImportEqualsDeclaration(node: ts.ImportEqualsDeclaration): void {
-		if (node.moduleReference.kind === ts.SyntaxKind.ExternalModuleReference) {
-			this._validateImport(node.moduleReference.expression.getText(), node);
-		}
-	}
-
-	protected visitImportDeclaration(node: ts.ImportDeclaration): void {
-		this._validateImport(node.moduleSpecifier.getText(), node);
-	}
-
-	protected visitCallExpression(node: ts.CallExpression): void {
-		super.visitCallExpression(node);
-
-		// import('foo') statements inside the code
-		if (node.expression.kind === ts.SyntaxKind.ImportKeyword) {
-			const [path] = node.arguments;
-			this._validateImport(path.getText(), node);
-		}
-	}
-
-	private _validateImport(path: string, node: ts.Node): void {
-		// remove quotes
-		path = path.slice(1, -1);
-
-		// resolve relative paths
-		if (path[0] === '.') {
-			path = join(this.getSourceFile().fileName, path);
-		}
-
-		let restrictions: string[];
-		if (typeof this._config.restrictions === 'string') {
-			restrictions = [this._config.restrictions];
-		} else {
-			restrictions = this._config.restrictions;
-		}
-
-		let matched = false;
-		for (const pattern of restrictions) {
-			if (minimatch(path, pattern)) {
-				matched = true;
-				break;
-			}
-		}
-
-		if (!matched) {
-			// None of the restrictions matched
-			this.addFailure(this.createFailure(node.getStart(), node.getWidth(), `Imports violates '${restrictions.join(' or ')}' restrictions. See https://github.com/Microsoft/vscode/wiki/Code-Organization`));
-		}
-	}
-}

build/lib/tslint/layeringRule.js

@@ -1,83 +0,0 @@
-"use strict";
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-Object.defineProperty(exports, "__esModule", { value: true });
-const ts = require("typescript");
-const Lint = require("tslint");
-const path_1 = require("path");
-class Rule extends Lint.Rules.AbstractRule {
-    apply(sourceFile) {
-        const parts = path_1.dirname(sourceFile.fileName).split(/\\|\//);
-        const ruleArgs = this.getOptions().ruleArguments[0];
-        let config;
-        for (let i = parts.length - 1; i >= 0; i--) {
-            if (ruleArgs[parts[i]]) {
-                config = {
-                    allowed: new Set(ruleArgs[parts[i]]).add(parts[i]),
-                    disallowed: new Set()
-                };
-                Object.keys(ruleArgs).forEach(key => {
-                    if (!config.allowed.has(key)) {
-                        config.disallowed.add(key);
-                    }
-                });
-                break;
-            }
-        }
-        if (!config) {
-            return [];
-        }
-        return this.applyWithWalker(new LayeringRule(sourceFile, config, this.getOptions()));
-    }
-}
-exports.Rule = Rule;
-class LayeringRule extends Lint.RuleWalker {
-    constructor(file, config, opts) {
-        super(file, opts);
-        this._config = config;
-    }
-    visitImportEqualsDeclaration(node) {
-        if (node.moduleReference.kind === ts.SyntaxKind.ExternalModuleReference) {
-            this._validateImport(node.moduleReference.expression.getText(), node);
-        }
-    }
-    visitImportDeclaration(node) {
-        this._validateImport(node.moduleSpecifier.getText(), node);
-    }
-    visitCallExpression(node) {
-        super.visitCallExpression(node);
-        // import('foo') statements inside the code
-        if (node.expression.kind === ts.SyntaxKind.ImportKeyword) {
-            const [path] = node.arguments;
-            this._validateImport(path.getText(), node);
-        }
-    }
-    _validateImport(path, node) {
-        // remove quotes
-        path = path.slice(1, -1);
-        if (path[0] === '.') {
-            path = path_1.join(path_1.dirname(node.getSourceFile().fileName), path);
-        }
-        const parts = path_1.dirname(path).split(/\\|\//);
-        for (let i = parts.length - 1; i >= 0; i--) {
-            const part = parts[i];
-            if (this._config.allowed.has(part)) {
-                // GOOD - same layer
-                return;
-            }
-            if (this._config.disallowed.has(part)) {
-                // BAD - wrong layer
-                const message = `Bad layering. You are not allowed to access '${part}' from here, allowed layers are: [${LayeringRule._print(this._config.allowed)}]`;
-                this.addFailure(this.createFailure(node.getStart(), node.getWidth(), message));
-                return;
-            }
-        }
-    }
-    static _print(set) {
-        const r = [];
-        set.forEach(e => r.push(e));
-        return r.join(', ');
-    }
-}

build/lib/tslint/layeringRule.ts

@@ -1,105 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as ts from 'typescript';
-import * as Lint from 'tslint';
-import { join, dirname } from 'path';
-
-interface Config {
-	allowed: Set<string>;
-	disallowed: Set<string>;
-}
-
-export class Rule extends Lint.Rules.AbstractRule {
-	public apply(sourceFile: ts.SourceFile): Lint.RuleFailure[] {
-
-		const parts = dirname(sourceFile.fileName).split(/\\|\//);
-		const ruleArgs = this.getOptions().ruleArguments[0];
-
-		let config: Config | undefined;
-		for (let i = parts.length - 1; i >= 0; i--) {
-			if (ruleArgs[parts[i]]) {
-				config = {
-					allowed: new Set<string>(<string[]>ruleArgs[parts[i]]).add(parts[i]),
-					disallowed: new Set<string>()
-				};
-				Object.keys(ruleArgs).forEach(key => {
-					if (!config!.allowed.has(key)) {
-						config!.disallowed.add(key);
-					}
-				});
-				break;
-			}
-		}
-
-		if (!config) {
-			return [];
-		}
-
-		return this.applyWithWalker(new LayeringRule(sourceFile, config, this.getOptions()));
-	}
-}
-
-class LayeringRule extends Lint.RuleWalker {
-
-	private _config: Config;
-
-	constructor(file: ts.SourceFile, config: Config, opts: Lint.IOptions) {
-		super(file, opts);
-		this._config = config;
-	}
-
-	protected visitImportEqualsDeclaration(node: ts.ImportEqualsDeclaration): void {
-		if (node.moduleReference.kind === ts.SyntaxKind.ExternalModuleReference) {
-			this._validateImport(node.moduleReference.expression.getText(), node);
-		}
-	}
-
-	protected visitImportDeclaration(node: ts.ImportDeclaration): void {
-		this._validateImport(node.moduleSpecifier.getText(), node);
-	}
-
-	protected visitCallExpression(node: ts.CallExpression): void {
-		super.visitCallExpression(node);
-
-		// import('foo') statements inside the code
-		if (node.expression.kind === ts.SyntaxKind.ImportKeyword) {
-			const [path] = node.arguments;
-			this._validateImport(path.getText(), node);
-		}
-	}
-
-	private _validateImport(path: string, node: ts.Node): void {
-		// remove quotes
-		path = path.slice(1, -1);
-
-		if (path[0] === '.') {
-			path = join(dirname(node.getSourceFile().fileName), path);
-		}
-
-		const parts = dirname(path).split(/\\|\//);
-		for (let i = parts.length - 1; i >= 0; i--) {
-			const part = parts[i];
-
-			if (this._config.allowed.has(part)) {
-				// GOOD - same layer
-				return;
-			}
-
-			if (this._config.disallowed.has(part)) {
-				// BAD - wrong layer
-				const message = `Bad layering. You are not allowed to access '${part}' from here, allowed layers are: [${LayeringRule._print(this._config.allowed)}]`;
-				this.addFailure(this.createFailure(node.getStart(), node.getWidth(), message));
-				return;
-			}
-		}
-	}
-
-	static _print(set: Set<string>): string {
-		const r: string[] = [];
-		set.forEach(e => r.push(e));
-		return r.join(', ');
-	}
-}

build/lib/tslint/noDomGlobalsRule.js

@@ -1,34 +0,0 @@
-"use strict";
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-Object.defineProperty(exports, "__esModule", { value: true });
-const Lint = require("tslint");
-const minimatch = require("minimatch");
-const abstractGlobalsRule_1 = require("./abstractGlobalsRule");
-class Rule extends Lint.Rules.TypedRule {
-    applyWithProgram(sourceFile, program) {
-        const configs = this.getOptions().ruleArguments;
-        for (const config of configs) {
-            if (minimatch(sourceFile.fileName, config.target)) {
-                return this.applyWithWalker(new NoDOMGlobalsRuleWalker(sourceFile, program, this.getOptions(), config));
-            }
-        }
-        return [];
-    }
-}
-exports.Rule = Rule;
-class NoDOMGlobalsRuleWalker extends abstractGlobalsRule_1.AbstractGlobalsRuleWalker {
-    getDefinitionPattern() {
-        return 'lib.dom.d.ts';
-    }
-    getDisallowedGlobals() {
-        // intentionally not complete
-        return [
-            "window",
-            "document",
-            "HTMLElement"
-        ];
-    }
-}

build/lib/tslint/noDomGlobalsRule.ts

@@ -1,45 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as ts from 'typescript';
-import * as Lint from 'tslint';
-import * as minimatch from 'minimatch';
-import { AbstractGlobalsRuleWalker } from './abstractGlobalsRule';
-
-interface NoDOMGlobalsRuleConfig {
-	target: string;
-	allowed: string[];
-}
-
-export class Rule extends Lint.Rules.TypedRule {
-
-	applyWithProgram(sourceFile: ts.SourceFile, program: ts.Program): Lint.RuleFailure[] {
-		const configs = <NoDOMGlobalsRuleConfig[]>this.getOptions().ruleArguments;
-
-		for (const config of configs) {
-			if (minimatch(sourceFile.fileName, config.target)) {
-				return this.applyWithWalker(new NoDOMGlobalsRuleWalker(sourceFile, program, this.getOptions(), config));
-			}
-		}
-
-		return [];
-	}
-}
-
-class NoDOMGlobalsRuleWalker extends AbstractGlobalsRuleWalker {
-
-	getDefinitionPattern(): string {
-		return 'lib.dom.d.ts';
-	}
-
-	getDisallowedGlobals(): string[] {
-		// intentionally not complete
-		return [
-			"window",
-			"document",
-			"HTMLElement"
-		];
-	}
-}

build/lib/tslint/noNewBufferRule.js

@@ -1,22 +0,0 @@
-"use strict";
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-Object.defineProperty(exports, "__esModule", { value: true });
-const ts = require("typescript");
-const Lint = require("tslint");
-class Rule extends Lint.Rules.AbstractRule {
-    apply(sourceFile) {
-        return this.applyWithWalker(new NewBufferRuleWalker(sourceFile, this.getOptions()));
-    }
-}
-exports.Rule = Rule;
-class NewBufferRuleWalker extends Lint.RuleWalker {
-    visitNewExpression(node) {
-        if (node.expression.kind === ts.SyntaxKind.Identifier && node.expression && node.expression.text === 'Buffer') {
-            this.addFailureAtNode(node, '`new Buffer` is deprecated. Consider Buffer.From or Buffer.alloc instead.');
-        }
-        super.visitNewExpression(node);
-    }
-}

build/lib/tslint/noNewBufferRule.ts

@@ -1,23 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as ts from 'typescript';
-import * as Lint from 'tslint';
-
-export class Rule extends Lint.Rules.AbstractRule {
-	apply(sourceFile: ts.SourceFile): Lint.RuleFailure[] {
-		return this.applyWithWalker(new NewBufferRuleWalker(sourceFile, this.getOptions()));
-	}
-}
-
-class NewBufferRuleWalker extends Lint.RuleWalker {
-	visitNewExpression(node: ts.NewExpression) {
-		if (node.expression.kind === ts.SyntaxKind.Identifier && node.expression && (node.expression as ts.Identifier).text === 'Buffer') {
-			this.addFailureAtNode(node, '`new Buffer` is deprecated. Consider Buffer.From or Buffer.alloc instead.');
-		}
-
-		super.visitNewExpression(node);
-	}
-}

build/lib/tslint/noNlsInStandaloneEditorRule.js

@@ -1,54 +0,0 @@
-"use strict";
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-Object.defineProperty(exports, "__esModule", { value: true });
-const ts = require("typescript");
-const Lint = require("tslint");
-const path_1 = require("path");
-class Rule extends Lint.Rules.AbstractRule {
-    apply(sourceFile) {
-        if (/vs(\/|\\)editor(\/|\\)standalone(\/|\\)/.test(sourceFile.fileName)
-            || /vs(\/|\\)editor(\/|\\)common(\/|\\)standalone(\/|\\)/.test(sourceFile.fileName)
-            || /vs(\/|\\)editor(\/|\\)editor.api/.test(sourceFile.fileName)
-            || /vs(\/|\\)editor(\/|\\)editor.main/.test(sourceFile.fileName)
-            || /vs(\/|\\)editor(\/|\\)editor.worker/.test(sourceFile.fileName)) {
-            return this.applyWithWalker(new NoNlsInStandaloneEditorRuleWalker(sourceFile, this.getOptions()));
-        }
-        return [];
-    }
-}
-exports.Rule = Rule;
-class NoNlsInStandaloneEditorRuleWalker extends Lint.RuleWalker {
-    constructor(file, opts) {
-        super(file, opts);
-    }
-    visitImportEqualsDeclaration(node) {
-        if (node.moduleReference.kind === ts.SyntaxKind.ExternalModuleReference) {
-            this._validateImport(node.moduleReference.expression.getText(), node);
-        }
-    }
-    visitImportDeclaration(node) {
-        this._validateImport(node.moduleSpecifier.getText(), node);
-    }
-    visitCallExpression(node) {
-        super.visitCallExpression(node);
-        // import('foo') statements inside the code
-        if (node.expression.kind === ts.SyntaxKind.ImportKeyword) {
-            const [path] = node.arguments;
-            this._validateImport(path.getText(), node);
-        }
-    }
-    _validateImport(path, node) {
-        // remove quotes
-        path = path.slice(1, -1);
-        // resolve relative paths
-        if (path[0] === '.') {
-            path = path_1.join(this.getSourceFile().fileName, path);
-        }
-        if (/vs(\/|\\)nls/.test(path)) {
-            this.addFailure(this.createFailure(node.getStart(), node.getWidth(), `Not allowed to import vs/nls in standalone editor modules. Use standaloneStrings.ts`));
-        }
-    }
-}

build/lib/tslint/noNlsInStandaloneEditorRule.ts

@@ -1,67 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as ts from 'typescript';
-import * as Lint from 'tslint';
-import { join } from 'path';
-
-export class Rule extends Lint.Rules.AbstractRule {
-	public apply(sourceFile: ts.SourceFile): Lint.RuleFailure[] {
-		if (
-			/vs(\/|\\)editor(\/|\\)standalone(\/|\\)/.test(sourceFile.fileName)
-			|| /vs(\/|\\)editor(\/|\\)common(\/|\\)standalone(\/|\\)/.test(sourceFile.fileName)
-			|| /vs(\/|\\)editor(\/|\\)editor.api/.test(sourceFile.fileName)
-			|| /vs(\/|\\)editor(\/|\\)editor.main/.test(sourceFile.fileName)
-			|| /vs(\/|\\)editor(\/|\\)editor.worker/.test(sourceFile.fileName)
-		) {
-			return this.applyWithWalker(new NoNlsInStandaloneEditorRuleWalker(sourceFile, this.getOptions()));
-		}
-
-		return [];
-	}
-}
-
-class NoNlsInStandaloneEditorRuleWalker extends Lint.RuleWalker {
-
-	constructor(file: ts.SourceFile, opts: Lint.IOptions) {
-		super(file, opts);
-	}
-
-	protected visitImportEqualsDeclaration(node: ts.ImportEqualsDeclaration): void {
-		if (node.moduleReference.kind === ts.SyntaxKind.ExternalModuleReference) {
-			this._validateImport(node.moduleReference.expression.getText(), node);
-		}
-	}
-
-	protected visitImportDeclaration(node: ts.ImportDeclaration): void {
-		this._validateImport(node.moduleSpecifier.getText(), node);
-	}
-
-	protected visitCallExpression(node: ts.CallExpression): void {
-		super.visitCallExpression(node);
-
-		// import('foo') statements inside the code
-		if (node.expression.kind === ts.SyntaxKind.ImportKeyword) {
-			const [path] = node.arguments;
-			this._validateImport(path.getText(), node);
-		}
-	}
-
-	private _validateImport(path: string, node: ts.Node): void {
-		// remove quotes
-		path = path.slice(1, -1);
-
-		// resolve relative paths
-		if (path[0] === '.') {
-			path = join(this.getSourceFile().fileName, path);
-		}
-
-		if (
-			/vs(\/|\\)nls/.test(path)
-		) {
-			this.addFailure(this.createFailure(node.getStart(), node.getWidth(), `Not allowed to import vs/nls in standalone editor modules. Use standaloneStrings.ts`));
-		}
-	}
-}

build/lib/tslint/noNodejsGlobalsRule.js

@@ -1,41 +0,0 @@
-"use strict";
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-Object.defineProperty(exports, "__esModule", { value: true });
-const Lint = require("tslint");
-const minimatch = require("minimatch");
-const abstractGlobalsRule_1 = require("./abstractGlobalsRule");
-class Rule extends Lint.Rules.TypedRule {
-    applyWithProgram(sourceFile, program) {
-        const configs = this.getOptions().ruleArguments;
-        for (const config of configs) {
-            if (minimatch(sourceFile.fileName, config.target)) {
-                return this.applyWithWalker(new NoNodejsGlobalsRuleWalker(sourceFile, program, this.getOptions(), config));
-            }
-        }
-        return [];
-    }
-}
-exports.Rule = Rule;
-class NoNodejsGlobalsRuleWalker extends abstractGlobalsRule_1.AbstractGlobalsRuleWalker {
-    getDefinitionPattern() {
-        return '@types/node';
-    }
-    getDisallowedGlobals() {
-        // https://nodejs.org/api/globals.html#globals_global_objects
-        return [
-            "NodeJS",
-            "Buffer",
-            "__dirname",
-            "__filename",
-            "clearImmediate",
-            "exports",
-            "global",
-            "module",
-            "process",
-            "setImmediate"
-        ];
-    }
-}

build/lib/tslint/noNodejsGlobalsRule.ts

@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as ts from 'typescript';
-import * as Lint from 'tslint';
-import * as minimatch from 'minimatch';
-import { AbstractGlobalsRuleWalker } from './abstractGlobalsRule';
-
-interface NoNodejsGlobalsConfig {
-	target: string;
-	allowed: string[];
-}
-
-export class Rule extends Lint.Rules.TypedRule {
-
-	applyWithProgram(sourceFile: ts.SourceFile, program: ts.Program): Lint.RuleFailure[] {
-		const configs = <NoNodejsGlobalsConfig[]>this.getOptions().ruleArguments;
-
-		for (const config of configs) {
-			if (minimatch(sourceFile.fileName, config.target)) {
-				return this.applyWithWalker(new NoNodejsGlobalsRuleWalker(sourceFile, program, this.getOptions(), config));
-			}
-		}
-
-		return [];
-	}
-}
-
-class NoNodejsGlobalsRuleWalker extends AbstractGlobalsRuleWalker {
-
-	getDefinitionPattern(): string {
-		return '@types/node';
-	}
-
-	getDisallowedGlobals(): string[] {
-		// https://nodejs.org/api/globals.html#globals_global_objects
-		return [
-			"NodeJS",
-			"Buffer",
-			"__dirname",
-			"__filename",
-			"clearImmediate",
-			"exports",
-			"global",
-			"module",
-			"process",
-			"setImmediate"
-		];
-	}
-}

build/lib/tslint/noStandaloneEditorRule.js

@@ -1,55 +0,0 @@
-"use strict";
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-Object.defineProperty(exports, "__esModule", { value: true });
-const ts = require("typescript");
-const Lint = require("tslint");
-const path_1 = require("path");
-class Rule extends Lint.Rules.AbstractRule {
-    apply(sourceFile) {
-        if (/vs(\/|\\)editor/.test(sourceFile.fileName)) {
-            // the vs/editor folder is allowed to use the standalone editor
-            return [];
-        }
-        return this.applyWithWalker(new NoStandaloneEditorRuleWalker(sourceFile, this.getOptions()));
-    }
-}
-exports.Rule = Rule;
-class NoStandaloneEditorRuleWalker extends Lint.RuleWalker {
-    constructor(file, opts) {
-        super(file, opts);
-    }
-    visitImportEqualsDeclaration(node) {
-        if (node.moduleReference.kind === ts.SyntaxKind.ExternalModuleReference) {
-            this._validateImport(node.moduleReference.expression.getText(), node);
-        }
-    }
-    visitImportDeclaration(node) {
-        this._validateImport(node.moduleSpecifier.getText(), node);
-    }
-    visitCallExpression(node) {
-        super.visitCallExpression(node);
-        // import('foo') statements inside the code
-        if (node.expression.kind === ts.SyntaxKind.ImportKeyword) {
-            const [path] = node.arguments;
-            this._validateImport(path.getText(), node);
-        }
-    }
-    _validateImport(path, node) {
-        // remove quotes
-        path = path.slice(1, -1);
-        // resolve relative paths
-        if (path[0] === '.') {
-            path = path_1.join(this.getSourceFile().fileName, path);
-        }
-        if (/vs(\/|\\)editor(\/|\\)standalone(\/|\\)/.test(path)
-            || /vs(\/|\\)editor(\/|\\)common(\/|\\)standalone(\/|\\)/.test(path)
-            || /vs(\/|\\)editor(\/|\\)editor.api/.test(path)
-            || /vs(\/|\\)editor(\/|\\)editor.main/.test(path)
-            || /vs(\/|\\)editor(\/|\\)editor.worker/.test(path)) {
-            this.addFailure(this.createFailure(node.getStart(), node.getWidth(), `Not allowed to import standalone editor modules. See https://github.com/Microsoft/vscode/wiki/Code-Organization`));
-        }
-    }
-}

build/lib/tslint/noStandaloneEditorRule.ts

@@ -1,65 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as ts from 'typescript';
-import * as Lint from 'tslint';
-import { join } from 'path';
-
-export class Rule extends Lint.Rules.AbstractRule {
-	public apply(sourceFile: ts.SourceFile): Lint.RuleFailure[] {
-		if (/vs(\/|\\)editor/.test(sourceFile.fileName)) {
-			// the vs/editor folder is allowed to use the standalone editor
-			return [];
-		}
-		return this.applyWithWalker(new NoStandaloneEditorRuleWalker(sourceFile, this.getOptions()));
-	}
-}
-
-class NoStandaloneEditorRuleWalker extends Lint.RuleWalker {
-
-	constructor(file: ts.SourceFile, opts: Lint.IOptions) {
-		super(file, opts);
-	}
-
-	protected visitImportEqualsDeclaration(node: ts.ImportEqualsDeclaration): void {
-		if (node.moduleReference.kind === ts.SyntaxKind.ExternalModuleReference) {
-			this._validateImport(node.moduleReference.expression.getText(), node);
-		}
-	}
-
-	protected visitImportDeclaration(node: ts.ImportDeclaration): void {
-		this._validateImport(node.moduleSpecifier.getText(), node);
-	}
-
-	protected visitCallExpression(node: ts.CallExpression): void {
-		super.visitCallExpression(node);
-
-		// import('foo') statements inside the code
-		if (node.expression.kind === ts.SyntaxKind.ImportKeyword) {
-			const [path] = node.arguments;
-			this._validateImport(path.getText(), node);
-		}
-	}
-
-	private _validateImport(path: string, node: ts.Node): void {
-		// remove quotes
-		path = path.slice(1, -1);
-
-		// resolve relative paths
-		if (path[0] === '.') {
-			path = join(this.getSourceFile().fileName, path);
-		}
-
-		if (
-			/vs(\/|\\)editor(\/|\\)standalone(\/|\\)/.test(path)
-			|| /vs(\/|\\)editor(\/|\\)common(\/|\\)standalone(\/|\\)/.test(path)
-			|| /vs(\/|\\)editor(\/|\\)editor.api/.test(path)
-			|| /vs(\/|\\)editor(\/|\\)editor.main/.test(path)
-			|| /vs(\/|\\)editor(\/|\\)editor.worker/.test(path)
-		) {
-			this.addFailure(this.createFailure(node.getStart(), node.getWidth(), `Not allowed to import standalone editor modules. See https://github.com/Microsoft/vscode/wiki/Code-Organization`));
-		}
-	}
-}

build/lib/tslint/noUnexternalizedStringsRule.js

@@ -1,183 +0,0 @@
-"use strict";
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-Object.defineProperty(exports, "__esModule", { value: true });
-const ts = require("typescript");
-const Lint = require("tslint");
-/**
- * Implementation of the no-unexternalized-strings rule.
- */
-class Rule extends Lint.Rules.AbstractRule {
-    apply(sourceFile) {
-        if (/\.d.ts$/.test(sourceFile.fileName)) {
-            return [];
-        }
-        return this.applyWithWalker(new NoUnexternalizedStringsRuleWalker(sourceFile, this.getOptions()));
-    }
-}
-exports.Rule = Rule;
-function isStringLiteral(node) {
-    return node && node.kind === ts.SyntaxKind.StringLiteral;
-}
-function isObjectLiteral(node) {
-    return node && node.kind === ts.SyntaxKind.ObjectLiteralExpression;
-}
-function isPropertyAssignment(node) {
-    return node && node.kind === ts.SyntaxKind.PropertyAssignment;
-}
-class NoUnexternalizedStringsRuleWalker extends Lint.RuleWalker {
-    constructor(file, opts) {
-        super(file, opts);
-        this.signatures = Object.create(null);
-        this.ignores = Object.create(null);
-        this.messageIndex = undefined;
-        this.keyIndex = undefined;
-        this.usedKeys = Object.create(null);
-        const options = this.getOptions();
-        const first = options && options.length > 0 ? options[0] : null;
-        if (first) {
-            if (Array.isArray(first.signatures)) {
-                first.signatures.forEach((signature) => this.signatures[signature] = true);
-            }
-            if (Array.isArray(first.ignores)) {
-                first.ignores.forEach((ignore) => this.ignores[ignore] = true);
-            }
-            if (typeof first.messageIndex !== 'undefined') {
-                this.messageIndex = first.messageIndex;
-            }
-            if (typeof first.keyIndex !== 'undefined') {
-                this.keyIndex = first.keyIndex;
-            }
-        }
-    }
-    visitSourceFile(node) {
-        super.visitSourceFile(node);
-        Object.keys(this.usedKeys).forEach(key => {
-            // Keys are quoted.
-            let identifier = key.substr(1, key.length - 2);
-            if (!NoUnexternalizedStringsRuleWalker.IDENTIFIER.test(identifier)) {
-                let occurrence = this.usedKeys[key][0];
-                this.addFailure(this.createFailure(occurrence.key.getStart(), occurrence.key.getWidth(), `The key ${occurrence.key.getText()} doesn't conform to a valid localize identifier`));
-            }
-            const occurrences = this.usedKeys[key];
-            if (occurrences.length > 1) {
-                occurrences.forEach(occurrence => {
-                    this.addFailure((this.createFailure(occurrence.key.getStart(), occurrence.key.getWidth(), `Duplicate key ${occurrence.key.getText()} with different message value.`)));
-                });
-            }
-        });
-    }
-    visitStringLiteral(node) {
-        this.checkStringLiteral(node);
-        super.visitStringLiteral(node);
-    }
-    checkStringLiteral(node) {
-        const text = node.getText();
-        const doubleQuoted = text.length >= 2 && text[0] === NoUnexternalizedStringsRuleWalker.DOUBLE_QUOTE && text[text.length - 1] === NoUnexternalizedStringsRuleWalker.DOUBLE_QUOTE;
-        const info = this.findDescribingParent(node);
-        // Ignore strings in import and export nodes.
-        if (info && info.isImport && doubleQuoted) {
-            const fix = [
-                Lint.Replacement.replaceFromTo(node.getStart(), 1, '\''),
-                Lint.Replacement.replaceFromTo(node.getStart() + text.length - 1, 1, '\''),
-            ];
-            this.addFailureAtNode(node, NoUnexternalizedStringsRuleWalker.ImportFailureMessage, fix);
-            return;
-        }
-        const callInfo = info ? info.callInfo : null;
-        const functionName = callInfo ? callInfo.callExpression.expression.getText() : null;
-        if (functionName && this.ignores[functionName]) {
-            return;
-        }
-        if (doubleQuoted && (!callInfo || callInfo.argIndex === -1 || !this.signatures[functionName])) {
-            const s = node.getText();
-            const fix = [
-                Lint.Replacement.replaceFromTo(node.getStart(), node.getWidth(), `nls.localize('KEY-${s.substring(1, s.length - 1)}', ${s})`),
-            ];
-            this.addFailure(this.createFailure(node.getStart(), node.getWidth(), `Unexternalized string found: ${node.getText()}`, fix));
-            return;
-        }
-        // We have a single quoted string outside a localize function name.
-        if (!doubleQuoted && !this.signatures[functionName]) {
-            return;
-        }
-        // We have a string that is a direct argument into the localize call.
-        const keyArg = callInfo && callInfo.argIndex === this.keyIndex
-            ? callInfo.callExpression.arguments[this.keyIndex]
-            : null;
-        if (keyArg) {
-            if (isStringLiteral(keyArg)) {
-                this.recordKey(keyArg, this.messageIndex && callInfo ? callInfo.callExpression.arguments[this.messageIndex] : undefined);
-            }
-            else if (isObjectLiteral(keyArg)) {
-                for (const property of keyArg.properties) {
-                    if (isPropertyAssignment(property)) {
-                        const name = property.name.getText();
-                        if (name === 'key') {
-                            const initializer = property.initializer;
-                            if (isStringLiteral(initializer)) {
-                                this.recordKey(initializer, this.messageIndex && callInfo ? callInfo.callExpression.arguments[this.messageIndex] : undefined);
-                            }
-                            break;
-                        }
-                    }
-                }
-            }
-        }
-        const messageArg = callInfo.callExpression.arguments[this.messageIndex];
-        if (messageArg && messageArg.kind !== ts.SyntaxKind.StringLiteral) {
-            this.addFailure(this.createFailure(messageArg.getStart(), messageArg.getWidth(), `Message argument to '${callInfo.callExpression.expression.getText()}' must be a string literal.`));
-            return;
-        }
-    }
-    recordKey(keyNode, messageNode) {
-        const text = keyNode.getText();
-        // We have an empty key
-        if (text.match(/(['"]) *\1/)) {
-            if (messageNode) {
-                this.addFailureAtNode(keyNode, `Key is empty for message: ${messageNode.getText()}`);
-            }
-            else {
-                this.addFailureAtNode(keyNode, `Key is empty.`);
-            }
-            return;
-        }
-        let occurrences = this.usedKeys[text];
-        if (!occurrences) {
-            occurrences = [];
-            this.usedKeys[text] = occurrences;
-        }
-        if (messageNode) {
-            if (occurrences.some(pair => pair.message ? pair.message.getText() === messageNode.getText() : false)) {
-                return;
-            }
-        }
-        occurrences.push({ key: keyNode, message: messageNode });
-    }
-    findDescribingParent(node) {
-        let parent;
-        while ((parent = node.parent)) {
-            const kind = parent.kind;
-            if (kind === ts.SyntaxKind.CallExpression) {
-                const callExpression = parent;
-                return { callInfo: { callExpression: callExpression, argIndex: callExpression.arguments.indexOf(node) } };
-            }
-            else if (kind === ts.SyntaxKind.ImportEqualsDeclaration || kind === ts.SyntaxKind.ImportDeclaration || kind === ts.SyntaxKind.ExportDeclaration) {
-                return { isImport: true };
-            }
-            else if (kind === ts.SyntaxKind.VariableDeclaration || kind === ts.SyntaxKind.FunctionDeclaration || kind === ts.SyntaxKind.PropertyDeclaration
-                || kind === ts.SyntaxKind.MethodDeclaration || kind === ts.SyntaxKind.VariableDeclarationList || kind === ts.SyntaxKind.InterfaceDeclaration
-                || kind === ts.SyntaxKind.ClassDeclaration || kind === ts.SyntaxKind.EnumDeclaration || kind === ts.SyntaxKind.ModuleDeclaration
-                || kind === ts.SyntaxKind.TypeAliasDeclaration || kind === ts.SyntaxKind.SourceFile) {
-                return null;
-            }
-            node = parent;
-        }
-        return null;
-    }
-}
-NoUnexternalizedStringsRuleWalker.ImportFailureMessage = 'Do not use double quotes for imports.';
-NoUnexternalizedStringsRuleWalker.DOUBLE_QUOTE = '"';
-NoUnexternalizedStringsRuleWalker.IDENTIFIER = /^[_a-zA-Z0-9][ .\-_a-zA-Z0-9]*$/;

build/lib/tslint/noUnexternalizedStringsRule.ts

@@ -1,222 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as ts from 'typescript';
-import * as Lint from 'tslint';
-
-/**
- * Implementation of the no-unexternalized-strings rule.
- */
-export class Rule extends Lint.Rules.AbstractRule {
-	public apply(sourceFile: ts.SourceFile): Lint.RuleFailure[] {
-		if (/\.d.ts$/.test(sourceFile.fileName)) {
-			return [];
-		}
-		return this.applyWithWalker(new NoUnexternalizedStringsRuleWalker(sourceFile, this.getOptions()));
-	}
-}
-
-interface Map<V> {
-	[key: string]: V;
-}
-
-interface UnexternalizedStringsOptions {
-	signatures?: string[];
-	messageIndex?: number;
-	keyIndex?: number;
-	ignores?: string[];
-}
-
-function isStringLiteral(node: ts.Node): node is ts.StringLiteral {
-	return node && node.kind === ts.SyntaxKind.StringLiteral;
-}
-
-function isObjectLiteral(node: ts.Node): node is ts.ObjectLiteralExpression {
-	return node && node.kind === ts.SyntaxKind.ObjectLiteralExpression;
-}
-
-function isPropertyAssignment(node: ts.Node): node is ts.PropertyAssignment {
-	return node && node.kind === ts.SyntaxKind.PropertyAssignment;
-}
-
-interface KeyMessagePair {
-	key: ts.StringLiteral;
-	message: ts.Node | undefined;
-}
-
-class NoUnexternalizedStringsRuleWalker extends Lint.RuleWalker {
-
-	private static ImportFailureMessage = 'Do not use double quotes for imports.';
-
-	private static DOUBLE_QUOTE: string = '"';
-
-	private signatures: Map<boolean>;
-	private messageIndex: number | undefined;
-	private keyIndex: number | undefined;
-	private ignores: Map<boolean>;
-
-	private usedKeys: Map<KeyMessagePair[]>;
-
-	constructor(file: ts.SourceFile, opts: Lint.IOptions) {
-		super(file, opts);
-		this.signatures = Object.create(null);
-		this.ignores = Object.create(null);
-		this.messageIndex = undefined;
-		this.keyIndex = undefined;
-		this.usedKeys = Object.create(null);
-		const options: any[] = this.getOptions();
-		const first: UnexternalizedStringsOptions = options && options.length > 0 ? options[0] : null;
-		if (first) {
-			if (Array.isArray(first.signatures)) {
-				first.signatures.forEach((signature: string) => this.signatures[signature] = true);
-			}
-			if (Array.isArray(first.ignores)) {
-				first.ignores.forEach((ignore: string) => this.ignores[ignore] = true);
-			}
-			if (typeof first.messageIndex !== 'undefined') {
-				this.messageIndex = first.messageIndex;
-			}
-			if (typeof first.keyIndex !== 'undefined') {
-				this.keyIndex = first.keyIndex;
-			}
-		}
-	}
-
-	private static IDENTIFIER = /^[_a-zA-Z0-9][ .\-_a-zA-Z0-9]*$/;
-	protected visitSourceFile(node: ts.SourceFile): void {
-		super.visitSourceFile(node);
-		Object.keys(this.usedKeys).forEach(key => {
-			// Keys are quoted.
-			let identifier = key.substr(1, key.length - 2);
-			if (!NoUnexternalizedStringsRuleWalker.IDENTIFIER.test(identifier)) {
-				let occurrence = this.usedKeys[key][0];
-				this.addFailure(this.createFailure(occurrence.key.getStart(), occurrence.key.getWidth(), `The key ${occurrence.key.getText()} doesn't conform to a valid localize identifier`));
-			}
-			const occurrences = this.usedKeys[key];
-			if (occurrences.length > 1) {
-				occurrences.forEach(occurrence => {
-					this.addFailure((this.createFailure(occurrence.key.getStart(), occurrence.key.getWidth(), `Duplicate key ${occurrence.key.getText()} with different message value.`)));
-				});
-			}
-		});
-	}
-
-	protected visitStringLiteral(node: ts.StringLiteral): void {
-		this.checkStringLiteral(node);
-		super.visitStringLiteral(node);
-	}
-
-	private checkStringLiteral(node: ts.StringLiteral): void {
-		const text = node.getText();
-		const doubleQuoted = text.length >= 2 && text[0] === NoUnexternalizedStringsRuleWalker.DOUBLE_QUOTE && text[text.length - 1] === NoUnexternalizedStringsRuleWalker.DOUBLE_QUOTE;
-		const info = this.findDescribingParent(node);
-		// Ignore strings in import and export nodes.
-		if (info && info.isImport && doubleQuoted) {
-			const fix = [
-				Lint.Replacement.replaceFromTo(node.getStart(), 1, '\''),
-				Lint.Replacement.replaceFromTo(node.getStart() + text.length - 1, 1, '\''),
-			];
-			this.addFailureAtNode(
-				node,
-				NoUnexternalizedStringsRuleWalker.ImportFailureMessage,
-				fix
-			);
-			return;
-		}
-		const callInfo = info ? info.callInfo : null;
-		const functionName = callInfo ? callInfo.callExpression.expression.getText() : null;
-		if (functionName && this.ignores[functionName]) {
-			return;
-		}
-
-		if (doubleQuoted && (!callInfo || callInfo.argIndex === -1 || !this.signatures[functionName!])) {
-			const s = node.getText();
-			const fix = [
-				Lint.Replacement.replaceFromTo(node.getStart(), node.getWidth(), `nls.localize('KEY-${s.substring(1, s.length - 1)}', ${s})`),
-			];
-			this.addFailure(this.createFailure(node.getStart(), node.getWidth(), `Unexternalized string found: ${node.getText()}`, fix));
-			return;
-		}
-		// We have a single quoted string outside a localize function name.
-		if (!doubleQuoted && !this.signatures[functionName!]) {
-			return;
-		}
-		// We have a string that is a direct argument into the localize call.
-		const keyArg: ts.Expression | null = callInfo && callInfo.argIndex === this.keyIndex
-			? callInfo.callExpression.arguments[this.keyIndex]
-			: null;
-		if (keyArg) {
-			if (isStringLiteral(keyArg)) {
-				this.recordKey(keyArg, this.messageIndex && callInfo ? callInfo.callExpression.arguments[this.messageIndex] : undefined);
-			} else if (isObjectLiteral(keyArg)) {
-				for (const property of keyArg.properties) {
-					if (isPropertyAssignment(property)) {
-						const name = property.name.getText();
-						if (name === 'key') {
-							const initializer = property.initializer;
-							if (isStringLiteral(initializer)) {
-								this.recordKey(initializer, this.messageIndex && callInfo ? callInfo.callExpression.arguments[this.messageIndex] : undefined);
-							}
-							break;
-						}
-					}
-				}
-			}
-		}
-
-		const messageArg = callInfo!.callExpression.arguments[this.messageIndex!];
-
-		if (messageArg && messageArg.kind !== ts.SyntaxKind.StringLiteral) {
-			this.addFailure(this.createFailure(
-				messageArg.getStart(), messageArg.getWidth(),
-				`Message argument to '${callInfo!.callExpression.expression.getText()}' must be a string literal.`));
-			return;
-		}
-	}
-
-	private recordKey(keyNode: ts.StringLiteral, messageNode: ts.Node | undefined) {
-		const text = keyNode.getText();
-		// We have an empty key
-		if (text.match(/(['"]) *\1/)) {
-			if (messageNode) {
-				this.addFailureAtNode(keyNode, `Key is empty for message: ${messageNode.getText()}`);
-			} else {
-				this.addFailureAtNode(keyNode, `Key is empty.`);
-			}
-			return;
-		}
-		let occurrences: KeyMessagePair[] = this.usedKeys[text];
-		if (!occurrences) {
-			occurrences = [];
-			this.usedKeys[text] = occurrences;
-		}
-		if (messageNode) {
-			if (occurrences.some(pair => pair.message ? pair.message.getText() === messageNode.getText() : false)) {
-				return;
-			}
-		}
-		occurrences.push({ key: keyNode, message: messageNode });
-	}
-
-	private findDescribingParent(node: ts.Node): { callInfo?: { callExpression: ts.CallExpression, argIndex: number }, isImport?: boolean; } | null {
-		let parent: ts.Node;
-		while ((parent = node.parent)) {
-			const kind = parent.kind;
-			if (kind === ts.SyntaxKind.CallExpression) {
-				const callExpression = parent as ts.CallExpression;
-				return { callInfo: { callExpression: callExpression, argIndex: callExpression.arguments.indexOf(<any>node) } };
-			} else if (kind === ts.SyntaxKind.ImportEqualsDeclaration || kind === ts.SyntaxKind.ImportDeclaration || kind === ts.SyntaxKind.ExportDeclaration) {
-				return { isImport: true };
-			} else if (kind === ts.SyntaxKind.VariableDeclaration || kind === ts.SyntaxKind.FunctionDeclaration || kind === ts.SyntaxKind.PropertyDeclaration
-				|| kind === ts.SyntaxKind.MethodDeclaration || kind === ts.SyntaxKind.VariableDeclarationList || kind === ts.SyntaxKind.InterfaceDeclaration
-				|| kind === ts.SyntaxKind.ClassDeclaration || kind === ts.SyntaxKind.EnumDeclaration || kind === ts.SyntaxKind.ModuleDeclaration
-				|| kind === ts.SyntaxKind.TypeAliasDeclaration || kind === ts.SyntaxKind.SourceFile) {
-				return null;
-			}
-			node = parent;
-		}
-		return null;
-	}
-}

build/lib/tslint/translationRemindRule.js

@@ -1,62 +0,0 @@
-"use strict";
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-Object.defineProperty(exports, "__esModule", { value: true });
-const Lint = require("tslint");
-const fs = require("fs");
-class Rule extends Lint.Rules.AbstractRule {
-    apply(sourceFile) {
-        return this.applyWithWalker(new TranslationRemindRuleWalker(sourceFile, this.getOptions()));
-    }
-}
-exports.Rule = Rule;
-class TranslationRemindRuleWalker extends Lint.RuleWalker {
-    constructor(file, opts) {
-        super(file, opts);
-    }
-    visitImportDeclaration(node) {
-        const declaration = node.moduleSpecifier.getText();
-        if (declaration !== `'${TranslationRemindRuleWalker.NLS_MODULE}'`) {
-            return;
-        }
-        this.visitImportLikeDeclaration(node);
-    }
-    visitImportEqualsDeclaration(node) {
-        const reference = node.moduleReference.getText();
-        if (reference !== `require('${TranslationRemindRuleWalker.NLS_MODULE}')`) {
-            return;
-        }
-        this.visitImportLikeDeclaration(node);
-    }
-    visitImportLikeDeclaration(node) {
-        const currentFile = node.getSourceFile().fileName;
-        const matchService = currentFile.match(/vs\/workbench\/services\/\w+/);
-        const matchPart = currentFile.match(/vs\/workbench\/contrib\/\w+/);
-        if (!matchService && !matchPart) {
-            return;
-        }
-        const resource = matchService ? matchService[0] : matchPart[0];
-        let resourceDefined = false;
-        let json;
-        try {
-            json = fs.readFileSync('./build/lib/i18n.resources.json', 'utf8');
-        }
-        catch (e) {
-            console.error('[translation-remind rule]: File with resources to pull from Transifex was not found. Aborting translation resource check for newly defined workbench part/service.');
-            return;
-        }
-        const workbenchResources = JSON.parse(json).workbench;
-        workbenchResources.forEach((existingResource) => {
-            if (existingResource.name === resource) {
-                resourceDefined = true;
-                return;
-            }
-        });
-        if (!resourceDefined) {
-            this.addFailureAtNode(node, `Please add '${resource}' to ./build/lib/i18n.resources.json file to use translations here.`);
-        }
-    }
-}
-TranslationRemindRuleWalker.NLS_MODULE = 'vs/nls';

build/lib/tslint/translationRemindRule.ts

@@ -1,73 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as ts from 'typescript';
-import * as Lint from 'tslint';
-import * as fs from 'fs';
-
-export class Rule extends Lint.Rules.AbstractRule {
-	public apply(sourceFile: ts.SourceFile): Lint.RuleFailure[] {
-		return this.applyWithWalker(new TranslationRemindRuleWalker(sourceFile, this.getOptions()));
-	}
-}
-
-class TranslationRemindRuleWalker extends Lint.RuleWalker {
-
-	private static NLS_MODULE: string = 'vs/nls';
-
-	constructor(file: ts.SourceFile, opts: Lint.IOptions) {
-		super(file, opts);
-	}
-
-	protected visitImportDeclaration(node: ts.ImportDeclaration): void {
-		const declaration = node.moduleSpecifier.getText();
-		if (declaration !== `'${TranslationRemindRuleWalker.NLS_MODULE}'`) {
-			return;
-		}
-
-		this.visitImportLikeDeclaration(node);
-	}
-
-	protected visitImportEqualsDeclaration(node: ts.ImportEqualsDeclaration): void {
-		const reference = node.moduleReference.getText();
-		if (reference !== `require('${TranslationRemindRuleWalker.NLS_MODULE}')`) {
-			return;
-		}
-
-		this.visitImportLikeDeclaration(node);
-	}
-
-	private visitImportLikeDeclaration(node: ts.ImportDeclaration | ts.ImportEqualsDeclaration) {
-		const currentFile = node.getSourceFile().fileName;
-		const matchService = currentFile.match(/vs\/workbench\/services\/\w+/);
-		const matchPart = currentFile.match(/vs\/workbench\/contrib\/\w+/);
-		if (!matchService && !matchPart) {
-			return;
-		}
-
-		const resource = matchService ? matchService[0] : matchPart![0];
-		let resourceDefined = false;
-
-		let json;
-		try {
-			json = fs.readFileSync('./build/lib/i18n.resources.json', 'utf8');
-		} catch (e) {
-			console.error('[translation-remind rule]: File with resources to pull from Transifex was not found. Aborting translation resource check for newly defined workbench part/service.');
-			return;
-		}
-		const workbenchResources = JSON.parse(json).workbench;
-
-		workbenchResources.forEach((existingResource: any) => {
-			if (existingResource.name === resource) {
-				resourceDefined = true;
-				return;
-			}
-		});
-
-		if (!resourceDefined) {
-			this.addFailureAtNode(node, `Please add '${resource}' to ./build/lib/i18n.resources.json file to use translations here.`);
-		}
-	}
-}

build/monaco/api.js

@@ -9,7 +9,7 @@ const ts = require("typescript");
 const path = require("path");
 const fancyLog = require("fancy-log");
 const ansiColors = require("ansi-colors");
-const dtsv = '2';
+const dtsv = '3';
 const tsfmt = require('../../tsfmt.json');
 const SRC = path.join(__dirname, '../../src');
 exports.RECIPE_PATH = path.join(__dirname, './monaco.d.ts.recipe');
@@ -148,12 +148,44 @@ function getMassagedTopLevelDeclarationText(sourceFile, declaration, importName,
             }
         });
     }
+    else if (declaration.kind === ts.SyntaxKind.VariableStatement) {
+        const jsDoc = result.substr(0, declaration.getLeadingTriviaWidth(sourceFile));
+        if (jsDoc.indexOf('@monacodtsreplace') >= 0) {
+            const jsDocLines = jsDoc.split(/\r\n|\r|\n/);
+            let directives = [];
+            for (const jsDocLine of jsDocLines) {
+                const m = jsDocLine.match(/^\s*\* \/([^/]+)\/([^/]+)\/$/);
+                if (m) {
+                    directives.push([new RegExp(m[1], 'g'), m[2]]);
+                }
+            }
+            // remove the jsdoc
+            result = result.substr(jsDoc.length);
+            if (directives.length > 0) {
+                // apply replace directives
+                const replacer = createReplacerFromDirectives(directives);
+                result = replacer(result);
+            }
+        }
+    }
     result = result.replace(/export default /g, 'export ');
     result = result.replace(/export declare /g, 'export ');
     result = result.replace(/declare /g, '');
+    let lines = result.split(/\r\n|\r|\n/);
+    for (let i = 0; i < lines.length; i++) {
+        if (/\s*\*/.test(lines[i])) {
+            // very likely a comment
+            continue;
+        }
+        lines[i] = lines[i].replace(/"/g, '\'');
+    }
+    result = lines.join('\n');
     if (declaration.kind === ts.SyntaxKind.EnumDeclaration) {
         result = result.replace(/const enum/, 'enum');
-        enums.push(result);
+        enums.push({
+            enumName: declaration.name.getText(sourceFile),
+            text: result
+        });
     }
     return result;
 }
@@ -277,6 +309,14 @@ function format(text, endl) {
         return result;
     }
 }
+function createReplacerFromDirectives(directives) {
+    return (str) => {
+        for (let i = 0; i < directives.length; i++) {
+            str = str.replace(directives[i][0], directives[i][1]);
+        }
+        return str;
+    };
+}
 function createReplacer(data) {
     data = data || '';
     let rawDirectives = data.split(';');
@@ -292,12 +332,7 @@ function createReplacer(data) {
         findStr = '\\b' + findStr + '\\b';
         directives.push([new RegExp(findStr, 'g'), replaceStr]);
     });
-    return (str) => {
-        for (let i = 0; i < directives.length; i++) {
-            str = str.replace(directives[i][0], directives[i][1]);
-        }
-        return str;
-    };
+    return createReplacerFromDirectives(directives);
 }
 function generateDeclarationFile(recipe, sourceFileGetter) {
     const endl = /\r\n/.test(recipe) ? '\r\n' : '\n';
@@ -415,6 +450,15 @@ function generateDeclarationFile(recipe, sourceFileGetter) {
     resultTxt = resultTxt.split(/\r\n|\n|\r/).join(endl);
     resultTxt = format(resultTxt, endl);
     resultTxt = resultTxt.split(/\r\n|\n|\r/).join(endl);
+    enums.sort((e1, e2) => {
+        if (e1.enumName < e2.enumName) {
+            return -1;
+        }
+        if (e1.enumName > e2.enumName) {
+            return 1;
+        }
+        return 0;
+    });
     let resultEnums = [
         '/*---------------------------------------------------------------------------------------------',
         ' *  Copyright (c) Microsoft Corporation. All rights reserved.',
@@ -423,7 +467,7 @@ function generateDeclarationFile(recipe, sourceFileGetter) {
         '',
         '// THIS IS A GENERATED FILE. DO NOT EDIT DIRECTLY.',
         ''
-    ].concat(enums).join(endl);
+    ].concat(enums.map(e => e.text)).join(endl);
     resultEnums = resultEnums.split(/\r\n|\n|\r/).join(endl);
     resultEnums = format(resultEnums, endl);
     resultEnums = resultEnums.split(/\r\n|\n|\r/).join(endl);

build/monaco/api.ts

@@ -9,7 +9,7 @@ import * as path from 'path';
 import * as fancyLog from 'fancy-log';
 import * as ansiColors from 'ansi-colors';
 
-const dtsv = '2';
+const dtsv = '3';
 
 const tsfmt = require('../../tsfmt.json');
 
@@ -138,7 +138,7 @@ function isDefaultExport(declaration: ts.InterfaceDeclaration | ts.ClassDeclarat
 	);
 }
 
-function getMassagedTopLevelDeclarationText(sourceFile: ts.SourceFile, declaration: TSTopLevelDeclare, importName: string, usage: string[], enums: string[]): string {
+function getMassagedTopLevelDeclarationText(sourceFile: ts.SourceFile, declaration: TSTopLevelDeclare, importName: string, usage: string[], enums: IEnumEntry[]): string {
 	let result = getNodeText(sourceFile, declaration);
 	if (declaration.kind === ts.SyntaxKind.InterfaceDeclaration || declaration.kind === ts.SyntaxKind.ClassDeclaration) {
 		let interfaceDeclaration = <ts.InterfaceDeclaration | ts.ClassDeclaration>declaration;
@@ -177,14 +177,45 @@ function getMassagedTopLevelDeclarationText(sourceFile: ts.SourceFile, declarati
 				// life..
 			}
 		});
+	} else if (declaration.kind === ts.SyntaxKind.VariableStatement) {
+		const jsDoc = result.substr(0, declaration.getLeadingTriviaWidth(sourceFile));
+		if (jsDoc.indexOf('@monacodtsreplace') >= 0) {
+			const jsDocLines = jsDoc.split(/\r\n|\r|\n/);
+			let directives: [RegExp, string][] = [];
+			for (const jsDocLine of jsDocLines) {
+				const m = jsDocLine.match(/^\s*\* \/([^/]+)\/([^/]+)\/$/);
+				if (m) {
+					directives.push([new RegExp(m[1], 'g'), m[2]]);
+				}
+			}
+			// remove the jsdoc
+			result = result.substr(jsDoc.length);
+			if (directives.length > 0) {
+				// apply replace directives
+				const replacer = createReplacerFromDirectives(directives);
+				result = replacer(result);
+			}
+		}
 	}
 	result = result.replace(/export default /g, 'export ');
 	result = result.replace(/export declare /g, 'export ');
 	result = result.replace(/declare /g, '');
+	let lines = result.split(/\r\n|\r|\n/);
+	for (let i = 0; i < lines.length; i++) {
+		if (/\s*\*/.test(lines[i])) {
+			// very likely a comment
+			continue;
+		}
+		lines[i] = lines[i].replace(/"/g, '\'');
+	}
+	result = lines.join('\n');
 
 	if (declaration.kind === ts.SyntaxKind.EnumDeclaration) {
 		result = result.replace(/const enum/, 'enum');
-		enums.push(result);
+		enums.push({
+			enumName: declaration.name.getText(sourceFile),
+			text: result
+		});
 	}
 
 	return result;
@@ -324,6 +355,15 @@ function format(text: string, endl: string): string {
 	}
 }
 
+function createReplacerFromDirectives(directives: [RegExp, string][]): (str: string) => string {
+	return (str: string) => {
+		for (let i = 0; i < directives.length; i++) {
+			str = str.replace(directives[i][0], directives[i][1]);
+		}
+		return str;
+	};
+}
+
 function createReplacer(data: string): (str: string) => string {
 	data = data || '';
 	let rawDirectives = data.split(';');
@@ -341,12 +381,7 @@ function createReplacer(data: string): (str: string) => string {
 		directives.push([new RegExp(findStr, 'g'), replaceStr]);
 	});
 
-	return (str: string) => {
-		for (let i = 0; i < directives.length; i++) {
-			str = str.replace(directives[i][0], directives[i][1]);
-		}
-		return str;
-	};
+	return createReplacerFromDirectives(directives);
 }
 
 interface ITempResult {
@@ -355,6 +390,11 @@ interface ITempResult {
 	enums: string;
 }
 
+interface IEnumEntry {
+	enumName: string;
+	text: string;
+}
+
 function generateDeclarationFile(recipe: string, sourceFileGetter: SourceFileGetter): ITempResult | null {
 	const endl = /\r\n/.test(recipe) ? '\r\n' : '\n';
 
@@ -376,7 +416,7 @@ function generateDeclarationFile(recipe: string, sourceFileGetter: SourceFileGet
 		return importName;
 	};
 
-	let enums: string[] = [];
+	let enums: IEnumEntry[] = [];
 	let version: string | null = null;
 
 	lines.forEach(line => {
@@ -492,6 +532,16 @@ function generateDeclarationFile(recipe: string, sourceFileGetter: SourceFileGet
 	resultTxt = format(resultTxt, endl);
 	resultTxt = resultTxt.split(/\r\n|\n|\r/).join(endl);
 
+	enums.sort((e1, e2) => {
+		if (e1.enumName < e2.enumName) {
+			return -1;
+		}
+		if (e1.enumName > e2.enumName) {
+			return 1;
+		}
+		return 0;
+	});
+
 	let resultEnums = [
 		'/*---------------------------------------------------------------------------------------------',
 		' *  Copyright (c) Microsoft Corporation. All rights reserved.',
@@ -500,7 +550,7 @@ function generateDeclarationFile(recipe: string, sourceFileGetter: SourceFileGet
 		'',
 		'// THIS IS A GENERATED FILE. DO NOT EDIT DIRECTLY.',
 		''
-	].concat(enums).join(endl);
+	].concat(enums.map(e => e.text)).join(endl);
 	resultEnums = resultEnums.split(/\r\n|\n|\r/).join(endl);
 	resultEnums = format(resultEnums, endl);
 	resultEnums = resultEnums.split(/\r\n|\n|\r/).join(endl);

build/monaco/monaco.d.ts.recipe

@@ -3,12 +3,18 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+declare let MonacoEnvironment: monaco.Environment | undefined;
+
 declare namespace monaco {
 
-	// THIS IS A GENERATED FILE. DO NOT EDIT DIRECTLY.
-
 	export type Thenable<T> = PromiseLike<T>;
 
+	export interface Environment {
+		baseUrl?: string;
+		getWorker?(workerId: string, label: string): Worker;
+		getWorkerUrl?(workerId: string, label: string): string;
+	}
+
 	export interface IDisposable {
 		dispose(): void;
 	}
@@ -48,7 +54,7 @@ declare namespace monaco.editor {
 #include(vs/editor/standalone/common/standaloneThemeService): BuiltinTheme, IStandaloneThemeData, IColors
 #include(vs/editor/common/modes/supports/tokenization): ITokenThemeRule
 #include(vs/editor/common/services/webWorker): MonacoWebWorker, IWebWorkerOptions
-#include(vs/editor/standalone/browser/standaloneCodeEditor): IActionDescriptor, IStandaloneEditorConstructionOptions, IDiffEditorConstructionOptions, IStandaloneCodeEditor, IStandaloneDiffEditor
+#include(vs/editor/standalone/browser/standaloneCodeEditor): IActionDescriptor, IGlobalEditorOptions, IStandaloneEditorConstructionOptions, IDiffEditorConstructionOptions, IStandaloneCodeEditor, IStandaloneDiffEditor
 export interface ICommandHandler {
 	(...args: any[]): void;
 }
@@ -88,4 +94,4 @@ declare namespace monaco.worker {
 
 }
 
-//dtsv=2
+//dtsv=3

build/monaco/package.json

@@ -1,7 +1,7 @@
 {
   "name": "monaco-editor-core",
   "private": true,
-  "version": "0.18.0",
+  "version": "0.19.2",
   "description": "A browser based code editor",
   "author": "Microsoft Corporation",
   "license": "MIT",

build/package.json

@@ -6,6 +6,7 @@
     "@types/ansi-colors": "^3.2.0",
     "@types/azure": "0.9.19",
     "@types/debounce": "^1.0.0",
+    "@types/eslint": "4.16.1",
     "@types/fancy-log": "^1.3.0",
     "@types/glob": "^7.1.1",
     "@types/gulp": "^4.0.5",
@@ -28,6 +29,8 @@
     "@types/through2": "^2.0.34",
     "@types/underscore": "^1.8.9",
     "@types/xml2js": "0.0.33",
+    "@typescript-eslint/experimental-utils": "~2.13.0",
+    "@typescript-eslint/parser": "^2.12.0",
     "applicationinsights": "1.0.8",
     "azure-storage": "^2.1.0",
     "github-releases": "^0.4.1",
@@ -36,11 +39,11 @@
     "gulp-uglify": "^3.0.0",
     "iconv-lite": "0.4.23",
     "mime": "^1.3.4",
+    "minimatch": "3.0.4",
     "minimist": "^1.2.0",
     "request": "^2.85.0",
     "terser": "4.3.8",
-    "tslint": "^5.9.1",
-    "typescript": "3.7.2",
+    "typescript": "3.8.0-dev.20200128",
     "vsce": "1.48.0",
     "vscode-telemetry-extractor": "^1.5.4",
     "xml2js": "^0.4.17"

build/tslint.json

@@ -1,14 +0,0 @@
-{
-	"rules": {
-		"no-unused-expression": true,
-		"no-duplicate-variable": true,
-		"curly": true,
-		"class-name": true,
-		"semicolon": [
-			true,
-			"always"
-		],
-		"triple-equals": true
-	},
-	"defaultSeverity": "warning"
-}

build/win32/code.iss

@@ -970,10 +970,10 @@ Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\*\shell\{#RegValueNam
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\directory\shell\{#RegValueName}"; ValueType: expandsz; ValueName: ""; ValueData: "{cm:OpenWithCodeContextMenu,{#ShellNameShort}}"; Tasks: addcontextmenufolders; Flags: uninsdeletekey
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\directory\shell\{#RegValueName}"; ValueType: expandsz; ValueName: "Icon"; ValueData: "{app}\{#ExeBasename}.exe"; Tasks: addcontextmenufolders
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\directory\shell\{#RegValueName}\command"; ValueType: expandsz; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%V"""; Tasks: addcontextmenufolders
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\directory\background\shell\{#RegValueName}"; ValueType: expandsz; ValueName: ""; ValueData: "Open w&ith {#ShellNameShort}"; Tasks: addcontextmenufolders; Flags: uninsdeletekey
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\directory\background\shell\{#RegValueName}"; ValueType: expandsz; ValueName: ""; ValueData: "{cm:OpenWithCodeContextMenu,{#ShellNameShort}}"; Tasks: addcontextmenufolders; Flags: uninsdeletekey
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\directory\background\shell\{#RegValueName}"; ValueType: expandsz; ValueName: "Icon"; ValueData: "{app}\{#ExeBasename}.exe"; Tasks: addcontextmenufolders
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\directory\background\shell\{#RegValueName}\command"; ValueType: expandsz; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%V"""; Tasks: addcontextmenufolders
-Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\Drive\shell\{#RegValueName}"; ValueType: expandsz; ValueName: ""; ValueData: "Open w&ith {#ShellNameShort}"; Tasks: addcontextmenufolders; Flags: uninsdeletekey
+Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\Drive\shell\{#RegValueName}"; ValueType: expandsz; ValueName: ""; ValueData: "{cm:OpenWithCodeContextMenu,{#ShellNameShort}}"; Tasks: addcontextmenufolders; Flags: uninsdeletekey
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\Drive\shell\{#RegValueName}"; ValueType: expandsz; ValueName: "Icon"; ValueData: "{app}\{#ExeBasename}.exe"; Tasks: addcontextmenufolders
 Root: {#SoftwareClassesRootKey}; Subkey: "Software\Classes\Drive\shell\{#RegValueName}\command"; ValueType: expandsz; ValueName: ""; ValueData: """{app}\{#ExeBasename}.exe"" ""%V"""; Tasks: addcontextmenufolders
 

build/win32/i18n/messages.en.isl

@@ -6,4 +6,4 @@ AddToPath=Add to PATH (requires shell restart)
 RunAfter=Run %1 after installation
 Other=Other:
 SourceFile=%1 Source File
-OpenWithCodeContextMenu=Open with %1
+OpenWithCodeContextMenu=Open w&ith %1

build/yarn.lock

@@ -90,6 +90,24 @@
   resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.5.tgz#b14efa8852b7768d898906613c23f688713e02cd"
   integrity sha512-Q1y515GcOdTHgagaVFhHnIFQ38ygs/kmxdNpvpou+raI9UO3YZcHDngBSYKQklcKlvA7iuQlmIKbzvmxcOE9CQ==
 
+"@types/eslint-visitor-keys@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#1ee30d79544ca84d68d4b3cdb0af4f205663dd2d"
+  integrity sha512-OCutwjDZ4aFS6PB1UZ988C4YgwlBHJd6wCeQqaLdmadZ/7e+w79+hbMUFC1QXDNCmdyoRfAFdm0RypzwR+Qpag==
+
+"@types/eslint@4.16.1":
+  version "4.16.1"
+  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-4.16.1.tgz#19730c9fcb66b6e44742d12b27a603fabfeb2f49"
+  integrity sha512-lRUXQAULl5geixTiP2K0iYvMUbCkEnuOwvLGjwff12I4ECxoW5QaWML5UUOZ1CvpQLILkddBdMPMZz4ByQizsg==
+  dependencies:
+    "@types/estree" "*"
+    "@types/json-schema" "*"
+
+"@types/estree@*":
+  version "0.0.41"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.41.tgz#fd90754150b57432b72bf560530500597ff04421"
+  integrity sha512-rIAmXyJlqw4KEBO7+u9gxZZSQHaCNnIzYrnNmYVpgfJhxTqO0brCX0SYpqUTkVI5mwwUwzmtspLBGBKroMeynA==
+
 "@types/events@*":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@types/events/-/events-1.2.0.tgz#81a6731ce4df43619e5c8c945383b3e62a89ea86"
@@ -184,6 +202,11 @@
   resolved "https://registry.yarnpkg.com/@types/js-beautify/-/js-beautify-1.8.0.tgz#0369d3d0e1f35a6aec07cb4da2ee2bcda111367c"
   integrity sha512-/siF86XrwDKLuHe8l7h6NhrAWgLdgqbxmjZv9NvGWmgYRZoTipkjKiWb0SQHy/jcR+ee0GvbG6uGd+LEBMGNvA==
 
+"@types/json-schema@*", "@types/json-schema@^7.0.3":
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.4.tgz#38fd73ddfd9b55abb1e1b2ed578cb55bd7b7d339"
+  integrity sha512-8+KAKzEvSUdeo+kmqnKrqgeE+LcA0tjYWFY7RPProVYwnqDjukzO+3b6dLD56rYX5TdWejnEOLJYOIeh4CXKuA==
+
 "@types/mime@0.0.29":
   version "0.0.29"
   resolved "https://registry.yarnpkg.com/@types/mime/-/mime-0.0.29.tgz#fbcfd330573b912ef59eeee14602bface630754b"
@@ -312,6 +335,60 @@
   resolved "https://registry.yarnpkg.com/@types/xml2js/-/xml2js-0.0.33.tgz#20c5dd6460245284d64a55690015b95e409fb7de"
   integrity sha1-IMXdZGAkUoTWSlVpABW5XkCft94=
 
+"@typescript-eslint/experimental-utils@2.14.0":
+  version "2.14.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.14.0.tgz#e9179fa3c44e00b3106b85d7b69342901fb43e3b"
+  integrity sha512-KcyKS7G6IWnIgl3ZpyxyBCxhkBPV+0a5Jjy2g5HxlrbG2ZLQNFeneIBVXdaBCYOVjvGmGGFKom1kgiAY75SDeQ==
+  dependencies:
+    "@types/json-schema" "^7.0.3"
+    "@typescript-eslint/typescript-estree" "2.14.0"
+    eslint-scope "^5.0.0"
+
+"@typescript-eslint/experimental-utils@~2.13.0":
+  version "2.13.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.13.0.tgz#958614faa6f77599ee2b241740e0ea402482533d"
+  integrity sha512-+Hss3clwa6aNiC8ZjA45wEm4FutDV5HsVXPl/rDug1THq6gEtOYRGLqS3JlTk7mSnL5TbJz0LpEbzbPnKvY6sw==
+  dependencies:
+    "@types/json-schema" "^7.0.3"
+    "@typescript-eslint/typescript-estree" "2.13.0"
+    eslint-scope "^5.0.0"
+
+"@typescript-eslint/parser@^2.12.0":
+  version "2.14.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.14.0.tgz#30fa0523d86d74172a5e32274558404ba4262cd6"
+  integrity sha512-haS+8D35fUydIs+zdSf4BxpOartb/DjrZ2IxQ5sR8zyGfd77uT9ZJZYF8+I0WPhzqHmfafUBx8MYpcp8pfaoSA==
+  dependencies:
+    "@types/eslint-visitor-keys" "^1.0.0"
+    "@typescript-eslint/experimental-utils" "2.14.0"
+    "@typescript-eslint/typescript-estree" "2.14.0"
+    eslint-visitor-keys "^1.1.0"
+
+"@typescript-eslint/typescript-estree@2.13.0":
+  version "2.13.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.13.0.tgz#a2e746867da772c857c13853219fced10d2566bc"
+  integrity sha512-t21Mg5cc8T3ADEUGwDisHLIubgXKjuNRbkpzDMLb7/JMmgCe/gHM9FaaujokLey+gwTuLF5ndSQ7/EfQqrQx4g==
+  dependencies:
+    debug "^4.1.1"
+    eslint-visitor-keys "^1.1.0"
+    glob "^7.1.6"
+    is-glob "^4.0.1"
+    lodash.unescape "4.0.1"
+    semver "^6.3.0"
+    tsutils "^3.17.1"
+
+"@typescript-eslint/typescript-estree@2.14.0":
+  version "2.14.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.14.0.tgz#c67698acdc14547f095eeefe908958d93e1a648d"
+  integrity sha512-pnLpUcMNG7GfFFfNQbEX6f1aPa5fMnH2G9By+A1yovYI4VIOK2DzkaRuUlIkbagpAcrxQHLqovI1YWqEcXyRnA==
+  dependencies:
+    debug "^4.1.1"
+    eslint-visitor-keys "^1.1.0"
+    glob "^7.1.6"
+    is-glob "^4.0.1"
+    lodash.unescape "4.0.1"
+    semver "^6.3.0"
+    tsutils "^3.17.1"
+
 acorn@4.X:
   version "4.0.13"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"
@@ -352,13 +429,6 @@ ansi-styles@^2.2.1:
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
   integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
 
-ansi-styles@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
-  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
-  dependencies:
-    color-convert "^1.9.0"
-
 ansi-wrap@0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf"
@@ -482,15 +552,6 @@ azure-storage@^2.1.0:
     xml2js "0.2.7"
     xmlbuilder "0.4.3"
 
-babel-code-frame@^6.22.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
-  integrity sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=
-  dependencies:
-    chalk "^1.1.3"
-    esutils "^2.0.2"
-    js-tokens "^3.0.2"
-
 balanced-match@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
@@ -564,17 +625,12 @@ buffer-from@^1.0.0:
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
   integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
 
-builtin-modules@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
-  integrity sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=
-
 caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
   integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
 
-chalk@^1.0.0, chalk@^1.1.3:
+chalk@^1.0.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
   integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
@@ -585,15 +641,6 @@ chalk@^1.0.0, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.3.0:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
-  integrity sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==
-  dependencies:
-    ansi-styles "^3.2.1"
-    escape-string-regexp "^1.0.5"
-    supports-color "^5.3.0"
-
 cheerio@^1.0.0-rc.1:
   version "1.0.0-rc.2"
   resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.2.tgz#4b9f53a81b27e4d5dac31c0ffd0cfa03cc6830db"
@@ -626,18 +673,6 @@ code-block-writer@9.4.1:
   resolved "https://registry.yarnpkg.com/code-block-writer/-/code-block-writer-9.4.1.tgz#1448fca79dfc7a3649000f4c85be6bc770604c4c"
   integrity sha512-LHAB+DL4YZDcwK8y/kAxZ0Lf/ncwLh/Ux4cTVWbPwIdrf1gPxXiPcwpz8r8/KqXu1aD+Raz46EOxDjFlbyO6bA==
 
-color-convert@^1.9.0:
-  version "1.9.3"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
-  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
-  dependencies:
-    color-name "1.1.3"
-
-color-name@1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
-  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
-
 color-support@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
@@ -672,16 +707,16 @@ command-line-args@^5.1.1:
     lodash.camelcase "^4.3.0"
     typical "^4.0.0"
 
-commander@^2.12.1, commander@^2.8.1:
-  version "2.19.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
-  integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==
-
 commander@^2.20.0, commander@~2.20.0:
   version "2.20.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"
   integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==
 
+commander@^2.8.1:
+  version "2.19.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
+  integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==
+
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
@@ -816,11 +851,6 @@ diagnostic-channel@0.2.0:
   dependencies:
     semver "^5.3.0"
 
-diff@^3.2.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
-  integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
-
 dir-glob@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
@@ -900,20 +930,35 @@ entities@^1.1.1, entities@~1.1.1:
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
   integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
 
-escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
+escape-string-regexp@^1.0.2:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
 
-esprima@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
-  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
+eslint-scope@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.0.0.tgz#e87c8887c73e8d1ec84f1ca591645c358bfc8fb9"
+  integrity sha512-oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw==
+  dependencies:
+    esrecurse "^4.1.0"
+    estraverse "^4.1.1"
 
-esutils@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
-  integrity sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=
+eslint-visitor-keys@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2"
+  integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==
+
+esrecurse@^4.1.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"
+  integrity sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==
+  dependencies:
+    estraverse "^4.1.0"
+
+estraverse@^4.1.0, estraverse@^4.1.1:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
+  integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
 
 execa@^1.0.0:
   version "1.0.0"
@@ -1078,7 +1123,7 @@ glob-parent@^5.0.0:
   dependencies:
     is-glob "^4.0.1"
 
-glob@^7.0.6, glob@^7.1.1:
+glob@^7.0.6:
   version "7.1.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
   integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==
@@ -1102,6 +1147,18 @@ glob@^7.1.3:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+glob@^7.1.6:
+  version "7.1.6"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
+  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
 globby@^10.0.1:
   version "10.0.1"
   resolved "https://registry.yarnpkg.com/globby/-/globby-10.0.1.tgz#4782c34cb75dd683351335c5829cc3420e606b22"
@@ -1238,11 +1295,6 @@ has-ansi@^2.0.0:
   dependencies:
     ansi-regex "^2.0.0"
 
-has-flag@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
-  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
-
 has-gulplog@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/has-gulplog/-/has-gulplog-0.1.0.tgz#6414c82913697da51590397dafb12f22967811ce"
@@ -1451,19 +1503,6 @@ isstream@~0.1.2:
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
   integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
 
-js-tokens@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
-  integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=
-
-js-yaml@^3.7.0:
-  version "3.12.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1"
-  integrity sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^4.0.0"
-
 jsbn@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
@@ -1641,6 +1680,11 @@ lodash.templatesettings@^3.0.0:
     lodash._reinterpolate "^3.0.0"
     lodash.escape "^3.0.0"
 
+lodash.unescape@4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/lodash.unescape/-/lodash.unescape-4.0.1.tgz#bf2249886ce514cda112fae9218cdc065211fc9c"
+  integrity sha1-vyJJiGzlFM2hEvrpIYzcBlIR/Jw=
+
 lodash@^4.15.0, lodash@^4.17.10:
   version "4.17.11"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
@@ -1900,11 +1944,6 @@ path-key@^2.0.0, path-key@^2.0.1:
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
   integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
 
-path-parse@^1.0.5:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
-  integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
-
 path-type@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
@@ -2103,13 +2142,6 @@ resolve-url@^0.2.1:
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
-resolve@^1.3.2:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.8.1.tgz#82f1ec19a423ac1fbd080b0bab06ba36e84a7a26"
-  integrity sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==
-  dependencies:
-    path-parse "^1.0.5"
-
 reusify@^1.0.0:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
@@ -2165,6 +2197,11 @@ semver@^5.5.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
 
+semver@^6.3.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
+  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
+
 shebang-command@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
@@ -2301,13 +2338,6 @@ supports-color@^2.0.0:
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
   integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
 
-supports-color@^5.3.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
-  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
-  dependencies:
-    has-flag "^3.0.0"
-
 terser@*:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/terser/-/terser-4.2.1.tgz#1052cfe17576c66e7bc70fcc7119f22b155bdac1"
@@ -2381,7 +2411,7 @@ ts-morph@^3.1.3:
     multimatch "^4.0.0"
     typescript "^3.0.1"
 
-tslib@^1.8.0, tslib@^1.8.1:
+tslib@^1.8.1:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
   integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==
@@ -2391,28 +2421,10 @@ tslib@^1.9.3:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a"
   integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==
 
-tslint@^5.9.1:
-  version "5.11.0"
-  resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.11.0.tgz#98f30c02eae3cde7006201e4c33cb08b48581eed"
-  integrity sha1-mPMMAurjzecAYgHkwzywi0hYHu0=
-  dependencies:
-    babel-code-frame "^6.22.0"
-    builtin-modules "^1.1.1"
-    chalk "^2.3.0"
-    commander "^2.12.1"
-    diff "^3.2.0"
-    glob "^7.1.1"
-    js-yaml "^3.7.0"
-    minimatch "^3.0.4"
-    resolve "^1.3.2"
-    semver "^5.3.0"
-    tslib "^1.8.0"
-    tsutils "^2.27.2"
-
-tsutils@^2.27.2:
-  version "2.29.0"
-  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz#32b488501467acbedd4b85498673a0812aca0b99"
-  integrity sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==
+tsutils@^3.17.1:
+  version "3.17.1"
+  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.17.1.tgz#ed719917f11ca0dee586272b2ac49e015a2dd759"
+  integrity sha512-kzeQ5B8H3w60nFY2g8cJIuH7JDpsALXySGtwGJ0p2LSjLgay3NdIpqq5SoOBe46bKDW2iq25irHCr8wjomUS2g==
   dependencies:
     tslib "^1.8.1"
 
@@ -2441,10 +2453,10 @@ typed-rest-client@^0.9.0:
     tunnel "0.0.4"
     underscore "1.8.3"
 
-typescript@3.7.2:
-  version "3.7.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.2.tgz#27e489b95fa5909445e9fef5ee48d81697ad18fb"
-  integrity sha512-ml7V7JfiN2Xwvcer+XAf2csGO1bPBdRbFCkYBczNZggrBZ9c7G3riSUeJmqEU5uOtXNPMhE3n+R4FA/3YOAWOQ==
+typescript@3.8.0-dev.20200128:
+  version "3.8.0-dev.20200128"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.8.0-dev.20200128.tgz#4eedbd3547326f2e9cb826c4144800eb93c81866"
+  integrity sha512-tXJMyrE3xhLDzCN76wZhoV8S1AU5JH40DzrLBAZWfHOgH8X8mCHFwyJ8U6N929vBL78rHmEcowyioUr09/Xvjg==
 
 typescript@^3.0.1:
   version "3.5.3"

cgmanifest.json

@@ -6,7 +6,7 @@
 				"git": {
 					"name": "chromium",
 					"repositoryUrl": "https://chromium.googlesource.com/chromium/src",
-					"commitHash": "91f08db83c2ce8c722ddf0911ead8f7c473bedfa"
+					"commitHash": "e4745133a1d3745f066e068b8033c6a269b59caf"
 				}
 			},
 			"licenseDetail": [
@@ -40,7 +40,7 @@
 				"SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 			],
 			"isOnlyProductionDependency": true,
-			"version": "76.0.3809.146"
+			"version": "78.0.3904.130"
 		},
 		{
 			"component": {
@@ -48,11 +48,11 @@
 				"git": {
 					"name": "nodejs",
 					"repositoryUrl": "https://github.com/nodejs/node",
-					"commitHash": "64219741218aa87e259cf8257596073b8e747f0a"
+					"commitHash": "787378879acfb212ed4ff824bf9f767a24a5cb43a"
 				}
 			},
 			"isOnlyProductionDependency": true,
-			"version": "12.4.0"
+			"version": "12.8.1"
 		},
 		{
 			"component": {
@@ -60,12 +60,12 @@
 				"git": {
 					"name": "electron",
 					"repositoryUrl": "https://github.com/electron/electron",
-					"commitHash": "6f62f91822a80192cb711c604f1a8f1a176f328d"
+					"commitHash": "d17dfabfcba7bd0bc994b8dac5f5d2000bef572c"
 				}
 			},
 			"isOnlyProductionDependency": true,
 			"license": "MIT",
-			"version": "6.1.5"
+			"version": "7.1.11"
 		},
 		{
 			"component": {
@@ -98,7 +98,7 @@
 				"git": {
 					"name": "vscode-codicons",
 					"repositoryUrl": "https://github.com/microsoft/vscode-codicons",
-					"commitHash": "65d11e0839d0ce09faa1a159dc0b3c0bd1aa50be"
+					"commitHash": "f0caa623812a8ed5059516277675b4158d4c4867"
 				}
 			},
 			"license": "MIT and Creative Commons Attribution 4.0",

extensions/bat/language-configuration.json

@@ -11,12 +11,13 @@
 		["{", "}"],
 		["[", "]"],
 		["(", ")"],
-		["\"", "\""]
+		{ "open": "\"", "close": "\"", "notIn": ["string"] }
 	],
 	"surroundingPairs": [
 		["{", "}"],
 		["[", "]"],
 		["(", ")"],
+		["%", "%"],
 		["\"", "\""]
 	],
 	"folding": {

extensions/clojure/language-configuration.json

@@ -11,7 +11,7 @@
 		["{", "}"],
 		["[", "]"],
 		["(", ")"],
-		["\"", "\""]
+		{ "open": "\"", "close": "\"", "notIn": ["string"] }
 	],
 	"surroundingPairs": [
 		["{", "}"],
@@ -22,4 +22,4 @@
 	"folding": {
 		"offSide": true
 	}
-}
+}

extensions/clojure/test/colorize-results/test_clj.json

@@ -202,9 +202,9 @@
 		"t": "source.clojure meta.expression.clojure meta.definition.global.clojure constant.numeric.long.clojure",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
-			"light_plus": "constant.numeric: #09885A",
+			"light_plus": "constant.numeric: #098658",
 			"dark_vs": "constant.numeric: #B5CEA8",
-			"light_vs": "constant.numeric: #09885A",
+			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8"
 		}
 	},
@@ -235,9 +235,9 @@
 		"t": "source.clojure meta.vector.clojure constant.numeric.long.clojure",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
-			"light_plus": "constant.numeric: #09885A",
+			"light_plus": "constant.numeric: #098658",
 			"dark_vs": "constant.numeric: #B5CEA8",
-			"light_vs": "constant.numeric: #09885A",
+			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8"
 		}
 	},
@@ -257,9 +257,9 @@
 		"t": "source.clojure meta.vector.clojure constant.numeric.long.clojure",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
-			"light_plus": "constant.numeric: #09885A",
+			"light_plus": "constant.numeric: #098658",
 			"dark_vs": "constant.numeric: #B5CEA8",
-			"light_vs": "constant.numeric: #09885A",
+			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8"
 		}
 	},
@@ -279,9 +279,9 @@
 		"t": "source.clojure meta.vector.clojure constant.numeric.long.clojure",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
-			"light_plus": "constant.numeric: #09885A",
+			"light_plus": "constant.numeric: #098658",
 			"dark_vs": "constant.numeric: #B5CEA8",
-			"light_vs": "constant.numeric: #09885A",
+			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8"
 		}
 	},
@@ -345,9 +345,9 @@
 		"t": "source.clojure meta.vector.clojure constant.numeric.long.clojure",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
-			"light_plus": "constant.numeric: #09885A",
+			"light_plus": "constant.numeric: #098658",
 			"dark_vs": "constant.numeric: #B5CEA8",
-			"light_vs": "constant.numeric: #09885A",
+			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8"
 		}
 	},
@@ -466,9 +466,9 @@
 		"t": "source.clojure meta.map.clojure constant.numeric.long.clojure",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
-			"light_plus": "constant.numeric: #09885A",
+			"light_plus": "constant.numeric: #098658",
 			"dark_vs": "constant.numeric: #B5CEA8",
-			"light_vs": "constant.numeric: #09885A",
+			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8"
 		}
 	},
@@ -510,9 +510,9 @@
 		"t": "source.clojure meta.map.clojure constant.numeric.long.clojure",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
-			"light_plus": "constant.numeric: #09885A",
+			"light_plus": "constant.numeric: #098658",
 			"dark_vs": "constant.numeric: #B5CEA8",
-			"light_vs": "constant.numeric: #09885A",
+			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8"
 		}
 	},
@@ -620,9 +620,9 @@
 		"t": "source.clojure meta.quoted-expression.clojure constant.numeric.long.clojure",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
-			"light_plus": "constant.numeric: #09885A",
+			"light_plus": "constant.numeric: #098658",
 			"dark_vs": "constant.numeric: #B5CEA8",
-			"light_vs": "constant.numeric: #09885A",
+			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8"
 		}
 	},
@@ -642,9 +642,9 @@
 		"t": "source.clojure meta.quoted-expression.clojure constant.numeric.long.clojure",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
-			"light_plus": "constant.numeric: #09885A",
+			"light_plus": "constant.numeric: #098658",
 			"dark_vs": "constant.numeric: #B5CEA8",
-			"light_vs": "constant.numeric: #09885A",
+			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8"
 		}
 	},
@@ -664,9 +664,9 @@
 		"t": "source.clojure meta.quoted-expression.clojure constant.numeric.long.clojure",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
-			"light_plus": "constant.numeric: #09885A",
+			"light_plus": "constant.numeric: #098658",
 			"dark_vs": "constant.numeric: #B5CEA8",
-			"light_vs": "constant.numeric: #09885A",
+			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8"
 		}
 	},
@@ -1368,9 +1368,9 @@
 		"t": "source.clojure meta.quoted-expression.clojure constant.numeric.long.clojure",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
-			"light_plus": "constant.numeric: #09885A",
+			"light_plus": "constant.numeric: #098658",
 			"dark_vs": "constant.numeric: #B5CEA8",
-			"light_vs": "constant.numeric: #09885A",
+			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8"
 		}
 	},
@@ -1390,9 +1390,9 @@
 		"t": "source.clojure meta.quoted-expression.clojure constant.numeric.long.clojure",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
-			"light_plus": "constant.numeric: #09885A",
+			"light_plus": "constant.numeric: #098658",
 			"dark_vs": "constant.numeric: #B5CEA8",
-			"light_vs": "constant.numeric: #09885A",
+			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8"
 		}
 	},
@@ -1412,9 +1412,9 @@
 		"t": "source.clojure meta.quoted-expression.clojure constant.numeric.long.clojure",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
-			"light_plus": "constant.numeric: #09885A",
+			"light_plus": "constant.numeric: #098658",
 			"dark_vs": "constant.numeric: #B5CEA8",
-			"light_vs": "constant.numeric: #09885A",
+			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8"
 		}
 	},
@@ -1522,9 +1522,9 @@
 		"t": "source.clojure meta.expression.clojure meta.vector.clojure constant.numeric.long.clojure",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
-			"light_plus": "constant.numeric: #09885A",
+			"light_plus": "constant.numeric: #098658",
 			"dark_vs": "constant.numeric: #B5CEA8",
-			"light_vs": "constant.numeric: #09885A",
+			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8"
 		}
 	},
@@ -1566,9 +1566,9 @@
 		"t": "source.clojure meta.expression.clojure meta.vector.clojure constant.numeric.long.clojure",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
-			"light_plus": "constant.numeric: #09885A",
+			"light_plus": "constant.numeric: #098658",
 			"dark_vs": "constant.numeric: #B5CEA8",
-			"light_vs": "constant.numeric: #09885A",
+			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8"
 		}
 	},
@@ -1610,9 +1610,9 @@
 		"t": "source.clojure meta.expression.clojure meta.vector.clojure constant.numeric.long.clojure",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
-			"light_plus": "constant.numeric: #09885A",
+			"light_plus": "constant.numeric: #098658",
 			"dark_vs": "constant.numeric: #B5CEA8",
-			"light_vs": "constant.numeric: #09885A",
+			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8"
 		}
 	},
@@ -2567,9 +2567,9 @@
 		"t": "source.clojure meta.expression.clojure meta.definition.global.clojure meta.map.clojure constant.numeric.long.clojure",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
-			"light_plus": "constant.numeric: #09885A",
+			"light_plus": "constant.numeric: #098658",
 			"dark_vs": "constant.numeric: #B5CEA8",
-			"light_vs": "constant.numeric: #09885A",
+			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8"
 		}
 	},
@@ -2611,9 +2611,9 @@
 		"t": "source.clojure meta.expression.clojure meta.definition.global.clojure meta.map.clojure constant.numeric.long.clojure",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
-			"light_plus": "constant.numeric: #09885A",
+			"light_plus": "constant.numeric: #098658",
 			"dark_vs": "constant.numeric: #B5CEA8",
-			"light_vs": "constant.numeric: #09885A",
+			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8"
 		}
 	},
@@ -2721,9 +2721,9 @@
 		"t": "source.clojure meta.expression.clojure constant.numeric.long.clojure",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
-			"light_plus": "constant.numeric: #09885A",
+			"light_plus": "constant.numeric: #098658",
 			"dark_vs": "constant.numeric: #B5CEA8",
-			"light_vs": "constant.numeric: #09885A",
+			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8"
 		}
 	},
@@ -3007,9 +3007,9 @@
 		"t": "source.clojure meta.expression.clojure meta.definition.global.clojure meta.expression.clojure meta.map.clojure constant.numeric.long.clojure",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
-			"light_plus": "constant.numeric: #09885A",
+			"light_plus": "constant.numeric: #098658",
 			"dark_vs": "constant.numeric: #B5CEA8",
-			"light_vs": "constant.numeric: #09885A",
+			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8"
 		}
 	},
@@ -3321,4 +3321,4 @@
 			"hc_black": "comment: #7CA668"
 		}
 	}
-]
+]

extensions/coffeescript/language-configuration.json

@@ -12,8 +12,8 @@
 		["{", "}"],
 		["[", "]"],
 		["(", ")"],
-		["\"", "\""],
-		["'", "'"]
+		{ "open": "\"", "close": "\"", "notIn": ["string"] },
+		{ "open": "'", "close": "'", "notIn": ["string"] }
 	],
 	"surroundingPairs": [
 		["{", "}"],

extensions/coffeescript/test/colorize-results/test-regex_coffee.json

@@ -147,9 +147,9 @@
 		"t": "source.coffee constant.numeric.decimal.coffee",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
-			"light_plus": "constant.numeric: #09885A",
+			"light_plus": "constant.numeric: #098658",
 			"dark_vs": "constant.numeric: #B5CEA8",
-			"light_vs": "constant.numeric: #09885A",
+			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8"
 		}
 	},
@@ -191,9 +191,9 @@
 		"t": "source.coffee constant.numeric.decimal.coffee",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
-			"light_plus": "constant.numeric: #09885A",
+			"light_plus": "constant.numeric: #098658",
 			"dark_vs": "constant.numeric: #B5CEA8",
-			"light_vs": "constant.numeric: #09885A",
+			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8"
 		}
 	},
@@ -202,9 +202,9 @@
 		"t": "source.coffee constant.numeric.decimal.coffee",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
-			"light_plus": "constant.numeric: #09885A",
+			"light_plus": "constant.numeric: #098658",
 			"dark_vs": "constant.numeric: #B5CEA8",
-			"light_vs": "constant.numeric: #09885A",
+			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8"
 		}
 	},
@@ -224,9 +224,9 @@
 		"t": "source.coffee constant.numeric.decimal.coffee",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
-			"light_plus": "constant.numeric: #09885A",
+			"light_plus": "constant.numeric: #098658",
 			"dark_vs": "constant.numeric: #B5CEA8",
-			"light_vs": "constant.numeric: #09885A",
+			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8"
 		}
 	},
@@ -725,4 +725,4 @@
 			"hc_black": "string.regexp: #D16969"
 		}
 	}
-]
+]

extensions/coffeescript/test/colorize-results/test_coffee.json

@@ -1016,9 +1016,9 @@
 		"t": "source.coffee constant.numeric.decimal.coffee",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
-			"light_plus": "constant.numeric: #09885A",
+			"light_plus": "constant.numeric: #098658",
 			"dark_vs": "constant.numeric: #B5CEA8",
-			"light_vs": "constant.numeric: #09885A",
+			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8"
 		}
 	},
@@ -1038,9 +1038,9 @@
 		"t": "source.coffee constant.numeric.decimal.coffee",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
-			"light_plus": "constant.numeric: #09885A",
+			"light_plus": "constant.numeric: #098658",
 			"dark_vs": "constant.numeric: #B5CEA8",
-			"light_vs": "constant.numeric: #09885A",
+			"light_vs": "constant.numeric: #098658",
 			"hc_black": "constant.numeric: #B5CEA8"
 		}
 	},
@@ -1605,4 +1605,4 @@
 			"hc_black": "string.regexp: #D16969"
 		}
 	}
-]
+]

extensions/configuration-editing/package.json

@@ -88,6 +88,10 @@
         "fileMatch": "/.vscode/tasks.json",
         "url": "vscode://schemas/tasks"
       },
+      {
+        "fileMatch": "%APP_SETTINGS_HOME%/tasks.json",
+        "url": "vscode://schemas/tasks"
+      },
       {
         "fileMatch": "%APP_SETTINGS_HOME%/snippets/*.json",
         "url": "vscode://schemas/snippets"