Skip to content

Commit

Permalink
check old strategy behaviour
Browse files Browse the repository at this point in the history
  • Loading branch information
johnnyreilly committed Oct 18, 2017
1 parent cb303f5 commit e576c92
Showing 1 changed file with 13 additions and 1 deletion.
14 changes: 13 additions & 1 deletion src/servicesHost.ts
Expand Up @@ -104,7 +104,7 @@ export function makeServicesHost(
resolveTypeReferenceDirectives: (typeDirectiveNames: string[], containingFile: string) =>
typeDirectiveNames.map(directive =>
compiler.resolveTypeReferenceDirective(directive, containingFile, compilerOptions, moduleResolutionHost).resolvedTypeReferenceDirective),
*/
*/

resolveModuleNames: (moduleNames: string[], containingFile: string) =>
resolveModuleNames(
Expand Down Expand Up @@ -184,12 +184,24 @@ function resolveModuleName(
isExternalLibraryImport: tsResolution.resolvedModule.isExternalLibraryImport
};

// Old strategy
if (resolutionResult!) {
if (resolutionResult!.resolvedFileName === tsResolutionResult.resolvedFileName ||
isJsImplementationOfTypings(resolutionResult!, tsResolutionResult)) {
resolutionResult!.isExternalLibraryImport = tsResolutionResult.isExternalLibraryImport;
}
} else {
resolutionResult = tsResolutionResult;
}

/* New strategy
if (resolutionResult! === undefined ||
resolutionResult!.resolvedFileName === tsResolutionResult.resolvedFileName ||
isJsImplementationOfTypings(resolutionResult!, tsResolutionResult)
) {
resolutionResult = tsResolutionResult;
}
*/
}
return resolutionResult!;
}
Expand Down

0 comments on commit e576c92

Please sign in to comment.