Skip to content

Enable navbar for export defaults #2204

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
mhegazy wants to merge 1 commit into from
Closed

Enable navbar for export defaults #2204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 5 additions & 8 deletions src/services/navigationBar.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,10 +424,10 @@ module ts.NavigationBar {
}

function createFunctionItem(node: FunctionDeclaration) {
if (node.name && node.body && node.body.kind === SyntaxKind.Block) {
if ((node.name || node.flags & NodeFlags.Default) && node.body && node.body.kind === SyntaxKind.Block) {
var childItems = getItemsWorker(sortNodes((<Block>node.body).statements), createChildItem);

return getNavigationBarItem(node.name.text,
return getNavigationBarItem((node.flags & NodeFlags.Default) ? "default": node.name.text ,

@DanielRosenwasser DanielRosenwasser Mar 5, 2015

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Stray space at the end, add a space after "default"; also I think this was a little cleaner when you just used an intermediate variable (nodeName).

@sheetalkamat sheetalkamat Mar 5, 2015

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If the syntax is of type export default function foo() {} shouldn't you be showing foo instead of default?

@mhegazy mhegazy Mar 15, 2015

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done.

ts.ScriptElementKind.functionElement,
getNodeModifiers(node),
[getNodeSpan(node)],
Expand Down Expand Up @@ -458,11 +458,6 @@ module ts.NavigationBar {
}

function createClassItem(node: ClassDeclaration): ts.NavigationBarItem {
if (!node.name) {
// An export default class may be nameless
return undefined;
}

var childItems: NavigationBarItem[];

if (node.members) {
Expand All @@ -481,8 +476,10 @@ module ts.NavigationBar {
var childItems = getItemsWorker(sortNodes(nodes), createChildItem);
}

var nodeName = (node.flags & NodeFlags.Default) ? "default" : node.name.text;

return getNavigationBarItem(
node.name.text,
nodeName,
ts.ScriptElementKind.classElement,
getNodeModifiers(node),
[getNodeSpan(node)],
Expand Down
24 changes: 24 additions & 0 deletions tests/cases/fourslash/navbar_exportDefault.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
/// <reference path="fourslash.ts" />

// @Filename: a.ts
//// {| "itemName": "default", "kind": "class", "parentName": "" |}export default class { }

// @Filename: b.ts
//// {| "itemName": "default", "kind": "class", "parentName": "" |}export default class C { }

// @Filename: c.ts
//// {| "itemName": "default", "kind": "function", "parentName": "" |}export default function { }

// @Filename: d.ts
//// {| "itemName": "default", "kind": "function", "parentName": "" |}export default function Func { }

test.markers().forEach(marker => {
goTo.file(marker.fileName);
verify.getScriptLexicalStructureListContains(
marker.data.itemName,
marker.data.kind,
marker.fileName,
marker.data.parentName,
marker.data.isAdditionalRange,
marker.position);
});