Fix fallback to classic resolution

src/compiler/program.ts

@@ -39,7 +39,7 @@ namespace ts {
     export function resolveModuleName(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost): ResolvedModuleWithFailedLookupLocations {
         const moduleResolution = compilerOptions.moduleResolution !== undefined
             ? compilerOptions.moduleResolution
-            : compilerOptions.module === ModuleKind.CommonJS ? ModuleResolutionKind.NodeJs : ModuleResolutionKind.Classic;
+            : getEmitModuleKind(compilerOptions) === ModuleKind.CommonJS ? ModuleResolutionKind.NodeJs : ModuleResolutionKind.Classic;
 
         switch (moduleResolution) {
             case ModuleResolutionKind.NodeJs: return nodeModuleNameResolver(moduleName, containingFile, compilerOptions, host);

tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.js

@@ -6,7 +6,7 @@ export module m {
 }
 
 //// [importAliasAnExternalModuleInsideAnInternalModule_file1.ts]
-import r = require('importAliasAnExternalModuleInsideAnInternalModule_file0');
+import r = require('./importAliasAnExternalModuleInsideAnInternalModule_file0');
 module m_private {
     //import r2 = require('m'); // would be error
     export import C = r; // no error
@@ -23,7 +23,7 @@ var m;
 })(m = exports.m || (exports.m = {}));
 //// [importAliasAnExternalModuleInsideAnInternalModule_file1.js]
 "use strict";
-var r = require('importAliasAnExternalModuleInsideAnInternalModule_file0');
+var r = require('./importAliasAnExternalModuleInsideAnInternalModule_file0');
 var m_private;
 (function (m_private) {
     //import r2 = require('m'); // would be error

tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.symbols

@@ -1,9 +1,9 @@
 === tests/cases/compiler/importAliasAnExternalModuleInsideAnInternalModule_file1.ts ===
-import r = require('importAliasAnExternalModuleInsideAnInternalModule_file0');
+import r = require('./importAliasAnExternalModuleInsideAnInternalModule_file0');
 >r : Symbol(r, Decl(importAliasAnExternalModuleInsideAnInternalModule_file1.ts, 0, 0))
 
 module m_private {
->m_private : Symbol(m_private, Decl(importAliasAnExternalModuleInsideAnInternalModule_file1.ts, 0, 78))
+>m_private : Symbol(m_private, Decl(importAliasAnExternalModuleInsideAnInternalModule_file1.ts, 0, 80))
 
     //import r2 = require('m'); // would be error
     export import C = r; // no error

tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.types

@@ -1,5 +1,5 @@
 === tests/cases/compiler/importAliasAnExternalModuleInsideAnInternalModule_file1.ts ===
-import r = require('importAliasAnExternalModuleInsideAnInternalModule_file0');
+import r = require('./importAliasAnExternalModuleInsideAnInternalModule_file0');
 >r : typeof r
 
 module m_private {

tests/cases/compiler/importAliasAnExternalModuleInsideAnInternalModule.ts

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

tests/cases/conformance/externalModules/relativePathToDeclarationFile.ts

@@ -1,3 +1,4 @@
+// @ModuleResolution: classic
 // @Filename: test/foo.d.ts
 export declare module M2 {
 	export var x: boolean;

tests/cases/fourslash/cancellationWhenfindingAllRefsOnDefinition.ts

@@ -17,7 +17,7 @@
 ////}
 
 //@Filename: findAllRefsOnDefinition.ts
-////import Second = require("findAllRefsOnDefinition-import");
+////import Second = require("./findAllRefsOnDefinition-import");
 ////
 ////var second = new Second.Test()
 ////second.start();

tests/cases/fourslash/cloduleAsBaseClass2.ts

@@ -15,7 +15,7 @@
 ////export = A;
 
 // @Filename: cloduleAsBaseClass2_1.ts
-////import B = require('cloduleAsBaseClass2_0');
+////import B = require('./cloduleAsBaseClass2_0');
 ////class D extends B {
 ////    constructor() {
 ////        super(1);

tests/cases/fourslash/commentsExternalModules.ts

@@ -27,7 +27,7 @@
 
 // @Filename: commentsExternalModules_file1.ts
 /////**This is on import declaration*/
-////import ex/*9*/tMod = require("commentsExternalModules_file0");
+////import ex/*9*/tMod = require("./commentsExternalModules_file0");
 /////*10*/extMod./*11*/m1./*12*/fooExp/*13q*/ort(/*13*/);
 ////var new/*14*/Var = new extMod.m1.m2./*15*/c();
 
@@ -69,10 +69,10 @@ verify.memberListContains("i", "var m1.m2.i: m1.m2.c", "i");
 
 goTo.file("commentsExternalModules_file1.ts");
 goTo.marker('9');
-verify.quickInfoIs('import extMod = require("commentsExternalModules_file0")', "This is on import declaration");
+verify.quickInfoIs('import extMod = require("./commentsExternalModules_file0")', "This is on import declaration");
 
 goTo.marker('10');
-verify.completionListContains("extMod", 'import extMod = require("commentsExternalModules_file0")', "This is on import declaration");
+verify.completionListContains("extMod", 'import extMod = require("./commentsExternalModules_file0")', "This is on import declaration");
 
 goTo.marker('11');
 verify.memberListContains("m1", "namespace extMod.m1");

tests/cases/fourslash/commentsImportDeclaration.ts

@@ -20,15 +20,15 @@
 // @Filename: commentsImportDeclaration_file1.ts
 ///////<reference path='commentsImportDeclaration_file0.ts'/>
 /////** Import declaration*/
-////import /*3*/extMod = require("commentsImportDeclaration_file0/*4*/");
+////import /*3*/extMod = require("./commentsImportDeclaration_file0/*4*/");
 ////extMod./*6*/m1./*7*/fooEx/*8q*/port(/*8*/);
 ////var new/*9*/Var = new extMod.m1.m2./*10*/c();
 
 goTo.marker('2');
 verify.quickInfoIs("namespace m1", "NamespaceComment");
 
 goTo.marker('3');
-verify.quickInfoIs('import extMod = require("commentsImportDeclaration_file0")', "Import declaration");
+verify.quickInfoIs('import extMod = require("./commentsImportDeclaration_file0")', "Import declaration");
 
 goTo.marker('6');
 verify.memberListContains("m1", "namespace extMod.m1");

tests/cases/fourslash/completionListForTransitivelyExportedMembers01.ts

@@ -24,11 +24,11 @@
 
 // @Filename: C.ts
 ////export var cVar = "see!";
-////export * from "A";
-////export * from "B"
+////export * from "./A";
+////export * from "./B"
 
 // @Filename: D.ts
-////import * as c from "C";
+////import * as c from "./C";
 ////var x = c./**/
 
 goTo.marker();

tests/cases/fourslash/completionListForTransitivelyExportedMembers02.ts

@@ -25,11 +25,11 @@
 
 // @Filename: C.ts
 ////export var cVar = "see!";
-////export * from "A";
-////export * from "B"
+////export * from "./A";
+////export * from "./B"
 
 // @Filename: D.ts
-////import * as c from "C";
+////import * as c from "./C";
 ////var x = c.Inner./**/
 
 goTo.marker();

tests/cases/fourslash/completionListForTransitivelyExportedMembers03.ts

@@ -25,11 +25,11 @@
 
 // @Filename: C.ts
 ////export var cVar = "see!";
-////export * from "A";
-////export * from "B"
+////export * from "./A";
+////export * from "./B"
 
 // @Filename: D.ts
-////import * as c from "C";
+////import * as c from "./C";
 ////var x: c./**/
 
 goTo.marker();

tests/cases/fourslash/completionListForTransitivelyExportedMembers04.ts

@@ -1,5 +1,5 @@
 ///<reference path="fourslash.ts" />
-
+// @ModuleResolution: classic
 
 // @Filename: A.ts
 ////export interface I1 { one: number }

tests/cases/fourslash/completionListInExportClause01.ts

@@ -6,11 +6,11 @@
 ////export function baz() { return 10; }
 
 // @Filename: m2.ts
-////export {/*1*/, /*2*/ from "m1"
-////export {/*3*/} from "m1"
-////export {foo,/*4*/ from "m1"
-////export {bar as /*5*/, /*6*/ from "m1"
-////export {foo, bar, baz as b,/*7*/} from "m1"
+////export {/*1*/, /*2*/ from "./m1"
+////export {/*3*/} from "./m1"
+////export {foo,/*4*/ from "./m1"
+////export {bar as /*5*/, /*6*/ from "./m1"
+////export {foo, bar, baz as b,/*7*/} from "./m1"
 
 function verifyCompletionAtMarker(marker: string, showBuilder: boolean, ...completions: string[]) {
     goTo.marker(marker);

tests/cases/fourslash/completionListInImportClause01.ts

@@ -1,4 +1,5 @@
 /// <reference path='fourslash.ts'/>
+// @ModuleResolution: classic
 
 // @Filename: m1.ts
 ////export var foo: number = 1;

tests/cases/fourslash/definition.ts

@@ -1,7 +1,7 @@
 /// <reference path='fourslash.ts'/>
 
 // @Filename: b.ts
-////import n = require('a/*1*/');
+////import n = require('./a/*1*/');
 ////var x = new n.Foo();
 
 // @Filename: a.ts

tests/cases/fourslash/exportEqualCallableInterface.ts

@@ -9,7 +9,7 @@
 
 // @Filename: exportEqualCallableInterface_file1.ts
 ///////<reference path='exportEqualCallableInterface_file0.ts'/>
-////import test = require('exportEqualCallableInterface_file0');
+////import test = require('./exportEqualCallableInterface_file0');
 ////var t2: test;
 ////t2./**/
 

tests/cases/fourslash/exportEqualTypes.ts

@@ -9,13 +9,13 @@
 
 // @Filename: exportEqualTypes_file1.ts
 ///////<reference path='exportEqualTypes_file0.ts'/>
-////import test = require('exportEqualTypes_file0');
+////import test = require('./exportEqualTypes_file0');
 ////var t: /*1*/test;  // var 't' should be of type 'test'
 ////var /*2*/r1 = t(); // Should return a Date
 ////var /*3*/r2 = t./*4*/foo; // t should have 'foo' in dropdown list and be of type 'string'
 
 goTo.marker('1');
-verify.quickInfoIs("import test = require('exportEqualTypes_file0')");
+verify.quickInfoIs("import test = require('./exportEqualTypes_file0')");
 goTo.marker('2');
 verify.quickInfoIs('var r1: Date');
 goTo.marker('3');

tests/cases/fourslash/externalModuleIntellisense.ts

@@ -14,7 +14,7 @@
 
 // @Filename: externalModuleIntellisense_file1.ts
 ///////<reference path='externalModuleIntellisense_file0.ts'/>
-////import express = require('externalModuleIntellisense_file0');
+////import express = require('./externalModuleIntellisense_file0');
 ////var x = express();/*1*/
 
 goTo.marker('1');

tests/cases/fourslash/externalModuleWithExportAssignment.ts

@@ -18,7 +18,7 @@
 ////export = m2;
 
 // @Filename: externalModuleWithExportAssignment_file1.ts
-////import /*1*/a1 = require("externalModuleWithExportAssignment_file0");
+////import /*1*/a1 = require("./externalModuleWithExportAssignment_file0");
 ////export var /*2*/a = a1;
 ////a./*3*/test1(/*4*/null, null, null);
 ////var /*6*/r1 = a.test2(/*5*/);
@@ -30,7 +30,7 @@
 
 goTo.file("externalModuleWithExportAssignment_file1.ts");
 goTo.marker('1');
-verify.quickInfoIs('import a1 = require("externalModuleWithExportAssignment_file0")');
+verify.quickInfoIs('import a1 = require("./externalModuleWithExportAssignment_file0")');
 
 goTo.marker('2');
 verify.quickInfoIs("var a: {\n    (): a1.connectExport;\n    test1: a1.connectModule;\n    test2(): a1.connectModule;\n}", undefined);

tests/cases/fourslash/findAllRefsOnDefinition.ts

@@ -17,7 +17,7 @@
 ////}
 
 //@Filename: findAllRefsOnDefinition.ts
-////import Second = require("findAllRefsOnDefinition-import");
+////import Second = require("./findAllRefsOnDefinition-import");
 ////
 ////var second = new Second.Test()
 ////second.start();

tests/cases/fourslash/findAllRefsOnDefinition2.ts

@@ -9,7 +9,7 @@
 ////}
 
 //@Filename: findAllRefsOnDefinition2.ts
-////import Second = require("findAllRefsOnDefinition2-import");
+////import Second = require("./findAllRefsOnDefinition2-import");
 ////
 ////var start: Second.Test.start;
 ////var stop: Second.Test.stop;

tests/cases/fourslash/findAllRefsOnImportAliases.ts

@@ -5,12 +5,12 @@
 ////}
 
 //@Filename: b.ts
-////import { /*2*/Class } from "a";
+////import { /*2*/Class } from "./a";
 ////
 ////var c = new /*3*/Class();
 
 //@Filename: c.ts
-////export { /*4*/Class } from "a";
+////export { /*4*/Class } from "./a";
 
 goTo.file("a.ts");
 goTo.marker("1");

tests/cases/fourslash/findAllRefsOnImportAliases2.ts

@@ -5,12 +5,12 @@
 ////}
 
 //@Filename: b.ts
-////import { /*2*/Class as /*3*/C2} from "a";
+////import { /*2*/Class as /*3*/C2} from "./a";
 ////
 ////var c = new C2();
 
 //@Filename: c.ts
-////export { /*4*/Class as /*5*/C3 } from "a";
+////export { /*4*/Class as /*5*/C3 } from "./a";
 
 goTo.file("a.ts");
 goTo.marker("1");

tests/cases/fourslash/getJavaScriptCompletions15.ts

@@ -11,11 +11,11 @@
 //// export var V = "123"
 
 // @Filename: main.js
-//// import ref1 = require("refFile1");
-//// var ref2 = require("refFile2");
+//// import ref1 = require("./refFile1");
+//// var ref2 = require("./refFile2");
 //// ref1.V./*1*/;
 //// ref2.V./*2*/;
-//// var v = { x: require("refFile3") };
+//// var v = { x: require("./refFile3") };
 //// v.x./*3*/;
 //// v.x.V./*4*/;
 

tests/cases/fourslash/getPreProcessedFile.ts

@@ -1,4 +1,5 @@
 /// <reference path="fourslash.ts" />
+// @ModuleResolution: classic
 
 // @Filename: refFile1.ts
 //// class D { }

tests/cases/fourslash/goToDefinitionExternalModuleName.ts

@@ -1,7 +1,7 @@
 /// <reference path='fourslash.ts'/>
 
 // @Filename: b.ts
-////import n = require('a/*1*/');
+////import n = require('./a/*1*/');
 ////var x = new n.Foo();
 
 // @Filename: a.ts

tests/cases/fourslash/goToDefinitionExternalModuleName2.ts

@@ -1,7 +1,7 @@
 /// <reference path='fourslash.ts'/>
 
 // @Filename: b.ts
-////import n = require('a/*1*/');
+////import n = require('./a/*1*/');
 ////var x = new n.Foo();
 
 // @Filename: a.ts

tests/cases/fourslash/goToDefinitionImportedNames.ts

@@ -1,7 +1,7 @@
 /// <reference path='fourslash.ts' />
 
 // @Filename: b.ts
-////export {/*classAliasDefinition*/Class} from "a";
+////export {/*classAliasDefinition*/Class} from "./a";
 
 
 // @Filename: a.ts

tests/cases/fourslash/goToDefinitionImportedNames2.ts

@@ -1,7 +1,7 @@
 /// <reference path='fourslash.ts' />
 
 // @Filename: b.ts
-////import {/*classAliasDefinition*/Class} from "a";
+////import {/*classAliasDefinition*/Class} from "./a";
 
 
 // @Filename: a.ts

tests/cases/fourslash/goToDefinitionImportedNames3.ts

@@ -1,20 +1,20 @@
 /// <reference path='fourslash.ts' />
 
 // @Filename: e.ts
-//// import {M, /*classAliasDefinition*/C, I} from "d";
+//// import {M, /*classAliasDefinition*/C, I} from "./d";
 //// var c = new /*classReference*/C();
 
 
 // @Filename: d.ts
-////export * from "c";
+////export * from "./c";
 
 
 // @Filename: c.ts
-////export {Module as M, Class as C, Interface as I} from "b";
+////export {Module as M, Class as C, Interface as I} from "./b";
 
 
 // @Filename: b.ts
-////export * from "a";
+////export * from "./a";
 
 
 // @Filename: a.ts

tests/cases/fourslash/goToDefinitionImportedNames4.ts

@@ -1,7 +1,7 @@
 /// <reference path='fourslash.ts' />
 
 // @Filename: b.ts
-////import {Class as /*classAliasDefinition*/ClassAlias} from "a";
+////import {Class as /*classAliasDefinition*/ClassAlias} from "./a";
 
 
 // @Filename: a.ts