From 70ca4bd8a85279cf72b737f99303208c3b4739f9 Mon Sep 17 00:00:00 2001 From: Jason Ramsay Date: Thu, 25 Feb 2016 12:32:43 -0800 Subject: [PATCH] - renaming resolveTypeDefinitions to discoverTypings for consistency with jsTypings - simplifying typingOptions parsing after associated managed host changes --- src/services/shims.ts | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/services/shims.ts b/src/services/shims.ts index add936a6a79..47a64ab58f6 100644 --- a/src/services/shims.ts +++ b/src/services/shims.ts @@ -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 = 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 = JSON.parse(compilerOptionsJson); const fileNames: string[] = JSON.parse(fileNamesJson);