Merge pull request microsoft#13999 from Microsoft/semicolon

Andy · web-flow · commit 6d7bc655ea63 · 2017-03-03T07:19:21.000-08:00
Fix "semicolon" lint rule options (was not enabled)
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -141,7 +141,7 @@ namespace ts {
             getAugmentedPropertiesOfType,
             getRootSymbols,
             getContextualType: node => {
-                node = getParseTreeNode(node, isExpression)
+                node = getParseTreeNode(node, isExpression);
                 return node ? getContextualType(node) : undefined;
             },
             getFullyQualifiedName,
@@ -20674,7 +20674,7 @@ namespace ts {
                 }
 
                 if (potentialNewTargetCollisions.length) {
-                    forEach(potentialNewTargetCollisions, checkIfNewTargetIsCapturedInEnclosingScope)
+                    forEach(potentialNewTargetCollisions, checkIfNewTargetIsCapturedInEnclosingScope);
                     potentialNewTargetCollisions.length = 0;
                 }
 
diff --git a/src/compiler/core.ts b/src/compiler/core.ts
@@ -84,7 +84,7 @@ namespace ts {
                     this.index++;
                     return { value: this.selector(this.data, this.keys[index]), done: false };
                 }
-                return { value: undefined as never, done: true }
+                return { value: undefined as never, done: true };
             }
         }
 
@@ -140,7 +140,7 @@ namespace ts {
                     action(this.data[key], key);
                 }
             }
-        }
+        };
     }
 
     export function createFileMap<T>(keyMapper?: (key: string) => string): FileMap<T> {
diff --git a/src/compiler/declarationEmitter.ts b/src/compiler/declarationEmitter.ts
@@ -1164,7 +1164,7 @@ namespace ts {
             emitTypeParameters(node.typeParameters);
             const baseTypeNode = getClassExtendsHeritageClauseElement(node);
             if (baseTypeNode) {
-                node.name
+                node.name;
                 emitHeritageClause(node.name, [baseTypeNode], /*isImplementsList*/ false);
             }
             emitHeritageClause(node.name, getClassImplementsHeritageClauseElements(node), /*isImplementsList*/ true);
diff --git a/src/compiler/moduleNameResolver.ts b/src/compiler/moduleNameResolver.ts
@@ -675,7 +675,7 @@ namespace ts {
     }
 
     export function nodeModuleNameResolver(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost, cache?: ModuleResolutionCache): ResolvedModuleWithFailedLookupLocations {
-        return nodeModuleNameResolverWorker(moduleName, containingFile, compilerOptions, host, cache, /* jsOnly*/ false);
+        return nodeModuleNameResolverWorker(moduleName, containingFile, compilerOptions, host, cache, /*jsOnly*/ false);
     }
 
     /* @internal */
@@ -962,7 +962,7 @@ namespace ts {
         const result = cache && cache.get(containingDirectory);
         if (result) {
             if (traceEnabled) {
-                trace(host, Diagnostics.Resolution_for_module_0_was_found_in_cache, moduleName)
+                trace(host, Diagnostics.Resolution_for_module_0_was_found_in_cache, moduleName);
             }
             return { value: result.resolvedModule && { path: result.resolvedModule.resolvedFileName, extension: result.resolvedModule.extension } };
         }
diff --git a/src/compiler/transformer.ts b/src/compiler/transformer.ts
@@ -121,13 +121,13 @@ namespace ts {
             enableEmitNotification,
             isSubstitutionEnabled,
             isEmitNotificationEnabled,
-            get onSubstituteNode() { return onSubstituteNode },
+            get onSubstituteNode() { return onSubstituteNode; },
             set onSubstituteNode(value) {
                 Debug.assert(state < TransformationState.Initialized, "Cannot modify transformation hooks after initialization has completed.");
                 Debug.assert(value !== undefined, "Value must not be 'undefined'");
                 onSubstituteNode = value;
             },
-            get onEmitNode() { return onEmitNode },
+            get onEmitNode() { return onEmitNode; },
             set onEmitNode(value) {
                 Debug.assert(state < TransformationState.Initialized, "Cannot modify transformation hooks after initialization has completed.");
                 Debug.assert(value !== undefined, "Value must not be 'undefined'");
diff --git a/src/compiler/transformers/es2015.ts b/src/compiler/transformers/es2015.ts
@@ -2690,7 +2690,7 @@ namespace ts {
                 if (loopOutParameters.length) {
                     copyOutParameters(loopOutParameters, CopyDirection.ToOutParameter, statements);
                 }
-                addRange(statements, lexicalEnvironment)
+                addRange(statements, lexicalEnvironment);
                 loopBody = createBlock(statements, /*multiline*/ true);
             }
 
diff --git a/src/compiler/transformers/module/module.ts b/src/compiler/transformers/module/module.ts
@@ -1152,7 +1152,7 @@ namespace ts {
                         createIdentifier("__esModule"),
                         createLiteral(true)
                     )
-                )
+                );
             }
             else {
                 statement = createStatement(
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
@@ -3297,7 +3297,7 @@
     }
 
     export interface PluginImport {
-        name: string
+        name: string;
     }
 
     export type CompilerOptionsValue = string | number | boolean | (string | number)[] | string[] | MapLike<string[]> | PluginImport[];
diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts
@@ -585,7 +585,7 @@ namespace FourSlash {
         }
 
         private getGoToDefinition(): ts.DefinitionInfo[] {
-            return this.languageService.getDefinitionAtPosition(this.activeFile.fileName, this.currentCaretPosition)
+            return this.languageService.getDefinitionAtPosition(this.activeFile.fileName, this.currentCaretPosition);
         }
 
         public verifyGoToType(arg0: any, endMarkerNames?: string | string[]) {
@@ -926,7 +926,7 @@ namespace FourSlash {
             function rangeToReferenceEntry(r: Range) {
                 let { isWriteAccess, isDefinition } = (r.marker && r.marker.data) || { isWriteAccess: false, isDefinition: false };
                 isWriteAccess = !!isWriteAccess; isDefinition = !!isDefinition;
-                return { fileName: r.fileName, textSpan: { start: r.start, length: r.end - r.start }, isWriteAccess, isDefinition }
+                return { fileName: r.fileName, textSpan: { start: r.start, length: r.end - r.start }, isWriteAccess, isDefinition };
             }
         }
 
@@ -2136,7 +2136,7 @@ namespace FourSlash {
 
             const result = includeWhiteSpace
                 ? actualText === expectedText
-                : this.removeWhitespace(actualText) === this.removeWhitespace(expectedText)
+                : this.removeWhitespace(actualText) === this.removeWhitespace(expectedText);
 
             if (!result) {
                 this.raiseError(`Actual text doesn't match expected text. Actual:\n'${actualText}'\nExpected:\n'${expectedText}'`);
@@ -2173,7 +2173,7 @@ namespace FourSlash {
                     start: diagnostic.start,
                     length: diagnostic.length,
                     code: diagnostic.code
-                }
+                };
             });
             const dedupedDiagnositcs = ts.deduplicate(diagnosticsForCodeFix, ts.equalOwnProperties);
 
diff --git a/src/harness/harness.ts b/src/harness/harness.ts
@@ -44,7 +44,7 @@ declare namespace NodeJS {
 declare var window: {};
 declare var XMLHttpRequest: {
     new(): XMLHttpRequest;
-}
+};
 interface XMLHttpRequest  {
     readonly readyState: number;
     readonly responseText: string;
@@ -1017,7 +1017,7 @@ namespace Harness {
                     }
                     else {
                         if (!es6TestLibFileNameSourceFileMap.get(libFileName)) {
-                            es6TestLibFileNameSourceFileMap.set(libFileName, createSourceFileAndAssertInvariants(libFileName, IO.readFile(libFileName), scriptTarget))
+                            es6TestLibFileNameSourceFileMap.set(libFileName, createSourceFileAndAssertInvariants(libFileName, IO.readFile(libFileName), scriptTarget));
                         }
                     }
                 }
diff --git a/src/harness/harnessLanguageService.ts b/src/harness/harnessLanguageService.ts
@@ -779,7 +779,7 @@ namespace Harness.LanguageService {
                                         start: 0
                                     });
                                     return prev;
-                                }
+                                };
                                 return proxy;
                             }
                         }),
diff --git a/src/harness/unittests/compileOnSave.ts b/src/harness/unittests/compileOnSave.ts
@@ -496,7 +496,7 @@ namespace ts.projectSystem {
                 const emitOutput = host.readFile(path + ".js");
                 assert.equal(emitOutput, f.content + newLine, "content of emit output should be identical with the input + newline");
             }
-        })
+        });
 
         it("should emit specified file", () => {
             const file1 = {
diff --git a/src/harness/unittests/printer.ts b/src/harness/unittests/printer.ts
@@ -9,7 +9,7 @@ namespace ts {
                     Harness.Baseline.runBaseline(`printerApi/${prefix}.${name}.js`, () =>
                         printCallback(createPrinter({ newLine: NewLineKind.CarriageReturnLineFeed, ...options })));
                 });
-            }
+            };
         }
 
         describe("printFile", () => {
diff --git a/src/harness/unittests/textStorage.ts b/src/harness/unittests/textStorage.ts
@@ -65,6 +65,6 @@ namespace ts.textStorage {
 
             ts1.getLineInfo(0);
             assert.isTrue(ts1.hasScriptVersionCache(), "have script version cache - 2");
-        })
+        });
     });
 }
diff --git a/src/harness/unittests/tsserverProjectSystem.ts b/src/harness/unittests/tsserverProjectSystem.ts
@@ -628,7 +628,7 @@ namespace ts.projectSystem {
 
             checkProjectActualFiles(service.configuredProjects[0], []);
             checkProjectActualFiles(service.inferredProjects[0], [f1.path]);
-        })
+        });
 
         it("create configured project without file list", () => {
             const configFile: FileOrFolder = {
@@ -1181,7 +1181,7 @@ namespace ts.projectSystem {
 
             const host = createServerHost([f1, f2, libFile]);
             const service = createProjectService(host);
-            service.openExternalProject({ projectFileName: "/a/b/project", rootFiles: toExternalFiles([f1.path, f2.path]), options: {} })
+            service.openExternalProject({ projectFileName: "/a/b/project", rootFiles: toExternalFiles([f1.path, f2.path]), options: {} });
 
             service.openClientFile(f1.path);
             service.openClientFile(f2.path, "let x: string");
@@ -1213,7 +1213,7 @@ namespace ts.projectSystem {
 
             const host = createServerHost([f1, f2, libFile]);
             const service = createProjectService(host);
-            service.openExternalProject({ projectFileName: "/a/b/project", rootFiles: [{ fileName: f1.path }, { fileName: f2.path, hasMixedContent: true }], options: {} })
+            service.openExternalProject({ projectFileName: "/a/b/project", rootFiles: [{ fileName: f1.path }, { fileName: f2.path, hasMixedContent: true }], options: {} });
 
             service.openClientFile(f1.path);
             service.openClientFile(f2.path, "let somelongname: string");
@@ -2040,7 +2040,7 @@ namespace ts.projectSystem {
 
             for (const f of [f2, f3]) {
                 const scriptInfo = projectService.getScriptInfoForNormalizedPath(server.toNormalizedPath(f.path));
-                assert.equal(scriptInfo.containingProjects.length, 0, `expect 0 containing projects for '${f.path}'`)
+                assert.equal(scriptInfo.containingProjects.length, 0, `expect 0 containing projects for '${f.path}'`);
             }
         });
 
@@ -2156,7 +2156,7 @@ namespace ts.projectSystem {
                 projectFileName,
                 rootFiles: [toExternalFile(f1.path)],
                 options: {}
-            })
+            });
             projectService.openClientFile(f1.path, "let x = 1;\nlet y = 2;");
 
             projectService.checkNumberOfProjects({ externalProjects: 1 });
@@ -3307,12 +3307,12 @@ namespace ts.projectSystem {
                 isCancellationRequested: () => false,
                 setRequest: requestId => {
                     if (expectedRequestId === undefined) {
-                        assert.isTrue(false, "unexpected call")
+                        assert.isTrue(false, "unexpected call");
                     }
                     assert.equal(requestId, expectedRequestId);
                 },
                 resetRequest: noop
-            }
+            };
             const session = createSession(host, /*typingsInstaller*/ undefined, /*projectServiceEventHandler*/ undefined, cancellationToken);
 
             expectedRequestId = session.getNextSeq();
@@ -3359,13 +3359,13 @@ namespace ts.projectSystem {
                         currentId = requestId;
                     },
                     resetRequest(requestId) {
-                        assert.equal(requestId, currentId, "unexpected request id in cancellation")
+                        assert.equal(requestId, currentId, "unexpected request id in cancellation");
                         currentId = undefined;
                     },
                     isCancellationRequested() {
                         return requestToCancel === currentId;
                     }
-                }
+                };
             })();
             const host = createServerHost([f1, config]);
             const session = createSession(host, /*typingsInstaller*/ undefined, () => {}, cancellationToken);
diff --git a/src/harness/unittests/typingsInstaller.ts b/src/harness/unittests/typingsInstaller.ts
@@ -56,7 +56,7 @@ namespace ts.projectSystem {
                 path: "/a/config.js",
                 content: "export let x = 1"
             };
-            const typesCache = "/cache"
+            const typesCache = "/cache";
             const typesConfig = {
                 path: typesCache + "/node_modules/@types/config/index.d.ts",
                 content: "export let y: number;"
@@ -74,7 +74,7 @@ namespace ts.projectSystem {
                     super(host, { typesRegistry: createTypesRegistry("config"), globalTypingsCacheLocation: typesCache });
                 }
                 installWorker(_requestId: number, _args: string[], _cwd: string, _cb: server.typingsInstaller.RequestCompletedAction) {
-                    assert(false, "should not be called")
+                    assert(false, "should not be called");
                 }
             })();
             const service = createProjectService(host, { typingsInstaller: installer });
diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
@@ -140,7 +140,7 @@ namespace ts.server {
         getScriptKind: _ => undefined,
         hasMixedContent: (fileName, extraFileExtensions) => {
             const mixedContentExtensions = ts.map(ts.filter(extraFileExtensions, item => item.isMixedContent), item => item.extension);
-            return forEach(mixedContentExtensions, extension => fileExtensionIs(fileName, extension))
+            return forEach(mixedContentExtensions, extension => fileExtensionIs(fileName, extension));
         }
     };
 
@@ -1377,7 +1377,7 @@ namespace ts.server {
 
             // close projects that were missing in the input list
             forEachKey(projectsToClose, externalProjectName => {
-                this.closeExternalProject(externalProjectName, /*suppressRefresh*/ true)
+                this.closeExternalProject(externalProjectName, /*suppressRefresh*/ true);
             });
 
             this.refreshInferredProjects();
diff --git a/src/server/project.ts b/src/server/project.ts
@@ -723,7 +723,7 @@ namespace ts.server {
                     const fileName = resolvedTypeReferenceDirective.resolvedFileName;
                     const typeFilePath = toPath(fileName, currentDirectory, getCanonicalFileName);
                     referencedFiles.set(typeFilePath, true);
-                })
+                });
             }
 
             const allFileNames = arrayFrom(referencedFiles.keys()) as Path[];
@@ -745,7 +745,7 @@ namespace ts.server {
                 const id = nextId;
                 nextId++;
                 return makeInferredProjectName(id);
-            }
+            };
         })();
 
         private _isJsInferredProject = false;
diff --git a/src/server/scriptInfo.ts b/src/server/scriptInfo.ts
@@ -48,7 +48,7 @@ namespace ts.server {
 
         public reloadFromFile(tempFileName?: string) {
             if (this.svc || (tempFileName !== this.fileName)) {
-                this.reload(this.getFileText(tempFileName))
+                this.reload(this.getFileText(tempFileName));
             }
             else {
                 this.setText(undefined);
diff --git a/src/server/server.ts b/src/server/server.ts
@@ -47,14 +47,14 @@ namespace ts.server {
         if (process.env.XDG_CACHE_HOME) {
             return process.env.XDG_CACHE_HOME;
         }
-        const usersDir = platformIsDarwin ? "Users" : "home"
+        const usersDir = platformIsDarwin ? "Users" : "home";
         const homePath = (os.homedir && os.homedir()) ||
             process.env.HOME ||
             ((process.env.LOGNAME || process.env.USER) && `/${usersDir}/${process.env.LOGNAME || process.env.USER}`) ||
             os.tmpdir();
         const cacheFolder = platformIsDarwin
             ? "Library/Caches"
-            : ".cache"
+            : ".cache";
         return combinePaths(normalizeSlashes(homePath), cacheFolder);
     }
 
@@ -653,7 +653,7 @@ namespace ts.server {
                 // this drive is unsafe - return no-op watcher
                 return { close() { } };
             }
-        }
+        };
     }
 
     // Override sys.write because fs.writeSync is not reliable on Node 4
diff --git a/src/server/session.ts b/src/server/session.ts
diff --git a/src/server/typingsInstaller/nodeTypingsInstaller.ts b/src/server/typingsInstaller/nodeTypingsInstaller.ts
diff --git a/src/server/watchGuard/watchGuard.ts b/src/server/watchGuard/watchGuard.ts
diff --git a/src/services/codefixes/importFixes.ts b/src/services/codefixes/importFixes.ts
diff --git a/src/services/findAllReferences.ts b/src/services/findAllReferences.ts
diff --git a/src/services/jsDoc.ts b/src/services/jsDoc.ts
diff --git a/tslint.json b/tslint.json

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ namespace ts {`
`84`	`84`	`this.index++;`
`85`	`85`	`return { value: this.selector(this.data, this.keys[index]), done: false };`
`86`	`86`	`}`
`87`		`- return { value: undefined as never, done: true }`
	`87`	`+ return { value: undefined as never, done: true };`
`88`	`88`	`}`
`89`	`89`	`}`
`90`	`90`
`@@ -140,7 +140,7 @@ namespace ts {`
`140`	`140`	`action(this.data[key], key);`
`141`	`141`	`}`
`142`	`142`	`}`
`143`		`- }`
	`143`	`+ };`
`144`	`144`	`}`
`145`	`145`
`146`	`146`	`export function createFileMap<T>(keyMapper?: (key: string) => string): FileMap<T> {`
Original file line number	Diff line number	Diff line change
`@@ -1164,7 +1164,7 @@ namespace ts {`
`1164`	`1164`	`emitTypeParameters(node.typeParameters);`
`1165`	`1165`	`const baseTypeNode = getClassExtendsHeritageClauseElement(node);`
`1166`	`1166`	`if (baseTypeNode) {`
`1167`		`- node.name`
	`1167`	`+ node.name;`
`1168`	`1168`	`emitHeritageClause(node.name, [baseTypeNode], /isImplementsList/ false);`
`1169`	`1169`	`}`
`1170`	`1170`	`emitHeritageClause(node.name, getClassImplementsHeritageClauseElements(node), /isImplementsList/ true);`
Original file line number	Diff line number	Diff line change
`@@ -675,7 +675,7 @@ namespace ts {`
`675`	`675`	`}`
`676`	`676`
`677`	`677`	`export function nodeModuleNameResolver(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost, cache?: ModuleResolutionCache): ResolvedModuleWithFailedLookupLocations {`
`678`		`- return nodeModuleNameResolverWorker(moduleName, containingFile, compilerOptions, host, cache, /* jsOnly*/ false);`
	`678`	`+ return nodeModuleNameResolverWorker(moduleName, containingFile, compilerOptions, host, cache, /jsOnly/ false);`
`679`	`679`	`}`
`680`	`680`
`681`	`681`	`/* @internal */`
`@@ -962,7 +962,7 @@ namespace ts {`
`962`	`962`	`const result = cache && cache.get(containingDirectory);`
`963`	`963`	`if (result) {`
`964`	`964`	`if (traceEnabled) {`
`965`		`- trace(host, Diagnostics.Resolution_for_module_0_was_found_in_cache, moduleName)`
	`965`	`+ trace(host, Diagnostics.Resolution_for_module_0_was_found_in_cache, moduleName);`
`966`	`966`	`}`
`967`	`967`	`return { value: result.resolvedModule && { path: result.resolvedModule.resolvedFileName, extension: result.resolvedModule.extension } };`
`968`	`968`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2690,7 +2690,7 @@ namespace ts {`
`2690`	`2690`	`if (loopOutParameters.length) {`
`2691`	`2691`	`copyOutParameters(loopOutParameters, CopyDirection.ToOutParameter, statements);`
`2692`	`2692`	`}`
`2693`		`- addRange(statements, lexicalEnvironment)`
	`2693`	`+ addRange(statements, lexicalEnvironment);`
`2694`	`2694`	`loopBody = createBlock(statements, /multiline/ true);`
`2695`	`2695`	`}`
`2696`	`2696`
Original file line number	Diff line number	Diff line change
`@@ -1152,7 +1152,7 @@ namespace ts {`
`1152`	`1152`	`createIdentifier("__esModule"),`
`1153`	`1153`	`createLiteral(true)`
`1154`	`1154`	`)`
`1155`		`- )`
	`1155`	`+ );`
`1156`	`1156`	`}`
`1157`	`1157`	`else {`
`1158`	`1158`	`statement = createStatement(`
Original file line number	Diff line number	Diff line change
`@@ -3297,7 +3297,7 @@`
`3297`	`3297`	`}`
`3298`	`3298`
`3299`	`3299`	`export interface PluginImport {`
`3300`		`- name: string`
	`3300`	`+ name: string;`
`3301`	`3301`	`}`
`3302`	`3302`
`3303`	`3303`	`export type CompilerOptionsValue = string \| number \| boolean \| (string \| number)[] \| string[] \| MapLike<string[]> \| PluginImport[];`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ declare namespace NodeJS {`
`44`	`44`	`declare var window: {};`
`45`	`45`	`declare var XMLHttpRequest: {`
`46`	`46`	`new(): XMLHttpRequest;`
`47`		`-}`
	`47`	`+};`
`48`	`48`	`interface XMLHttpRequest {`
`49`	`49`	`readonly readyState: number;`
`50`	`50`	`readonly responseText: string;`
`@@ -1017,7 +1017,7 @@ namespace Harness {`
`1017`	`1017`	`}`
`1018`	`1018`	`else {`
`1019`	`1019`	`if (!es6TestLibFileNameSourceFileMap.get(libFileName)) {`
`1020`		`- es6TestLibFileNameSourceFileMap.set(libFileName, createSourceFileAndAssertInvariants(libFileName, IO.readFile(libFileName), scriptTarget))`
	`1020`	`+ es6TestLibFileNameSourceFileMap.set(libFileName, createSourceFileAndAssertInvariants(libFileName, IO.readFile(libFileName), scriptTarget));`
`1021`	`1021`	`}`
`1022`	`1022`	`}`
`1023`	`1023`	`}`