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

Fix the duplicate function implementation error that depended on order of files

Browse source
This commit is contained in:
Sheetal Nandi 2015-10-14 12:00:43 -07:00
parent 11b270f6ca
commit 81763543f3
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/compiler/checker.ts
View file

@ -10770,6 +10770,7 @@ namespace ts {
let symbol = getSymbolOfNode(node);
let firstDeclaration = getDeclarationOfKind(symbol, node.kind);
// Only type check the symbol once
if (node === firstDeclaration) {
checkFunctionOrConstructorSymbol(symbol);
@ -11782,7 +11783,13 @@ namespace ts {
let symbol = getSymbolOfNode(node);
let localSymbol = node.localSymbol || symbol;
let firstDeclaration = getDeclarationOfKind(localSymbol, node.kind);
let firstDeclaration = forEach(symbol.declarations, declaration => {
// Get first non javascript function declaration
if (declaration.kind === node.kind && !isJavaScript(getSourceFile(declaration).fileName)) {
return declaration;
}
});
// Only type check the symbol once
if (node === firstDeclaration) {
checkFunctionOrConstructorSymbol(localSymbol);

8
tests/cases/fourslash/jsFileCompilationDuplicateFunctionImplementation.ts
View file

@ -11,10 +11,14 @@
// @emitThisFile: true
////function foo() { return 30; }/*2*/
goTo.marker("1");
verify.getSemanticDiagnostics('[]');
goTo.marker("2");
verify.getSemanticDiagnostics("[]");
verify.getSemanticDiagnostics('[\n {\n "message": "Duplicate function implementation.",\n "start": 9,\n "length": 3,\n "category": "error",\n "code": 2393\n }\n]');
verify.verifyGetEmitOutputContentsForCurrentFile([
{ fileName: "out.js", content: "function foo() { return 10; }\r\nfunction foo() { return 30; }\r\n" },
{ fileName: "out.d.ts", content: "" }]);
goTo.marker("2");
verify.getSemanticDiagnostics('[\n {\n "message": "Duplicate function implementation.",\n "start": 9,\n "length": 3,\n "category": "error",\n "code": 2393\n }\n]');
verify.getSemanticDiagnostics('[\n {\n "message": "Duplicate function implementation.",\n "start": 9,\n "length": 3,\n "category": "error",\n "code": 2393\n }\n]');
goTo.marker("1");
verify.getSemanticDiagnostics('[]');