From c9ec4e22e718c1e181f5c92a6d19e5b7b1d1e81c Mon Sep 17 00:00:00 2001 From: Ron Buckton Date: Wed, 1 Jun 2016 11:43:23 -0700 Subject: [PATCH] Fix merge issues --- Jakefile.js | 2 +- src/compiler/checker.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Jakefile.js b/Jakefile.js index 5b8cffac240..a9fba70e8ae 100644 --- a/Jakefile.js +++ b/Jakefile.js @@ -1017,7 +1017,7 @@ task("runtests-file", ["build-rules", "tests", builtLocalDirectory], function () runTestsAndWriteOutput("tests/baselines/local/testresults.tap"); }, { async: true }); task("runtests-dirty", ["build-rules", "tests", builtLocalDirectory], function () { - runConsoleTests("mocha-fivemat-progress-reporter", [], /*dirty*/ true); + runConsoleTests("mocha-fivemat-progress-reporter", /*runInParallel*/ false, /*dirty*/ true); }, { async: true }); desc("Generates code coverage data via instanbul"); diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 585e4b90dd5..cb24f8cefd4 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -1223,7 +1223,7 @@ namespace ts { const left = name.kind === SyntaxKind.QualifiedName ? (name).left : (name).expression; const right = name.kind === SyntaxKind.QualifiedName ? (name).right : (name).name; - const namespace = resolveEntityName(left, SymbolFlags.Namespace, ignoreErrors, dontResolveAlias, location); + const namespace = resolveEntityName(left, SymbolFlags.Namespace, ignoreErrors, /*dontResolveAlias*/ false, location); if (!namespace || namespace === unknownSymbol || nodeIsMissing(right)) { return undefined; }