microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-19 20:37:00 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

- renaming resolveTypeDefinitions to discoverTypings for consistency with jsTypings

Browse Source 
- simplifying typingOptions parsing after associated managed host changes
This commit is contained in:
Jason Ramsay
2016-02-25 12:32:43 -08:00
parent 18883f9d32
commit 70ca4bd8a8
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/services/shims.ts
View File

@@ -232,7 +232,7 @@ namespace ts {
getPreProcessedFileInfo(fileName: string, sourceText: IScriptSnapshot): string;
getTSConfigFileInfo(fileName: string, sourceText: IScriptSnapshot): string;
getDefaultCompilationSettings(): string;
resolveTypeDefinitions(fileNamesJson: string, globalCachePath: string, projectRootPath: string, typingOptionsJson: string, compilerOptionsJson: string): string;
discoverTypings(fileNamesJson: string, globalCachePath: string, projectRootPath: string, typingOptionsJson: string, compilerOptionsJson: string): string;
updateNotFoundTypingNames(newTypingsJson: string, globalCachePath: string, projectRootPath: string): string;
}
@@ -988,14 +988,11 @@ namespace ts {
);
}
public resolveTypeDefinitions(fileNamesJson: string, globalCachePath: string, projectRootPath: string, typingOptionsJson: string, compilerOptionsJson: string): string {
public discoverTypings(fileNamesJson: string, globalCachePath: string, projectRootPath: string, typingOptionsJson: string, compilerOptionsJson: string): string {
const getCanonicalFileName = createGetCanonicalFileName(/*useCaseSensitivefileNames:*/ false);
return this.forwardJSONCall("resolveTypeDefinitions()", () => {
return this.forwardJSONCall("discoverTypings()", () => {
const cachePath = projectRootPath ? projectRootPath : globalCachePath;
const typingOptions = <TypingOptions>JSON.parse(typingOptionsJson);
// Convert the include and exclude lists from a semi-colon delimited string to a string array
typingOptions.include = typingOptions.include ? typingOptions.include.toString().split(";") : [];
typingOptions.exclude = typingOptions.exclude ? typingOptions.exclude.toString().split(";") : [];
const compilerOptions = <CompilerOptions>JSON.parse(compilerOptionsJson);
const fileNames: string[] = JSON.parse(fileNamesJson);