Skip to content

Commit 0af868f

Browse files
angelestelar5zbasarat
authored andcommitted
fix(tsconfig) the in memory project gets its files expanded and made consistent
closes TypeStrong/atom-typescript#213
1 parent 0c9d18d commit 0af868f

File tree

2 files changed

+24
-15
lines changed

2 files changed

+24
-15
lines changed

dist/main/tsconfig/tsconfig.js

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -203,17 +203,20 @@ function tsToRawCompilerOptions(compilerOptions) {
203203
}
204204
function getDefaultProject(srcFile) {
205205
var dir = fs.lstatSync(srcFile).isDirectory() ? srcFile : path.dirname(srcFile);
206+
var project = {
207+
compilerOptions: exports.defaults,
208+
files: [
209+
srcFile
210+
],
211+
formatCodeOptions: formatting.defaultFormatCodeOptions(),
212+
compileOnSave: true
213+
};
214+
project.files = increaseProjectForReferenceAndImports(project.files);
215+
project.files = uniq(project.files.map(consistentPath));
206216
return {
207217
projectFileDirectory: dir,
208218
projectFilePath: dir + '/' + projectFileName,
209-
project: {
210-
compilerOptions: exports.defaults,
211-
files: [
212-
srcFile
213-
],
214-
formatCodeOptions: formatting.defaultFormatCodeOptions(),
215-
compileOnSave: true
216-
}
219+
project: project
217220
};
218221
}
219222
exports.getDefaultProject = getDefaultProject;

lib/main/tsconfig/tsconfig.ts

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -242,15 +242,21 @@ function tsToRawCompilerOptions(compilerOptions: ts.CompilerOptions): CompilerOp
242242

243243
export function getDefaultProject(srcFile: string): TypeScriptProjectFileDetails {
244244
var dir = fs.lstatSync(srcFile).isDirectory() ? srcFile : path.dirname(srcFile);
245+
246+
var project = {
247+
compilerOptions: defaults,
248+
files: [srcFile],
249+
formatCodeOptions: formatting.defaultFormatCodeOptions(),
250+
compileOnSave: true
251+
};
252+
253+
project.files = increaseProjectForReferenceAndImports(project.files);
254+
project.files = uniq(project.files.map(consistentPath));
255+
245256
return {
246257
projectFileDirectory: dir,
247258
projectFilePath: dir + '/' + projectFileName,
248-
project: {
249-
compilerOptions: defaults,
250-
files: [srcFile],
251-
formatCodeOptions: formatting.defaultFormatCodeOptions(),
252-
compileOnSave: true
253-
}
259+
project: project
254260
};
255261
}
256262

@@ -390,7 +396,7 @@ export function consistentPath(filePath: string): string {
390396
/////////////// UTILITIES ///////////////////
391397
/////////////////////////////////////////////
392398

393-
function increaseProjectForReferenceAndImports(files: string[]) {
399+
function increaseProjectForReferenceAndImports(files: string[]): string[] {
394400

395401
var filesMap = simpleValidator.createMap(files);
396402
var willNeedMoreAnalysis = (file: string) => {

0 commit comments

Comments
 (0)