Skip to content

Commit 4deea66

Browse files
DanielRosenwasserDanielRosenwasser
committed
Put 'sys' into the 'ts' module.
1 parent 73ee038 commit 4deea66

File tree

7 files changed

+279
-274
lines changed

7 files changed

+279
-274
lines changed

‎src/compiler/sys.ts

+234-232
Large diffs are not rendered by default.

‎src/compiler/tsc.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -490,4 +490,4 @@ module ts {
490490
}
491491
}
492492

493-
ts.executeCommandLine(sys.args);
493+
ts.executeCommandLine(ts.sys.args);

‎src/harness/fourslash.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ module FourSlash {
363363
this.formatCodeOptions = {
364364
IndentSize: 4,
365365
TabSize: 4,
366-
NewLineCharacter: sys.newLine,
366+
NewLineCharacter: ts.sys.newLine,
367367
ConvertTabsToSpaces: true,
368368
InsertSpaceAfterCommaDelimiter: true,
369369
InsertSpaceAfterSemicolonInForStatements: true,
@@ -1747,9 +1747,9 @@ module FourSlash {
17471747
}
17481748

17491749
function jsonMismatchString() {
1750-
return sys.newLine +
1751-
"expected: '" + sys.newLine + JSON.stringify(expected, (k,v) => v, 2) + "'" + sys.newLine +
1752-
"actual: '" + sys.newLine + JSON.stringify(actual, (k, v) => v, 2) + "'";
1750+
return ts.sys.newLine +
1751+
"expected: '" + ts.sys.newLine + JSON.stringify(expected, (k,v) => v, 2) + "'" + ts.sys.newLine +
1752+
"actual: '" + ts.sys.newLine + JSON.stringify(actual, (k, v) => v, 2) + "'";
17531753
}
17541754
}
17551755

@@ -2246,7 +2246,7 @@ module FourSlash {
22462246
{ unitName: fileName, content: content }],
22472247
(fn, contents) => result = contents,
22482248
ts.ScriptTarget.Latest,
2249-
sys.useCaseSensitiveFileNames);
2249+
ts.sys.useCaseSensitiveFileNames);
22502250
// TODO (drosen): We need to enforce checking on these tests.
22512251
var program = ts.createProgram([Harness.Compiler.fourslashFilename, fileName], { out: "fourslashTestOutput.js", noResolve: true }, host);
22522252
var checker = ts.createTypeChecker(program, /*fullTypeCheckMode*/ true);

‎src/harness/harness.ts

+18-15
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
/// <reference path='external\chai.d.ts'/>
2323
/// <reference path='sourceMapRecorder.ts'/>
2424

25+
declare var require: any;
26+
declare var process: any;
27+
2528
// this will work in the browser via browserify
2629
var _chai: typeof chai = require('chai');
2730
var assert: typeof _chai.assert = _chai.assert;
@@ -41,7 +44,7 @@ module Utils {
4144
export function getExecutionEnvironment() {
4245
if (typeof WScript !== "undefined" && typeof ActiveXObject === "function") {
4346
return ExecutionEnvironment.CScript;
44-
} else if (process && (<any>process).execPath && (<any>process).execPath.indexOf("node") !== -1) {
47+
} else if (process && process.execPath && process.execPath.indexOf("node") !== -1) {
4548
return ExecutionEnvironment.Node;
4649
} else {
4750
return ExecutionEnvironment.Browser;
@@ -89,7 +92,7 @@ module Utils {
8992
}
9093

9194
try {
92-
var content = sys.readFile(Harness.userSpecifiedroot + path);
95+
var content = ts.sys.readFile(Harness.userSpecifiedroot + path);
9396
}
9497
catch (err) {
9598
return undefined;
@@ -156,8 +159,8 @@ module Harness {
156159
fso = {};
157160
}
158161

159-
export var readFile: typeof IO.readFile = sys.readFile;
160-
export var writeFile: typeof IO.writeFile = sys.writeFile;
162+
export var readFile: typeof IO.readFile = ts.sys.readFile;
163+
export var writeFile: typeof IO.writeFile = ts.sys.writeFile;
161164
export var directoryName: typeof IO.directoryName = fso.GetParentFolderName;
162165
export var directoryExists: typeof IO.directoryExists = fso.FolderExists;
163166
export var fileExists: typeof IO.fileExists = fso.FileExists;
@@ -218,8 +221,8 @@ module Harness {
218221
fs = pathModule = {};
219222
}
220223

221-
export var readFile: typeof IO.readFile = sys.readFile;
222-
export var writeFile: typeof IO.writeFile = sys.writeFile;
224+
export var readFile: typeof IO.readFile = ts.sys.readFile;
225+
export var writeFile: typeof IO.writeFile = ts.sys.writeFile;
223226
export var fileExists: typeof IO.fileExists = fs.existsSync;
224227
export var log: typeof IO.log = console.log;
225228

@@ -547,7 +550,7 @@ module Harness {
547550
export var fourslashSourceFile: ts.SourceFile;
548551

549552
export function getCanonicalFileName(fileName: string): string {
550-
return sys.useCaseSensitiveFileNames ? fileName : fileName.toLowerCase();
553+
return ts.sys.useCaseSensitiveFileNames ? fileName : fileName.toLowerCase();
551554
}
552555

553556
export function createCompilerHost(inputFiles: { unitName: string; content: string; }[],
@@ -571,7 +574,7 @@ module Harness {
571574
inputFiles.forEach(register);
572575

573576
return {
574-
getCurrentDirectory: sys.getCurrentDirectory,
577+
getCurrentDirectory: ts.sys.getCurrentDirectory,
575578
getCancellationToken: (): any => undefined,
576579
getSourceFile: (fn, languageVersion) => {
577580
if (Object.prototype.hasOwnProperty.call(filemap, getCanonicalFileName(fn))) {
@@ -594,7 +597,7 @@ module Harness {
594597
writeFile,
595598
getCanonicalFileName,
596599
useCaseSensitiveFileNames: () => useCaseSensitiveFileNames,
597-
getNewLine: ()=> sys.newLine
600+
getNewLine: ()=> ts.sys.newLine
598601
};
599602
}
600603

@@ -664,7 +667,7 @@ module Harness {
664667
settingsCallback(null);
665668
}
666669

667-
var useCaseSensitiveFileNames = sys.useCaseSensitiveFileNames;
670+
var useCaseSensitiveFileNames = ts.sys.useCaseSensitiveFileNames;
668671
this.settings.forEach(setting => {
669672
switch (setting.flag.toLowerCase()) {
670673
// "filename", "comments", "declaration", "module", "nolib", "sourcemap", "target", "out", "outdir", "noimplicitany", "noresolve"
@@ -742,7 +745,7 @@ module Harness {
742745

743746
case 'newline':
744747
case 'newlines':
745-
sys.newLine = setting.value;
748+
ts.sys.newLine = setting.value;
746749
break;
747750

748751
case 'comments':
@@ -817,11 +820,11 @@ module Harness {
817820
});
818821
this.lastErrors = errors;
819822

820-
var result = new CompilerResult(fileOutputs, errors, program, sys.getCurrentDirectory(), emitResult ? emitResult.sourceMaps : undefined);
823+
var result = new CompilerResult(fileOutputs, errors, program, ts.sys.getCurrentDirectory(), emitResult ? emitResult.sourceMaps : undefined);
821824
onComplete(result, checker);
822825

823826
// reset what newline means in case the last test changed it
824-
sys.newLine = '\r\n';
827+
ts.sys.newLine = '\r\n';
825828
return options;
826829
}
827830

@@ -916,7 +919,7 @@ module Harness {
916919
errorOutput += diagnotic.filename + "(" + diagnotic.line + "," + diagnotic.character + "): ";
917920
}
918921

919-
errorOutput += diagnotic.category + " TS" + diagnotic.code + ": " + diagnotic.message + sys.newLine;
922+
errorOutput += diagnotic.category + " TS" + diagnotic.code + ": " + diagnotic.message + ts.sys.newLine;
920923
});
921924

922925
return errorOutput;
@@ -1014,7 +1017,7 @@ module Harness {
10141017
assert.equal(totalErrorsReported + numLibraryDiagnostics, diagnostics.length, 'total number of errors');
10151018

10161019
return minimalDiagnosticsToString(diagnostics) +
1017-
sys.newLine + sys.newLine + outputLines.join('\r\n');
1020+
ts.sys.newLine + ts.sys.newLine + outputLines.join('\r\n');
10181021
}
10191022

10201023
export function collateOutputs(outputFiles: Harness.Compiler.GeneratedFile[], clean?: (s: string) => string) {

‎src/harness/projectsRunner.ts

+12-12
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class ProjectRunner extends RunnerBase {
6060
var testCase: ProjectRunnerTestCase;
6161

6262
try {
63-
var testFileText = sys.readFile(testCaseFileName);
63+
var testFileText = ts.sys.readFile(testCaseFileName);
6464
}
6565
catch (e) {
6666
assert(false, "Unable to open testcase file: " + testCaseFileName + ": " + e.message);
@@ -96,7 +96,7 @@ class ProjectRunner extends RunnerBase {
9696
}
9797

9898
function cleanProjectUrl(url: string) {
99-
var diskProjectPath = ts.normalizeSlashes(sys.resolvePath(testCase.projectRoot));
99+
var diskProjectPath = ts.normalizeSlashes(ts.sys.resolvePath(testCase.projectRoot));
100100
var projectRootUrl = "file:///" + diskProjectPath;
101101
var normalizedProjectRoot = ts.normalizeSlashes(testCase.projectRoot);
102102
diskProjectPath = diskProjectPath.substr(0, diskProjectPath.lastIndexOf(normalizedProjectRoot));
@@ -119,7 +119,7 @@ class ProjectRunner extends RunnerBase {
119119
}
120120

121121
function getCurrentDirectory() {
122-
return sys.resolvePath(testCase.projectRoot);
122+
return ts.sys.resolvePath(testCase.projectRoot);
123123
}
124124

125125
function compileProjectFiles(moduleKind: ts.ModuleKind, getInputFiles: ()=> string[],
@@ -161,8 +161,8 @@ class ProjectRunner extends RunnerBase {
161161
sourceMap: !!testCase.sourceMap,
162162
out: testCase.out,
163163
outDir: testCase.outDir,
164-
mapRoot: testCase.resolveMapRoot && testCase.mapRoot ? sys.resolvePath(testCase.mapRoot) : testCase.mapRoot,
165-
sourceRoot: testCase.resolveSourceRoot && testCase.sourceRoot ? sys.resolvePath(testCase.sourceRoot) : testCase.sourceRoot,
164+
mapRoot: testCase.resolveMapRoot && testCase.mapRoot ? ts.sys.resolvePath(testCase.mapRoot) : testCase.mapRoot,
165+
sourceRoot: testCase.resolveSourceRoot && testCase.sourceRoot ? ts.sys.resolvePath(testCase.sourceRoot) : testCase.sourceRoot,
166166
module: moduleKind,
167167
noResolve: testCase.noResolve
168168
};
@@ -190,8 +190,8 @@ class ProjectRunner extends RunnerBase {
190190
writeFile,
191191
getCurrentDirectory,
192192
getCanonicalFileName: Harness.Compiler.getCanonicalFileName,
193-
useCaseSensitiveFileNames: () => sys.useCaseSensitiveFileNames,
194-
getNewLine: () => sys.newLine
193+
useCaseSensitiveFileNames: () => ts.sys.useCaseSensitiveFileNames,
194+
getNewLine: () => ts.sys.newLine
195195
};
196196
}
197197
}
@@ -213,7 +213,7 @@ class ProjectRunner extends RunnerBase {
213213

214214
function getSourceFileText(filename: string): string {
215215
try {
216-
var text = sys.readFile(ts.isRootedDiskPath(filename)
216+
var text = ts.sys.readFile(ts.isRootedDiskPath(filename)
217217
? filename
218218
: ts.normalizeSlashes(testCase.projectRoot) + "/" + ts.normalizeSlashes(filename));
219219
}
@@ -260,14 +260,14 @@ class ProjectRunner extends RunnerBase {
260260
// Actual writing of file as in tc.ts
261261
function ensureDirectoryStructure(directoryname: string) {
262262
if (directoryname) {
263-
if (!sys.directoryExists(directoryname)) {
263+
if (!ts.sys.directoryExists(directoryname)) {
264264
ensureDirectoryStructure(ts.getDirectoryPath(directoryname));
265-
sys.createDirectory(directoryname);
265+
ts.sys.createDirectory(directoryname);
266266
}
267267
}
268268
}
269269
ensureDirectoryStructure(ts.getDirectoryPath(ts.normalizePath(outputFilePath)));
270-
sys.writeFile(outputFilePath, data, writeByteOrderMark);
270+
ts.sys.writeFile(outputFilePath, data, writeByteOrderMark);
271271

272272
outputFiles.push({ emittedFileName: filename, code: data, fileName: diskRelativeName, writeByteOrderMark: writeByteOrderMark });
273273
}
@@ -374,7 +374,7 @@ class ProjectRunner extends RunnerBase {
374374
it('Baseline of emitted result (' + moduleNameToString(compilerResult.moduleKind) + '): ' + testCaseFileName, () => {
375375
Harness.Baseline.runBaseline('Baseline of emitted result (' + moduleNameToString(compilerResult.moduleKind) + '): ' + testCaseFileName, getBaselineFolder(compilerResult.moduleKind) + outputFile.fileName, () => {
376376
try {
377-
return sys.readFile(getProjectOutputFolder(outputFile.fileName, compilerResult.moduleKind));
377+
return ts.sys.readFile(getProjectOutputFolder(outputFile.fileName, compilerResult.moduleKind));
378378
}
379379
catch (e) {
380380
return undefined;

‎src/harness/runner.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,6 @@ if (runners.length === 0) {
9494
//runners.push(new GeneratedFourslashRunner());
9595
}
9696

97-
sys.newLine = '\r\n';
97+
ts.sys.newLine = '\r\n';
9898

9999
runTests(runners);

‎src/harness/rwcRunner.ts

+8-8
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@
66

77
module RWC {
88
function runWithIOLog(ioLog: IOLog, fn: () => void) {
9-
var oldSys = sys;
9+
var oldSys = ts.sys;
1010

11-
var wrappedSys = Playback.wrapSystem(sys);
11+
var wrappedSys = Playback.wrapSystem(ts.sys);
1212
wrappedSys.startReplayFromData(ioLog);
13-
sys = wrappedSys;
13+
ts.sys = wrappedSys;
1414

1515
try {
1616
fn();
1717
} finally {
1818
wrappedSys.endReplay();
19-
sys = oldSys;
19+
ts.sys = oldSys;
2020
}
2121
}
2222

@@ -74,7 +74,7 @@ module RWC {
7474
}
7575

7676
ts.forEach(ioLog.filesRead, fileRead => {
77-
var resolvedPath = ts.normalizeSlashes(sys.resolvePath(fileRead.path));
77+
var resolvedPath = ts.normalizeSlashes(ts.sys.resolvePath(fileRead.path));
7878
var inInputList = ts.forEach(inputFiles, inputFile=> inputFile.unitName === resolvedPath);
7979
if (!inInputList) {
8080
// Add the file to other files
@@ -92,9 +92,9 @@ module RWC {
9292
});
9393

9494
function getHarnessCompilerInputUnit(fileName: string) {
95-
var unitName = ts.normalizeSlashes(sys.resolvePath(fileName));
95+
var unitName = ts.normalizeSlashes(ts.sys.resolvePath(fileName));
9696
try {
97-
var content = sys.readFile(unitName);
97+
var content = ts.sys.readFile(unitName);
9898
}
9999
catch (e) {
100100
// Leave content undefined.
@@ -160,7 +160,7 @@ module RWC {
160160
}
161161

162162
return Harness.Compiler.minimalDiagnosticsToString(declFileCompilationResult.declResult.errors) +
163-
sys.newLine + sys.newLine +
163+
ts.sys.newLine + ts.sys.newLine +
164164
Harness.Compiler.getErrorBaseline(declFileCompilationResult.declInputFiles.concat(declFileCompilationResult.declOtherFiles), declFileCompilationResult.declResult.errors);
165165
}, false, baselineOpts);
166166
}

0 commit comments

Comments
 (0)