8000 Merge pull request #7066 from Microsoft/portClassicResolutionFix · nycdotnet/TypeScript@ddc0778 · GitHub
[go: up one dir, main page]
Skip to content

Commit ddc0778

Browse files
billtibillti
committed
Merge pull request microsoft#7066 from Microsoft/portClassicResolutionFix
Fix fallback to classic resolution
2 parents 8ca031e + 0b6e965 commit ddc0778

File tree

53 files changed

+84
-79
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+84
-79
lines changed

‎src/compiler/program.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ namespace ts {
3939
export function resolveModuleName(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost): ResolvedModuleWithFailedLookupLocations {
4040
const moduleResolution = compilerOptions.moduleResolution !== undefined
4141
? compilerOptions.moduleResolution
42-
: compilerOptions.module === ModuleKind.CommonJS ? ModuleResolutionKind.NodeJs : ModuleResolutionKind.Classic;
42+
: getEmitModuleKind(compilerOptions) === ModuleKind.CommonJS ? ModuleResolutionKind.NodeJs : ModuleResolutionKind.Classic;
4343

4444
switch (moduleResolution) {
4545
case ModuleResolutionKind.NodeJs: return nodeModuleNameResolver(moduleName, containingFile, compilerOptions, host);

‎tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ export module m {
66
}
77

88
//// [importAliasAnExternalModuleInsideAnInternalModule_file1.ts]
9-
import r = require('importAliasAnExternalModuleInsideAnInternalModule_file0');
9+
import r = require('./importAliasAnExternalModuleInsideAnInternalModule_file0');
1010
module m_private {
1111
//import r2 = require('m'); // would be error
1212
export import C = r; // no error
@@ -23,7 +23,7 @@ var m;
2323
})(m = exports.m || (exports.m = {}));
2424
//// [importAliasAnExternalModuleInsideAnInternalModule_file1.js]
2525
"use strict";
26-
var r = require('importAliasAnExternalModuleInsideAnInternalModule_file0');
26+
var r = require('./importAliasAnExternalModuleInsideAnInternalModule_file0');
2727
var m_private;
2828
(function (m_private) {
2929
//import r2 = require('m'); // would be error

‎tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.symbols

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
=== tests/cases/compiler/importAliasAnExternalModuleInsideAnInternalModule_file1.ts ===
2-
import r = require('importAliasAnExternalModuleInsideAnInternalModule_file0');
2+
import r = require('./importAliasAnExternalModuleInsideAnInternalModule_file0');
33
>r : Symbol(r, Decl(importAliasAnExternalModuleInsideAnInternalModule_file1.ts, 0, 0))
44

55
module m_private {
6-
>m_private : Symbol(m_private, Decl(importAliasAnExternalModuleInsideAnInternalModule_file1.ts, 0, 78))
6+
>m_private : Symbol(m_private, Decl(importAliasAnExternalModuleInsideAnInternalModule_file1.ts, 0, 80))
77

88
//import r2 = require('m'); // would be error
99
export import C = r; // no error

‎tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.types

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
=== tests/cases/compiler/importAliasAnExternalModuleInsideAnInternalModule_file1.ts ===
2-
import r = require('importAliasAnExternalModuleInsideAnInternalModule_file0');
2+
import r = require('./importAliasAnExternalModuleInsideAnInternalModule_file0');
33
>r : typeof r
44

55
module m_private {

‎tests/cases/compiler/importAliasAnExternalModuleInsideAnInternalModule.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ export module m {
44
}
55

66
// @Filename: importAliasAnExternalModuleInsideAnInternalModule_file1.ts
7-
import r = require('importAliasAnExternalModuleInsideAnInternalModule_file0');
7+
import r = require('./importAliasAnExternalModuleInsideAnInternalModule_file0');
88
module m_private {
99
//import r2 = require('m'); // would be error
1010
export import C = r; // no error

‎tests/cases/conformance/externalModules/relativePathToDeclarationFile.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// @ModuleResolution: classic
12
// @Filename: test/foo.d.ts
23
export declare module M2 {
34
export var x: boolean;

‎tests/cases/fourslash/cancellationWhenfindingAllRefsOnDefinition.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
////}
1818

1919
//@Filename: findAllRefsOnDefinition.ts
20-
////import Second = require("findAllRefsOnDefinition-import");
20+
////import Second = require("./findAllRefsOnDefinition-import");
2121
////
2222
////var second = new Second.Test()
2323
////second.start();

‎tests/cases/fourslash/cloduleAsBaseClass2.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
////export = A;
1616

1717
// @Filename: cloduleAsBaseClass2_1.ts
18-
////import B = require('cloduleAsBaseClass2_0');
18+
////import B = require('./cloduleAsBaseClass2_0');
1919
////class D extends B {
2020
//// constructor() {
2121
//// super(1);

‎tests/cases/fourslash/commentsExternalModules.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
// @Filename: commentsExternalModules_file1.ts
2929
/////**This is on import declaration*/
30-
////import ex/*9*/tMod = require("commentsExternalModules_file0");
30+
////import ex/*9*/tMod = require("./commentsExternalModules_file0");
3131
/////*10*/extMod./*11*/m1./*12*/fooExp/*13q*/ort(/*13*/);
3232
////var new/*14*/Var = new extMod.m1.m2./*15*/c();
3333

@@ -69,10 +69,10 @@ verify.memberListContains("i", "var m1.m2.i: m1.m2.c", "i");
6969

7070
goTo.file("commentsExternalModules_file1.ts");
7171
goTo.marker('9');
72-
verify.quickInfoIs('import extMod = require("commentsExternalModules_file0")', "This is on import declaration");
72+
verify.quickInfoIs('import extMod = require("./commentsExternalModules_file0")', "This is on import declaration");
7373

7474
goTo.marker('10');
75-
verify.completionListContains("extMod", 'import extMod = require("commentsExternalModules_file0")', "This is on import declaration");
75+
verify.completionListContains("extMod", 'import extMod = require("./commentsExternalModules_file0")', "This is on import declaration");
7676

7777
goTo.marker('11');
7878
verify.memberListContains("m1", "namespace extMod.m1");

‎tests/cases/fourslash/commentsImportDeclaration.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@
2020
// @Filename: commentsImportDeclaration_file1.ts
2121
///////<reference path='commentsImportDeclaration_file0.ts'/>
2222
/////** Import declaration*/
23-
////import /*3*/extMod = require("commentsImportDeclaration_file0/*4*/");
23+
////import /*3*/extMod = require("./commentsImportDeclaration_file0/*4*/");
2424
////extMod./*6*/m1./*7*/fooEx/*8q*/port(/*8*/);
2525
////var new/*9*/Var = new extMod.m1.m2./*10*/c();
2626

2727
goTo.marker('2');
2828
verify.quickInfoIs("namespace m1", "NamespaceComment");
2929

3030
goTo.marker('3');
31-
verify.quickInfoIs('import extMod = require("commentsImportDeclaration_file0")', "Import declaration");
31+
verify.quickInfoIs('import extMod = require("./commentsImportDeclaration_file0")', "Import declaration");
3232

3333
goTo.marker('6');
3434
verify.memberListContains("m1", "namespace extMod.m1");

0 commit comments

Comments
 (0)
0