Fix fallback to classic resolution

Author: billti

src/compiler/program.ts

@@ -100,7 +100,7 @@ namespace ts {
 
  let moduleResolution = compilerOptions.moduleResolution;
  if (moduleResolution === undefined) {
- moduleResolution = compilerOptions.module === ModuleKind.CommonJS ? ModuleResolutionKind.NodeJs : ModuleResolutionKind.Classic;
+ moduleResolution = getEmitModuleKind(compilerOptions) === ModuleKind.CommonJS ? ModuleResolutionKind.NodeJs : ModuleResolutionKind.Classic;
  if (traceEnabled) {
  trace(host, Diagnostics.Module_resolution_kind_is_not_specified_using_0, ModuleResolutionKind[moduleResolution]);
  }

src/harness/harness.ts

@@ -896,7 +896,8 @@ namespace Harness {
  { name: "fileName", type: "string" },
  { name: "libFiles", type: "string" },
  { name: "noErrorTruncation", type: "boolean" },
- { name: "suppressOutputPathCheck", type: "boolean" }
+ { name: "suppressOutputPathCheck", type: "boolean" },
+ { name: "moduleResolution", type: "string"}
  ];
 
  let optionsIndex: ts.Map<ts.CommandLineOption>;

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");