Skip to content

Commit 8b9e351

Browse files
committed
- renaming resolveTypeDefinitions to discoverTypings for consistency with jsTypings
- simplifying typingOptions parsing after associated managed host changes
1 parent 0de8f9e commit 8b9e351

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
@@ -230,7 +230,7 @@ namespace ts {
230230
getPreProcessedFileInfo(fileName: string, sourceText: IScriptSnapshot): string;
231231
getTSConfigFileInfo(fileName: string, sourceText: IScriptSnapshot): string;
232232
getDefaultCompilationSettings(): string;
233-
resolveTypeDefinitions(fileNamesJson: string, globalCachePath: string, projectRootPath: string, typingOptionsJson: string, compilerOptionsJson: string): string;
233+
discoverTypings(fileNamesJson: string, globalCachePath: string, projectRootPath: string, typingOptionsJson: string, compilerOptionsJson: string): string;
234234
updateNotFoundTypingNames(newTypingsJson: string, globalCachePath: string, projectRootPath: string): string;
235235
}
236236

@@ -986,14 +986,11 @@ namespace ts {
986986
);
987987
}
988988

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

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

0 commit comments

Comments
 (0)