microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-20 10:29:36 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Merge pull request #9798 from RyanCavanaugh/fix_9785

Browse Source 
Provide complete path of tsconfig.json file
This commit is contained in:
Ryan Cavanaugh 2016-07-18 14:35:08 -07:00 committed by GitHub
commit 3d3ae29bad
3 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/compiler/tsc.ts
View File

@ -380,7 +380,8 @@ namespace ts {
sys.exit(ExitStatus.DiagnosticsPresent_OutputsSkipped);
return;
}
const configParseResult = parseJsonConfigFileContent(configObject, sys, getNormalizedAbsolutePath(getDirectoryPath(configFileName), sys.getCurrentDirectory()), commandLine.options, configFileName);
const cwd = sys.getCurrentDirectory();
const configParseResult = parseJsonConfigFileContent(configObject, sys, getNormalizedAbsolutePath(getDirectoryPath(configFileName), cwd), commandLine.options, getNormalizedAbsolutePath(configFileName, cwd));
if (configParseResult.errors.length > 0) {
reportDiagnostics(configParseResult.errors, /* compilerHost */ undefined);
sys.exit(ExitStatus.DiagnosticsPresent_OutputsSkipped);

20
tests/baselines/reference/umdGlobalMerge.errors.txt Normal file
View File

@ -0,0 +1,20 @@
tests/cases/compiler/b.d.ts(2,20): error TS2305: Module '"tests/cases/compiler/a".ns' has no exported member 'IFoo'.
==== tests/cases/compiler/a.d.ts (0 errors) ====
export = ns;
export as namespace ns;
declare namespace ns {
export var x: number;
export interface IFoo { }
}
==== tests/cases/compiler/b.d.ts (1 errors) ====
declare namespace ns.something {
export var p: ns.IFoo;
~~~~
!!! error TS2305: Module '"tests/cases/compiler/a".ns' has no exported member 'IFoo'.
}

14
tests/cases/compiler/umdGlobalMerge.ts Normal file
View File

@ -0,0 +1,14 @@
// @filename: a.d.ts
export = ns;
export as namespace ns;
declare namespace ns {
export var x: number;
export interface IFoo { }
}
// @filename: b.d.ts
declare namespace ns.something {
export var p: ns.IFoo;
}