From 4a829572be66bdf1e1f58b61fb837cdad995f683 Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Wed, 19 Aug 2015 15:37:37 -0700 Subject: [PATCH] added tests --- src/compiler/emitter.ts | 1 - src/compiler/program.ts | 10 +++++----- .../reference/moduleResolutionNoResolve.js | 13 +++++++++++++ .../reference/moduleResolutionNoResolve.symbols | 9 +++++++++ .../reference/moduleResolutionNoResolve.types | 10 ++++++++++ tests/cases/compiler/moduleResolutionNoResolve.ts | 8 ++++++++ 6 files changed, 45 insertions(+), 6 deletions(-) create mode 100644 tests/baselines/reference/moduleResolutionNoResolve.js create mode 100644 tests/baselines/reference/moduleResolutionNoResolve.symbols create mode 100644 tests/baselines/reference/moduleResolutionNoResolve.types create mode 100644 tests/cases/compiler/moduleResolutionNoResolve.ts diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index a6e9b22dde..150cc3321f 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -5131,7 +5131,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi argumentsWritten++; } if (shouldEmitParamTypesMetadata(node)) { - debugger; if (writeComma || argumentsWritten) { write(", "); } diff --git a/src/compiler/program.ts b/src/compiler/program.ts index 5217674d30..07f08952d2 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -330,7 +330,7 @@ namespace ts { } // check imports - collectExternalModuleReferences(newSourceFile); + collectExternalModuleReferences(newSourceFile); if (!arrayIsEqualTo(oldSourceFile.imports, newSourceFile.imports, moduleNameIsEqualTo)) { // imports has changed return false; @@ -706,10 +706,10 @@ namespace ts { }); } - function processImportedModules(file: SourceFile, basePath: string) { - collectExternalModuleReferences(file); - if (file.imports.length) { - file.resolvedModules = {}; + function processImportedModules(file: SourceFile, basePath: string) { + collectExternalModuleReferences(file); + if (file.imports.length) { + file.resolvedModules = {}; let moduleNames = map(file.imports, name => name.text); let resolutions = resolveModuleNamesWorker(moduleNames, file.fileName); for (let i = 0; i < file.imports.length; ++i) { diff --git a/tests/baselines/reference/moduleResolutionNoResolve.js b/tests/baselines/reference/moduleResolutionNoResolve.js new file mode 100644 index 0000000000..9f0537a5ad --- /dev/null +++ b/tests/baselines/reference/moduleResolutionNoResolve.js @@ -0,0 +1,13 @@ +//// [tests/cases/compiler/moduleResolutionNoResolve.ts] //// + +//// [a.ts] + +import a = require('./b'); + +//// [b.ts] +export var c = ''; + + +//// [a.js] +//// [b.js] +exports.c = ''; diff --git a/tests/baselines/reference/moduleResolutionNoResolve.symbols b/tests/baselines/reference/moduleResolutionNoResolve.symbols new file mode 100644 index 0000000000..17ccfeab49 --- /dev/null +++ b/tests/baselines/reference/moduleResolutionNoResolve.symbols @@ -0,0 +1,9 @@ +=== tests/cases/compiler/a.ts === + +import a = require('./b'); +>a : Symbol(a, Decl(a.ts, 0, 0)) + +=== tests/cases/compiler/b.ts === +export var c = ''; +>c : Symbol(c, Decl(b.ts, 0, 10)) + diff --git a/tests/baselines/reference/moduleResolutionNoResolve.types b/tests/baselines/reference/moduleResolutionNoResolve.types new file mode 100644 index 0000000000..3e96ed2b19 --- /dev/null +++ b/tests/baselines/reference/moduleResolutionNoResolve.types @@ -0,0 +1,10 @@ +=== tests/cases/compiler/a.ts === + +import a = require('./b'); +>a : typeof a + +=== tests/cases/compiler/b.ts === +export var c = ''; +>c : string +>'' : string + diff --git a/tests/cases/compiler/moduleResolutionNoResolve.ts b/tests/cases/compiler/moduleResolutionNoResolve.ts new file mode 100644 index 0000000000..aea0208b5d --- /dev/null +++ b/tests/cases/compiler/moduleResolutionNoResolve.ts @@ -0,0 +1,8 @@ +// @module:commonjs +// @noResolve: true + +// @filename: a.ts +import a = require('./b'); + +// @filename: b.ts +export var c = '';