Skip to content

Commit 12123bd

Browse files
Give related error on declaration location for used-before-declared errors.
1 parent a1746d4 commit 12123bd

File tree

2 files changed

+33
-7
lines changed

2 files changed

+33
-7
lines changed

src/compiler/checker.ts

+29-7
Original file line numberDiff line numberDiff line change
@@ -1592,18 +1592,34 @@ namespace ts {
15921592
if (declaration === undefined) return Debug.fail("Declaration to checkResolvedBlockScopedVariable is undefined");
15931593

15941594
if (!(declaration.flags & NodeFlags.Ambient) && !isBlockScopedNameDeclaredBeforeUse(declaration, errorLocation)) {
1595+
let err;
1596+
const declarationName = declarationNameToString(getNameOfDeclaration(declaration));
15951597
if (result.flags & SymbolFlags.BlockScopedVariable) {
1596-
error(errorLocation, Diagnostics.Block_scoped_variable_0_used_before_its_declaration, declarationNameToString(getNameOfDeclaration(declaration)));
1598+
err = error(errorLocation, Diagnostics.Block_scoped_variable_0_used_before_its_declaration, declarationName);
15971599
}
15981600
else if (result.flags & SymbolFlags.Class) {
1599-
error(errorLocation, Diagnostics.Class_0_used_before_its_declaration, declarationNameToString(getNameOfDeclaration(declaration)));
1601+
err = error(errorLocation, Diagnostics.Class_0_used_before_its_declaration, declarationName);
16001602
}
16011603
else if (result.flags & SymbolFlags.RegularEnum) {
1602-
error(errorLocation, Diagnostics.Enum_0_used_before_its_declaration, declarationNameToString(getNameOfDeclaration(declaration)));
1604+
err = error(errorLocation, Diagnostics.Enum_0_used_before_its_declaration, declarationName);
1605+
}
1606+
else {
1607+
Debug.assert(!!(result.flags & SymbolFlags.ConstEnum));
1608+
}
1609+
1610+
if (err) {
1611+
placeRelatedSpanOnLaterDeclaration(declarationName, declaration, err);
16031612
}
16041613
}
16051614
}
16061615

1616+
function placeRelatedSpanOnLaterDeclaration(declarationName: string, declarationLocation: Declaration, diagnostic: Diagnostic) {
1617+
Debug.assert(!diagnostic.relatedInformation);
1618+
diagnostic.relatedInformation = [
1619+
createDiagnosticForNode(declarationLocation, Diagnostics._0_was_declared_here, declarationName)
1620+
];
1621+
}
1622+
16071623
/* Starting from 'initial' node walk up the parent chain until 'stopAt' node is reached.
16081624
* If at any point current node is equal to 'parent' node - return true.
16091625
* Return false if 'stopAt' node is reached or isFunctionLike(current) === true.
@@ -17397,16 +17413,22 @@ namespace ts {
1739717413
return;
1739817414
}
1739917415

17416+
let err;
17417+
const declarationName = idText(right);
1740017418
if (isInPropertyInitializer(node) &&
1740117419
!isBlockScopedNameDeclaredBeforeUse(valueDeclaration, right)
1740217420
&& !isPropertyDeclaredInAncestorClass(prop)) {
17403-
error(right, Diagnostics.Block_scoped_variable_0_used_before_its_declaration, idText(right));
17421+
err = error(right, Diagnostics.Block_scoped_variable_0_used_before_its_declaration, declarationName);
1740417422
}
1740517423
else if (valueDeclaration.kind === SyntaxKind.ClassDeclaration &&
1740617424
node.parent.kind !== SyntaxKind.TypeReference &&
1740717425
!(valueDeclaration.flags & NodeFlags.Ambient) &&
1740817426
!isBlockScopedNameDeclaredBeforeUse(valueDeclaration, right)) {
17409-
error(right, Diagnostics.Class_0_used_before_its_declaration, idText(right));
17427+
err = error(right, Diagnostics.Class_0_used_before_its_declaration, declarationName);
17428+
}
17429+
17430+
if (err) {
17431+
placeRelatedSpanOnLaterDeclaration(declarationName, valueDeclaration, err);
1741017432
}
1741117433
}
1741217434

@@ -19020,8 +19042,8 @@ namespace ts {
1902019042
if (importNode && !isImportCall(importNode)) {
1902119043
const sigs = getSignaturesOfType(getTypeOfSymbol(getSymbolLinks(apparentType.symbol).target!), kind);
1902219044
if (!sigs || !sigs.length) return;
19023-
diagnostic.relatedInformation = diagnostic.relatedInformation || [];
19024-
diagnostic.relatedInformation.push(createDiagnosticForNode(importNode, Diagnostics.Type_originates_at_this_import_A_namespace_style_import_cannot_be_called_or_constructed_and_will_cause_a_failure_at_runtime_Consider_using_a_default_import_or_import_require_here_instead));
19045+
Debug.assert(!diagnostic.relatedInformation);
19046+
diagnostic.relatedInformation = [createDiagnosticForNode(importNode, Diagnostics.Type_originates_at_this_import_A_namespace_style_import_cannot_be_called_or_constructed_and_will_cause_a_failure_at_runtime_Consider_using_a_default_import_or_import_require_here_instead)];
1902519047
}
1902619048
}
1902719049

src/compiler/diagnosticMessages.json

+4
Original file line numberDiff line numberDiff line change
@@ -2397,6 +2397,10 @@
23972397
"category": "Error",
23982398
"code": 2727
23992399
},
2400+
"'{0}' was declared here.": {
2401+
"category": "Error",
2402+
"code": 2728
2403+
},
24002404

24012405
"Import declaration '{0}' is using private name '{1}'.": {
24022406
"category": "Error",

0 commit comments

Comments
 (0)