Skip to content
This repository was archived by the owner on Jan 2, 2021. It is now read-only.

Commit 4852be4

Browse files
committed
fix: do not resolve relative paths
1 parent c40577a commit 4852be4

File tree

1 file changed

+14
-9
lines changed

1 file changed

+14
-9
lines changed

src/index.ts

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,19 @@ function init(modules: { typescript: typeof ts_module }):
2525
return undefined as any;
2626
}
2727

28+
function defaultTypescriptResolver(moduleName: string, containingFile: string,
29+
info: ts.server.PluginCreateInfo, resolveModuleNames: any): ts_module.ResolvedModule | undefined {
30+
if (!moduleName.startsWith('.') && resolveModuleNames) {
31+
// info.project.projectService.logger.info(`Resolve ${moduleName} on orig LSHost`);
32+
const result = resolveModuleNames.call(info.languageServiceHost, [moduleName],
33+
containingFile) as ts_module.ResolvedModule[];
34+
if (result && result.length > 0) {
35+
return result[0];
36+
}
37+
}
38+
return undefined;
39+
}
40+
2841
function create(info: ts.server.PluginCreateInfo): ts.LanguageService {
2942
info.project.projectService.logger.info('Configuring patternplate resolver for typescript');
3043
const resolveModuleNames = info.languageServiceHost.resolveModuleNames;
@@ -43,15 +56,7 @@ function init(modules: { typescript: typeof ts_module }):
4356
return resolvedModule;
4457
}
4558
}
46-
if (resolveModuleNames) {
47-
// info.project.projectService.logger.info(`Resolve ${moduleName} on orig LSHost`);
48-
const result = resolveModuleNames.call(info.languageServiceHost, [moduleName],
49-
containingFile) as ts_module.ResolvedModule[];
50-
if (result && result.length > 0) {
51-
return result[0];
52-
}
53-
}
54-
return undefined;
59+
return defaultTypescriptResolver(moduleName, containingFile, info, resolveModuleNames);
5560
});
5661
if (resolvedNames && resolvedNames.length > 0) {
5762
return resolvedNames as any;

0 commit comments

Comments
 (0)