maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix merge issues

Browse source
This commit is contained in:
Ron Buckton 2016-06-01 11:43:23 -07:00
parent a07965aad8
commit c9ec4e22e7
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Jakefile.js
View file

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

2
src/compiler/checker.ts
View file

@ -1223,7 +1223,7 @@ namespace ts {
const left = name.kind === SyntaxKind.QualifiedName ? (<QualifiedName>name).left : (<PropertyAccessExpression>name).expression;
const right = name.kind === SyntaxKind.QualifiedName ? (<QualifiedName>name).right : (<PropertyAccessExpression>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;
}