maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #8469 from Microsoft/tsconfigParsingImprovements

Browse source 
Add propertybag to parsed tsconfig.json file.
This commit is contained in:
Paul van Brenk 2016-05-06 13:33:01 -07:00
parent 49913fda83 88da665dff
commit fad25747a7
3 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/compiler/commandLineParser.ts
View file

@ -667,6 +667,7 @@ namespace ts {
const compilerOptions: CompilerOptions = convertCompilerOptionsFromJsonWorker(json["compilerOptions"], basePath, errors, configFileName);
const options = extend(existingOptions, compilerOptions);
const typingOptions: TypingOptions = convertTypingOptionsFromJsonWorker(json["typingOptions"], basePath, errors, configFileName);
options.configFilePath = configFileName;
const fileNames = getFileNames(errors);
@ -675,6 +676,7 @@ namespace ts {
options,
fileNames,
typingOptions,
raw: json,
errors
};

1
src/compiler/types.ts
View file

@ -2596,6 +2596,7 @@ namespace ts {
options: CompilerOptions;
typingOptions?: TypingOptions;
fileNames: string[];
raw?: any;
errors: Diagnostic[];
}

2
src/services/shims.ts
View file

@ -1001,6 +1001,7 @@ namespace ts {
options: {},
typingOptions: {},
files: [],
raw: {},
errors: [realizeDiagnostic(result.error, "\r\n")]
};
}
@ -1012,6 +1013,7 @@ namespace ts {
options: configFile.options,
typingOptions: configFile.typingOptions,
files: configFile.fileNames,
raw: configFile.raw,
errors: realizeDiagnostics(configFile.errors, "\r\n")
};
});