maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

wip

Browse source
This commit is contained in:
Andy Hanson 2017-07-12 13:46:16 -07:00
parent 9ba85fba04
commit 605f60cd4f
4 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/compiler/moduleNameResolver.ts
View file

@ -686,7 +686,7 @@ namespace ts {
const { resolvedModule, failedLookupLocations } =
nodeModuleNameResolverWorker(moduleName, initialDir, { moduleResolution: ts.ModuleResolutionKind.NodeJs, allowJs: true }, host, /*cache*/ undefined, /*jsOnly*/ true);
if (!resolvedModule) {
throw new Error(`Could not resolve JS module '${moduleName}' starting at '${initialDir}'. Looked in: ${failedLookupLocations.join(", ")}`);
throw new Error(`Could not resolve JS module ${moduleName} starting at ${initialDir}. Looked in: ${failedLookupLocations.join(", ")}`);
}
return resolvedModule.resolvedFileName;
}

2
src/harness/harnessLanguageService.ts
View file

@ -795,7 +795,7 @@ namespace Harness.LanguageService {
default:
return {
module: undefined,
error: new Error("Could not resolve module")
error: "Could not resolve module"
};
}

8
src/server/project.ts
View file

@ -173,8 +173,7 @@ namespace ts.server {
log(`Loading ${moduleName} from ${initialDir} (resolved to ${resolvedPath})`);
const result = host.require(resolvedPath, moduleName);
if (result.error) {
const err = result.error.stack || JSON.stringify(result.error);
log(`Failed to load module ${resolvedPath}: ${err}`);
log(`Failed to load module: ${JSON.stringify(result.error)}`);
return undefined;
}
return result.module;
@ -1012,11 +1011,6 @@ namespace ts.server {
};
for (const searchPath of searchPaths) {
try {
Debug.assert(!!pluginConfigEntry.name);
} catch (e) {
console.error(e.stack);
}
const resolvedModule = <PluginModuleFactory>Project.resolveModule(pluginConfigEntry.name, searchPath, this.projectService.host, log);
if (resolvedModule) {
this.enableProxy(resolvedModule, pluginConfigEntry);

2
src/server/types.ts
View file

@ -9,7 +9,7 @@ declare namespace ts.server {
data: any;
}
type RequireResult = { module: {}, error: undefined } | { module: undefined, error: { stack?: string } };
type RequireResult = { module: {}, error: undefined } | { module: undefined, error: {} };
export interface ServerHost extends System {
setTimeout(callback: (...args: any[]) => void, ms: number, ...args: any[]): any;
clearTimeout(timeoutId: any): void;