Merge from vscode 6e53012 (microsoft#6844)

PejmanNik · Aug 21, 2019 · ecb80f1 · ecb80f1
1 parent 1f00249
commit ecb80f1
Show file tree

Hide file tree

Showing 221 changed files with 3,131 additions and 1,543 deletions.
diff --git a/build/gulpfile.hygiene.js b/build/gulpfile.hygiene.js
@@ -50,6 +50,7 @@ const indentationFilter = [
 	'!src/vs/css.js',
 	'!src/vs/css.build.js',
 	'!src/vs/loader.js',
+	'!src/vs/base/common/insane/insane.js',
 	'!src/vs/base/common/marked/marked.js',
 	'!src/vs/base/node/terminateProcess.sh',
 	'!src/vs/base/node/cpuUsage.sh',
@@ -171,18 +172,16 @@ const eslintFilter = [
 	'!src/vs/nls.js',
 	'!src/vs/css.build.js',
 	'!src/vs/nls.build.js',
+	'!src/**/insane.js',
 	'!src/**/marked.js',
 	'!**/test/**'
 ];
 
-const tslintFilter = [
-	'src/**/*.ts',
-	'test/**/*.ts',
-	'extensions/**/*.ts',
+const tslintBaseFilter = [
 	'!**/fixtures/**',
 	'!**/typings/**',
 	'!**/node_modules/**',
-	'!extensions/typescript/test/colorize-fixtures/**',
+	'!extensions/typescript-basics/test/colorize-fixtures/**',
 	'!extensions/vscode-api-tests/testWorkspace/**',
 	'!extensions/vscode-api-tests/testWorkspace2/**',
 	'!extensions/**/*.test.ts',
@@ -201,6 +200,29 @@ const sqlFilter = [
 ];
 
 // {{SQL CARBON EDIT}}
+
+const tslintCoreFilter = [
+	'src/**/*.ts',
+	'test/**/*.ts',
+	'!extensions/**/*.ts',
+	'!test/smoke/**',
+	...tslintBaseFilter
+];
+
+const tslintExtensionsFilter = [
+	'extensions/**/*.ts',
+	'!src/**/*.ts',
+	'!test/**/*.ts',
+	...tslintBaseFilter
+];
+
+const tslintHygieneFilter = [
+	'src/**/*.ts',
+	'test/**/*.ts',
+	'extensions/**/*.ts',
+	...tslintBaseFilter
+];
+
 const copyrightHeaderLines = [
 	'/*---------------------------------------------------------------------------------------------',
 	' *  Copyright (c) Microsoft Corporation. All rights reserved.',
@@ -217,12 +239,20 @@ gulp.task('eslint', () => {
 });
 
 gulp.task('tslint', () => {
-	const options = { emitError: true };
-
-	return vfs.src(all, { base: '.', follow: true, allowEmpty: true })
-		.pipe(filter(tslintFilter))
-		.pipe(gulptslint.default({ rulesDirectory: 'build/lib/tslint' }))
-		.pipe(gulptslint.default.report(options));
+	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 }))
+	]);
 });
 
 function hygiene(some) {
@@ -363,7 +393,7 @@ function hygiene(some) {
 		.pipe(copyrights);
 
 	const typescript = result
-		.pipe(filter(tslintFilter))
+		.pipe(filter(tslintHygieneFilter))
 		.pipe(formatting)
 		.pipe(tsl)
 		// {{SQL CARBON EDIT}}

diff --git a/build/gulpfile.vscode.web.js b/build/gulpfile.vscode.web.js
@@ -41,6 +41,9 @@ const vscodeWebResources = [
 	// Webview
 	'out-build/vs/workbench/contrib/webview/browser/pre/*.js',
 
+	// Extension Worker
+	'out-build/vs/workbench/services/extensions/worker/extensionHostWorkerMain.js',
+
 	// Excludes
 	'!out-build/vs/**/{node,electron-browser,electron-main}/**',
 	'!out-build/vs/editor/standalone/**',

diff --git a/build/lib/tslint/abstractGlobalsRule.js b/build/lib/tslint/abstractGlobalsRule.js
@@ -0,0 +1,40 @@
+"use strict";
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. 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 valueDeclaration = symbol.valueDeclaration;
+                if (valueDeclaration) {
+                    const parent = valueDeclaration.parent;
+                    if (parent) {
+                        const sourceFile = parent.getSourceFile();
+                        if (sourceFile) {
+                            const fileName = sourceFile.fileName;
+                            if (fileName && fileName.indexOf(this.getDefinitionPattern()) >= 0) {
+                                this.addFailureAtNode(node, `Cannot use global '${node.text}' in '${this._config.target}'`);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        super.visitIdentifier(node);
+    }
+}
+exports.AbstractGlobalsRuleWalker = AbstractGlobalsRuleWalker;
diff --git a/build/lib/tslint/abstractGlobalsRule.ts b/build/lib/tslint/abstractGlobalsRule.ts
@@ -0,0 +1,51 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. 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 valueDeclaration = symbol.valueDeclaration;
+				if (valueDeclaration) {
+					const parent = valueDeclaration.parent;
+					if (parent) {
+						const sourceFile = parent.getSourceFile();
+						if (sourceFile) {
+							const fileName = sourceFile.fileName;
+							if (fileName && fileName.indexOf(this.getDefinitionPattern()) >= 0) {
+								this.addFailureAtNode(node, `Cannot use global '${node.text}' in '${this._config.target}'`);
+							}
+						}
+					}
+				}
+			}
+		}
+
+		super.visitIdentifier(node);
+	}
+}
diff --git a/build/lib/tslint/noDOMGlobalsRule.js b/build/lib/tslint/noDOMGlobalsRule.js
@@ -0,0 +1,34 @@
+"use strict";
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. 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"
+        ];
+    }
+}
diff --git a/build/lib/tslint/noDOMGlobalsRule.ts b/build/lib/tslint/noDOMGlobalsRule.ts
@@ -0,0 +1,45 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. 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"
+		];
+	}
+}
diff --git a/build/lib/tslint/noNodeJSGlobalsRule.js b/build/lib/tslint/noNodeJSGlobalsRule.js
@@ -0,0 +1,40 @@
+"use strict";
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. 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 [
+            "Buffer",
+            "__dirname",
+            "__filename",
+            "clearImmediate",
+            "exports",
+            "global",
+            "module",
+            "process",
+            "setImmediate"
+        ];
+    }
+}
diff --git a/build/lib/tslint/noNodeJSGlobalsRule.ts b/build/lib/tslint/noNodeJSGlobalsRule.ts
@@ -0,0 +1,51 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. 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 [
+			"Buffer",
+			"__dirname",
+			"__filename",
+			"clearImmediate",
+			"exports",
+			"global",
+			"module",
+			"process",
+			"setImmediate"
+		];
+	}
+}
diff --git a/extensions/cms/src/cmsUtils.ts b/extensions/cms/src/cmsUtils.ts
@@ -84,7 +84,7 @@ export class CmsUtils {
 	// CMS APIs
 	public async getCmsService(): Promise<mssql.ICmsService> {
 		if (!this._cmsService) {
-			this._cmsService = (vscode.extensions.getExtension(mssql.extension.name).exports as mssql.mssql).cmsService;
+			this._cmsService = (vscode.extensions.getExtension(mssql.extension.name).exports as mssql.IExtension).cmsService;
 		}
 		return this._cmsService;
 	}

diff --git a/extensions/dacpac/src/wizard/dataTierApplicationWizard.ts b/extensions/dacpac/src/wizard/dataTierApplicationWizard.ts
@@ -371,7 +371,7 @@ export class DataTierApplicationWizard {
 	}
 
 	private static async getService(providerName: string): Promise<mssql.IDacFxService> {
-		const service = (vscode.extensions.getExtension(mssql.extension.name).exports as mssql.mssql).dacFx;
+		const service = (vscode.extensions.getExtension(mssql.extension.name).exports as mssql.IExtension).dacFx;
 		return service;
 	}
 }
diff --git a/extensions/integration-tests/src/cms.test.ts b/extensions/integration-tests/src/cms.test.ts
@@ -31,7 +31,7 @@ if (context.RunTest) {
 		setup(async function () {
 			// Set up CMS provider
 			if (!cmsService) {
-				cmsService = ((await vscode.extensions.getExtension(mssql.extension.name).activate() as mssql.mssql)).cmsService;
+				cmsService = ((await vscode.extensions.getExtension(mssql.extension.name).activate() as mssql.IExtension)).cmsService;
 				assert(cmsService !== undefined);
 			}