Skip to content

Commit 8245f62

Browse files
committed
Update Harness.compileFiles to use vfs
1 parent 7d08d74 commit 8245f62

File tree

790 files changed

+5086
-4477
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

790 files changed

+5086
-4477
lines changed

Jakefile.js

+1-82
Original file line numberDiff line numberDiff line change
@@ -91,88 +91,7 @@ var languageServiceLibrarySources = filesFromConfig(path.join(serverDirectory, "
9191

9292
var typesMapOutputPath = path.join(builtLocalDirectory, 'typesMap.json');
9393

94-
var harnessCoreSources = [
95-
"harness.ts",
96-
"collections.ts",
97-
"vpath.ts",
98-
"events.ts",
99-
"vfs.ts",
100-
"virtualFileSystemWithWatch.ts",
101-
"sourceMapRecorder.ts",
102-
"harnessLanguageService.ts",
103-
"fourslash.ts",
104-
"runnerbase.ts",
105-
"compilerRunner.ts",
106-
"typeWriter.ts",
107-
"fourslashRunner.ts",
108-
"projectsRunner.ts",
109-
"loggedIO.ts",
110-
"rwcRunner.ts",
111-
"userRunner.ts",
112-
"test262Runner.ts",
113-
"./parallel/shared.ts",
114-
"./parallel/host.ts",
115-
"./parallel/worker.ts",
116-
"runner.ts"
117-
].map(function (f) {
118-
return path.join(harnessDirectory, f);
119-
});
120-
121-
var harnessSources = harnessCoreSources.concat([
122-
"incrementalParser.ts",
123-
"jsDocParsing.ts",
124-
"services/colorization.ts",
125-
"services/documentRegistry.ts",
126-
"services/preProcessFile.ts",
127-
"services/patternMatcher.ts",
128-
"session.ts",
129-
"versionCache.ts",
130-
"convertToBase64.ts",
131-
"transpile.ts",
132-
"reuseProgramStructure.ts",
133-
"textStorage.ts",
134-
"moduleResolution.ts",
135-
"tsconfigParsing.ts",
136-
"builder.ts",
137-
"commandLineParsing.ts",
138-
"configurationExtension.ts",
139-
"convertCompilerOptionsFromJson.ts",
140-
"convertTypeAcquisitionFromJson.ts",
141-
"tsserverProjectSystem.ts",
142-
"tscWatchMode.ts",
143-
"compileOnSave.ts",
144-
"typingsInstaller.ts",
145-
"projectErrors.ts",
146-
"matchFiles.ts",
147-
"initializeTSConfig.ts",
148-
"extractConstants.ts",
149-
"extractFunctions.ts",
150-
"extractRanges.ts",
151-
"extractTestHelpers.ts",
152-
"printer.ts",
153-
"textChanges.ts",
154-
"telemetry.ts",
155-
"transform.ts",
156-
"customTransforms.ts",
157-
"programMissingFiles.ts",
158-
"symbolWalker.ts",
159-
"languageService.ts",
160-
"publicApi.ts",
161-
"hostNewLineSupport.ts",
162-
].map(function (f) {
163-
return path.join(unittestsDirectory, f);
164-
})).concat([
165-
"protocol.ts",
166-
"utilities.ts",
167-
"scriptVersionCache.ts",
168-
"scriptInfo.ts",
169-
"project.ts",
170-
"typingsCache.ts",
171-
"editorServices.ts",
172-
"session.ts",
173-
].map(function (f) {
174-
return path.join(serverDirectory, f);
175-
}));
94+
var harnessSources = filesFromConfig("./src/harness/tsconfig.json");
17695

17796
var es2015LibrarySources = [
17897
"es2015.core.d.ts",

src/compiler/core.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1749,7 +1749,7 @@ namespace ts {
17491749
}
17501750

17511751
function getDiagnosticFileName(diagnostic: Diagnostic): string {
1752-
return diagnostic.file ? diagnostic.file.fileName : undefined;
1752+
return diagnostic.file ? diagnostic.file.path : undefined;
17531753
}
17541754

17551755
export function compareDiagnostics(d1: Diagnostic, d2: Diagnostic): Comparison {

src/compiler/emitter.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ namespace ts {
5050
// JavaScript files are always LanguageVariant.JSX, as JSX syntax is allowed in .js files also.
5151
// So for JavaScript files, '.jsx' is only emitted if the input was '.jsx', and JsxEmit.Preserve.
5252
// For TypeScript, the only time to emit with a '.jsx' extension, is on JSX input, and JsxEmit.Preserve
53-
function getOutputExtension(sourceFile: SourceFile, options: CompilerOptions): Extension {
53+
/* @internal */
54+
export function getOutputExtension(sourceFile: SourceFile, options: CompilerOptions): Extension {
5455
if (options.jsx === JsxEmit.Preserve) {
5556
if (isSourceFileJavaScript(sourceFile)) {
5657
if (fileExtensionIs(sourceFile.fileName, Extension.Jsx)) {

0 commit comments

Comments
 (0)