Skip to content

Commit 70ca4bd

Browse files
committed
- renaming resolveTypeDefinitions to discoverTypings for consistency with jsTypings
- simplifying typingOptions parsing after associated managed host changes
1 parent 18883f9 commit 70ca4bd

1 file changed

Lines changed: 3 additions & 6 deletions

File tree

src/services/shims.ts

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ namespace ts {
232232
getPreProcessedFileInfo(fileName: string, sourceText: IScriptSnapshot): string;
233233
getTSConfigFileInfo(fileName: string, sourceText: IScriptSnapshot): string;
234234
getDefaultCompilationSettings(): string;
235-
resolveTypeDefinitions(fileNamesJson: string, globalCachePath: string, projectRootPath: string, typingOptionsJson: string, compilerOptionsJson: string): string;
235+
discoverTypings(fileNamesJson: string, globalCachePath: string, projectRootPath: string, typingOptionsJson: string, compilerOptionsJson: string): string;
236236
updateNotFoundTypingNames(newTypingsJson: string, globalCachePath: string, projectRootPath: string): string;
237237
}
238238

@@ -988,14 +988,11 @@ namespace ts {
988988
);
989989
}
990990

991-
public resolveTypeDefinitions(fileNamesJson: string, globalCachePath: string, projectRootPath: string, typingOptionsJson: string, compilerOptionsJson: string): string {
991+
public discoverTypings(fileNamesJson: string, globalCachePath: string, projectRootPath: string, typingOptionsJson: string, compilerOptionsJson: string): string {
992992
const getCanonicalFileName = createGetCanonicalFileName(/*useCaseSensitivefileNames:*/ false);
993-
return this.forwardJSONCall("resolveTypeDefinitions()", () => {
993+
return this.forwardJSONCall("discoverTypings()", () => {
994994
const cachePath = projectRootPath ? projectRootPath : globalCachePath;
995995
const typingOptions = <TypingOptions>JSON.parse(typingOptionsJson);
996-
// Convert the include and exclude lists from a semi-colon delimited string to a string array
997-
typingOptions.include = typingOptions.include ? typingOptions.include.toString().split(";") : [];
998-
typingOptions.exclude = typingOptions.exclude ? typingOptions.exclude.toString().split(";") : [];
999996

1000997
const compilerOptions = <CompilerOptions>JSON.parse(compilerOptionsJson);
1001998
const fileNames: string[] = JSON.parse(fileNamesJson);

0 commit comments

Comments
 (0)