Skip to content

Add assert for unexpected syntaxkind and a conservative temporary fix. #2218

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Add assert for unexpected syntaxkind and a conservative temporary fix. #2218

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5d9fa5
Add assert for unexpected syntaxkind and a conservative temporary fix.
Mar 6, 2015
839d92f
Add checks so we don't crash on undefined in the asserts.
Mar 6, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion src/services/navigationBar.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,20 @@ module ts.NavigationBar {

function sortNodes(nodes: Node[]): Node[] {
return nodes.slice(0).sort((n1: Declaration, n2: Declaration) => {
if (n1.name && n2.name) {

if (n1.name) {
Debug.assert(n1.name.kind === SyntaxKind.Identifier || n1.name.kind === SyntaxKind.StringLiteral, `Expected n1.name is a ${n1.name.kind},\
where SyntaxKind.ComputedPropertyName is ${SyntaxKind.ComputedPropertyName} and SyntaxKind.BindingPattern is ${SyntaxKind.ArrayBindingPattern} or\
${SyntaxKind.ObjectBindingPattern}`);
}

if (n2.name) {
Debug.assert(n2.name.kind === SyntaxKind.Identifier || n2.name.kind === SyntaxKind.StringLiteral, `Expected n2.name is a ${n2.name.kind},\
where SyntaxKind.ComputedPropertyName is ${SyntaxKind.ComputedPropertyName} and SyntaxKind.BindingPattern is ${SyntaxKind.ArrayBindingPattern} or\
${SyntaxKind.ObjectBindingPattern}`);
}

if (n1.name && (<Identifier>n1.name).text && n2.name) {
// TODO(jfreeman): How do we sort declarations with computed names?
return (<Identifier>n1.name).text.localeCompare((<Identifier>n2.name).text);
}
Expand Down