Skip to content

Commit 9b6f930

Browse files
authored
support untyped imports in shims (microsoft#13758)
1 parent d38bc54 commit 9b6f930

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

src/services/shims.ts

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,10 @@ namespace ts {
385385
if (settingsJson == null || settingsJson == "") {
386386
throw Error("LanguageServiceShimHostAdapter.getCompilationSettings: empty compilationSettings");
387387
}
388-
return <CompilerOptions>JSON.parse(settingsJson);
388+
const compilerOptions = <CompilerOptions>JSON.parse(settingsJson);
389+
// permit language service to handle all files (filtering should be performed on the host side)
390+
compilerOptions.allowNonTsExtensions = true;
391+
return compilerOptions;
389392
}
390393

391394
public getScriptFileNames(): string[] {
@@ -1061,12 +1064,6 @@ namespace ts {
10611064
const compilerOptions = <CompilerOptions>JSON.parse(compilerOptionsJson);
10621065
const result = resolveModuleName(moduleName, normalizeSlashes(fileName), compilerOptions, this.host);
10631066
const resolvedFileName = result.resolvedModule ? result.resolvedModule.resolvedFileName : undefined;
1064-
if (resolvedFileName && !compilerOptions.allowJs && fileExtensionIs(resolvedFileName, ".js")) {
1065-
return {
1066-
resolvedFileName: undefined,
1067-
failedLookupLocations: []
1068-
};
1069-
}
10701067
return {
10711068
resolvedFileName,
10721069
failedLookupLocations: result.failedLookupLocations

0 commit comments

Comments
 (0)