Skip to content

Commit 8dabe33

Browse files
vladimamhegazy
authored andcommitted
fix linter (microsoft#11366)
1 parent 93b8df7 commit 8dabe33

File tree

6 files changed

+14
-37
lines changed

6 files changed

+14
-37
lines changed

scripts/processDiagnosticMessages.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ function buildInfoFileOutput(messageTable: InputDiagnosticMessageTable, nameMap:
8686
'/// <reference path="types.ts" />\r\n' +
8787
'/* @internal */\r\n' +
8888
'namespace ts {\r\n' +
89-
' export var Diagnostics = {\r\n';
89+
' export const Diagnostics = {\r\n';
9090
var names = Utilities.getObjectKeys(messageTable);
9191
for (var i = 0; i < names.length; i++) {
9292
var name = names[i];

src/compiler/core.ts

+3-32
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ namespace ts {
212212
* true for all elements, otherwise returns a new array instance containing the filtered subset.
213213
*/
214214
export function filter<T, U extends T>(array: T[], f: (x: T) => x is U): U[];
215-
export function filter<T>(array: T[], f: (x: T) => boolean): T[]
215+
export function filter<T>(array: T[], f: (x: T) => boolean): T[];
216216
export function filter<T>(array: T[], f: (x: T) => boolean): T[] {
217217
if (array) {
218218
const len = array.length;
@@ -1867,10 +1867,10 @@ namespace ts {
18671867
declare var process: any;
18681868
declare var require: any;
18691869

1870-
let currentAssertionLevel: AssertionLevel;
1870+
export let currentAssertionLevel = AssertionLevel.None;
18711871

18721872
export function shouldAssert(level: AssertionLevel): boolean {
1873-
return getCurrentAssertionLevel() >= level;
1873+
return currentAssertionLevel >= level;
18741874
}
18751875

18761876
export function assert(expression: boolean, message?: string, verboseDebugInfo?: () => string): void {
@@ -1887,35 +1887,6 @@ namespace ts {
18871887
export function fail(message?: string): void {
18881888
Debug.assert(/*expression*/ false, message);
18891889
}
1890-
1891-
function getCurrentAssertionLevel() {
1892-
if (currentAssertionLevel !== undefined) {
1893-
return currentAssertionLevel;
1894-
}
1895-
1896-
if (sys === undefined) {
1897-
return AssertionLevel.None;
1898-
}
1899-
1900-
const developmentMode = /^development$/i.test(getEnvironmentVariable("NODE_ENV"));
1901-
currentAssertionLevel = developmentMode
1902-
? AssertionLevel.Normal
1903-
: AssertionLevel.None;
1904-
1905-
return currentAssertionLevel;
1906-
}
1907-
}
1908-
1909-
export function getEnvironmentVariable(name: string, host?: CompilerHost) {
1910-
if (host && host.getEnvironmentVariable) {
1911-
return host.getEnvironmentVariable(name);
1912-
}
1913-
1914-
if (sys && sys.getEnvironmentVariable) {
1915-
return sys.getEnvironmentVariable(name);
1916-
}
1917-
1918-
return "";
19191890
}
19201891

19211892
/** Remove an item from an array, moving everything to its right one space left. */

src/compiler/program.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ namespace ts {
206206
readFile: fileName => sys.readFile(fileName),
207207
trace: (s: string) => sys.write(s + newLine),
208208
directoryExists: directoryName => sys.directoryExists(directoryName),
209-
getEnvironmentVariable: name => getEnvironmentVariable(name, /*host*/ undefined),
209+
getEnvironmentVariable: name => sys.getEnvironmentVariable ? sys.getEnvironmentVariable(name) : "",
210210
getDirectories: (path: string) => sys.getDirectories(path),
211211
realpath
212212
};

src/compiler/sys.ts

+7-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ namespace ts {
8383
getEnvironmentVariable?(name: string): string;
8484
};
8585

86-
export var sys: System = (function() {
86+
export let sys: System = (function() {
8787

8888
function getWScriptSystem(): System {
8989

@@ -637,4 +637,10 @@ namespace ts {
637637
}
638638
return sys;
639639
})();
640+
641+
if (sys && sys.getEnvironmentVariable) {
642+
Debug.currentAssertionLevel = /^development$/i.test(sys.getEnvironmentVariable("NODE_ENV"))
643+
? AssertionLevel.Normal
644+
: AssertionLevel.None;
645+
}
640646
}

src/harness/harness.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -509,7 +509,7 @@ namespace Harness {
509509
tryEnableSourceMapsForHost?(): void;
510510
getEnvironmentVariable?(name: string): string;
511511
}
512-
export var IO: IO;
512+
export let IO: IO;
513513

514514
// harness always uses one kind of new line
515515
const harnessNewLine = "\r\n";

src/server/editorServices.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace ts.server {
1212
export const maxProgramSizeForNonTsFiles = 20 * 1024 * 1024;
1313

1414
export type ProjectServiceEvent =
15-
{ eventName: "context", data: { project: Project, fileName: NormalizedPath } } | { eventName: "configFileDiag", data: { triggerFile?: string, configFileName: string, diagnostics: Diagnostic[] } }
15+
{ eventName: "context", data: { project: Project, fileName: NormalizedPath } } | { eventName: "configFileDiag", data: { triggerFile?: string, configFileName: string, diagnostics: Diagnostic[] } };
1616

1717
export interface ProjectServiceEventHandler {
1818
(event: ProjectServiceEvent): void;

0 commit comments

Comments
 (0)