microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-15 03:23:08 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Merge pull request #9984 from Microsoft/node_kind

Browse Source 
Unify nodeKind implementations for navigationBar and navigateTo
This commit is contained in:
Andy 2016-07-29 08:19:07 -07:00 committed by GitHub
commit c6960303db
34 changed files with 73 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/services/navigationBar.ts
View File

@ -506,7 +506,7 @@ namespace ts.NavigationBar {
function convertToTopLevelItem(n: NavigationBarNode): NavigationBarItem {
return {
text: getItemName(n.node),
kind: nodeKind(n.node),
kind: getNodeKind(n.node),
kindModifiers: getNodeModifiers(n.node),
spans: getSpans(n),
childItems: map(n.children, convertToChildItem) || emptyChildItemArray,
@ -518,7 +518,7 @@ namespace ts.NavigationBar {
function convertToChildItem(n: NavigationBarNode): NavigationBarItem {
return {
text: getItemName(n.node),
kind: nodeKind(n.node),
kind: getNodeKind(n.node),
kindModifiers: getNodeModifiers(n.node),
spans: getSpans(n),
childItems: emptyChildItemArray,
@ -539,57 +539,6 @@ namespace ts.NavigationBar {
}
}
// TODO: GH#9145: We should just use getNodeKind. No reason why navigationBar and navigateTo should have different behaviors.
function nodeKind(node: Node): string {
switch (node.kind) {
case SyntaxKind.SourceFile:
return ScriptElementKind.moduleElement;
case SyntaxKind.EnumMember:
return ScriptElementKind.memberVariableElement;
case SyntaxKind.VariableDeclaration:
case SyntaxKind.BindingElement:
let variableDeclarationNode: Node;
let name: Node;
if (node.kind === SyntaxKind.BindingElement) {
name = (<BindingElement>node).name;
variableDeclarationNode = node;
// binding elements are added only for variable declarations
// bubble up to the containing variable declaration
while (variableDeclarationNode && variableDeclarationNode.kind !== SyntaxKind.VariableDeclaration) {
variableDeclarationNode = variableDeclarationNode.parent;
}
Debug.assert(!!variableDeclarationNode);
}
else {
Debug.assert(!isBindingPattern((<VariableDeclaration>node).name));
variableDeclarationNode = node;
name = (<VariableDeclaration>node).name;
}
if (isConst(variableDeclarationNode)) {
return ts.ScriptElementKind.constElement;
}
else if (isLet(variableDeclarationNode)) {
return ts.ScriptElementKind.letElement;
}
else {
return ts.ScriptElementKind.variableElement;
}
case SyntaxKind.ArrowFunction:
return ts.ScriptElementKind.functionElement;
case SyntaxKind.JSDocTypedefTag:
return ScriptElementKind.typeElement;
default:
return getNodeKind(node);
}
}
function getModuleName(moduleDeclaration: ModuleDeclaration): string {
// We want to maintain quotation marks.
if (isAmbientModule(moduleDeclaration)) {

31
src/services/services.ts
View File

@ -1690,6 +1690,8 @@ namespace ts {
/** enum E */
export const enumElement = "enum";
// TODO: GH#9983
export const enumMemberElement = "const";
/**
* Inside module and script only
@ -2947,7 +2949,10 @@ namespace ts {
/* @internal */ export function getNodeKind(node: Node): string {
switch (node.kind) {
case SyntaxKind.ModuleDeclaration: return ScriptElementKind.moduleElement;
case SyntaxKind.SourceFile:
return isExternalModule(<SourceFile>node) ? ScriptElementKind.moduleElement : ScriptElementKind.scriptElement;
case SyntaxKind.ModuleDeclaration:
return ScriptElementKind.moduleElement;
case SyntaxKind.ClassDeclaration:
case SyntaxKind.ClassExpression:
return ScriptElementKind.classElement;
@ -2955,11 +2960,10 @@ namespace ts {
case SyntaxKind.TypeAliasDeclaration: return ScriptElementKind.typeElement;
case SyntaxKind.EnumDeclaration: return ScriptElementKind.enumElement;
case SyntaxKind.VariableDeclaration:
return isConst(node)
? ScriptElementKind.constElement
: isLet(node)
? ScriptElementKind.letElement
: ScriptElementKind.variableElement;
return getKindOfVariableDeclaration(<VariableDeclaration>node);
case SyntaxKind.BindingElement:
return getKindOfVariableDeclaration(<VariableDeclaration>getRootDeclaration(node));
case SyntaxKind.ArrowFunction:
case SyntaxKind.FunctionDeclaration:
case SyntaxKind.FunctionExpression:
return ScriptElementKind.functionElement;
@ -2976,7 +2980,7 @@ namespace ts {
case SyntaxKind.CallSignature: return ScriptElementKind.callSignatureElement;
case SyntaxKind.Constructor: return ScriptElementKind.constructorImplementationElement;
case SyntaxKind.TypeParameter: return ScriptElementKind.typeParameterElement;
case SyntaxKind.EnumMember: return ScriptElementKind.variableElement;
case SyntaxKind.EnumMember: return ScriptElementKind.enumMemberElement;
case SyntaxKind.Parameter: return (node.flags & NodeFlags.ParameterPropertyModifier) ? ScriptElementKind.memberVariableElement : ScriptElementKind.parameterElement;
case SyntaxKind.ImportEqualsDeclaration:
case SyntaxKind.ImportSpecifier:
@ -2984,8 +2988,19 @@ namespace ts {
case SyntaxKind.ExportSpecifier:
case SyntaxKind.NamespaceImport:
return ScriptElementKind.alias;
case SyntaxKind.JSDocTypedefTag:
return ScriptElementKind.typeElement;
default:
return ScriptElementKind.unknown;
}
function getKindOfVariableDeclaration(v: VariableDeclaration): string {
return isConst(v)
? ScriptElementKind.constElement
: isLet(v)
? ScriptElementKind.letElement
: ScriptElementKind.variableElement;
}
return ScriptElementKind.unknown;
}
class CancellationTokenObject implements CancellationToken {

8
tests/cases/fourslash/deleteClassWithEnumPresent.ts
View File

@ -8,7 +8,7 @@ edit.deleteAtCaret('class Bar { }'.length);
verify.navigationBar([
{
"text": "<global>",
"kind": "module",
"kind": "script",
"childItems": [
{
"text": "Foo",
@ -22,15 +22,15 @@ verify.navigationBar([
"childItems": [
{
"text": "a",
"kind": "property"
"kind": "const"
},
{
"text": "b",
"kind": "property"
"kind": "const"
},
{
"text": "c",
"kind": "property"
"kind": "const"
}
],
"indent": 1

2
tests/cases/fourslash/getNavigationBarItems.ts
View File

@ -8,7 +8,7 @@
verify.navigationBar([
{
"text": "<global>",
"kind": "module",
"kind": "script",
"childItems": [
{
"text": "C",

2
tests/cases/fourslash/navbar_const.ts
View File

@ -5,7 +5,7 @@
verify.navigationBar([
{
"text": "<global>",
"kind": "module",
"kind": "script",
"childItems": [
{
"text": "c",

2
tests/cases/fourslash/navbar_contains-no-duplicates.ts
View File

@ -30,7 +30,7 @@
verify.navigationBar([
{
"text": "<global>",
"kind": "module",
"kind": "script",
"childItems": [
{
"text": "ABC",

2
tests/cases/fourslash/navbar_let.ts
View File

@ -5,7 +5,7 @@
verify.navigationBar([
{
"text": "<global>",
"kind": "module",
"kind": "script",
"childItems": [
{
"text": "c",

2
tests/cases/fourslash/navigationBarAnonymousClassAndFunctionExpressions.ts
View File

@ -29,7 +29,7 @@
verify.navigationBar([
{
"text": "<global>",
"kind": "module",
"kind": "script",
"childItems": [
{
"text": "<function>",

2
tests/cases/fourslash/navigationBarAnonymousClassAndFunctionExpressions2.ts
View File

@ -6,7 +6,7 @@
verify.navigationBar([
{
"text": "<global>",
"kind": "module",
"kind": "script",
"childItems": [
{
"text": "A",

2
tests/cases/fourslash/navigationBarGetterAndSetter.ts
View File

@ -11,7 +11,7 @@
verify.navigationBar([
{
"text": "<global>",
"kind": "module",
"kind": "script",
"childItems": [
{
"text": "X",

2
tests/cases/fourslash/navigationBarItemsBindingPatterns.ts
View File

@ -9,7 +9,7 @@
verify.navigationBar([
{
"text": "<global>",
"kind": "module",
"kind": "script",
"childItems": [
{
"text": "a",

2
tests/cases/fourslash/navigationBarItemsBindingPatternsInConstructor.ts
View File

@ -14,7 +14,7 @@
verify.navigationBar([
{
"text": "<global>",
"kind": "module",
"kind": "script",
"childItems": [
{
"text": "A",

2
tests/cases/fourslash/navigationBarItemsEmptyConstructors.ts
View File

@ -8,7 +8,7 @@
verify.navigationBar([
{
"text": "<global>",
"kind": "module",
"kind": "script",
"childItems": [
{
"text": "Test",

2
tests/cases/fourslash/navigationBarItemsFunctions.ts
View File

@ -17,7 +17,7 @@
verify.navigationBar([
{
"text": "<global>",
"kind": "module",
"kind": "script",
"childItems": [
{
"text": "baz",

2
tests/cases/fourslash/navigationBarItemsFunctionsBroken.ts
View File

@ -7,7 +7,7 @@
verify.navigationBar([
{
"text": "<global>",
"kind": "module",
"kind": "script",
"childItems": [
{
"text": "f",

2
tests/cases/fourslash/navigationBarItemsFunctionsBroken2.ts
View File

@ -8,7 +8,7 @@
verify.navigationBar([
{
"text": "<global>",
"kind": "module",
"kind": "script",
"childItems": [
{
"text": "<function>",

6
tests/cases/fourslash/navigationBarItemsInsideMethodsAndConstructors.ts
View File

@ -21,7 +21,7 @@
verify.navigationBar([
{
"text": "<global>",
"kind": "module",
"kind": "script",
"childItems": [
{
"text": "Class",
@ -73,7 +73,7 @@ verify.navigationBar([
"childItems": [
{
"text": "LocalEnumMemberInConstructor",
"kind": "property"
"kind": "const"
}
],
"indent": 3
@ -113,7 +113,7 @@ verify.navigationBar([
"childItems": [
{
"text": "LocalEnumMemberInMethod",
"kind": "property"
"kind": "const"
}
],
"indent": 3

8
tests/cases/fourslash/navigationBarItemsItems.ts
View File

@ -42,7 +42,7 @@
verify.navigationBar([
{
"text": "<global>",
"kind": "module",
"kind": "script",
"childItems": [
{
"text": "dist",
@ -155,15 +155,15 @@ verify.navigationBar([
"childItems": [
{
"text": "value1",
"kind": "property"
"kind": "const"
},
{
"text": "value2",
"kind": "property"
"kind": "const"
},
{
"text": "value3",
"kind": "property"
"kind": "const"
}
],
"indent": 2

4
tests/cases/fourslash/navigationBarItemsItemsModuleVariables.ts
View File

@ -23,7 +23,7 @@ goTo.marker("file1");
verify.navigationBar([
{
"text": "<global>",
"kind": "module",
"kind": "script",
"childItems": [
{
"text": "Module1",
@ -49,7 +49,7 @@ goTo.marker("file2");
verify.navigationBar([
{
"text": "<global>",
"kind": "module",
"kind": "script",
"childItems": [
{
"text": "Module1.SubModule",

2
tests/cases/fourslash/navigationBarItemsMissingName2.ts
View File

@ -9,7 +9,7 @@
verify.navigationBar([
{
"text": "<global>",
"kind": "module",
"kind": "script",
"childItems": [
{
"text": "<class>",

2
tests/cases/fourslash/navigationBarItemsModules.ts
View File

@ -30,7 +30,7 @@
verify.navigationBar([
{
"text": "<global>",
"kind": "module",
"kind": "script",
"childItems": [
{
"text": "'X2.Y2.Z2'",

2
tests/cases/fourslash/navigationBarItemsMultilineStringIdentifiers.ts
View File

@ -27,7 +27,7 @@
verify.navigationBar([
{
"text": "<global>",
"kind": "module",
"kind": "script",
"childItems": [
{
"text": "\"Multiline\\\nMadness\"",

2
tests/cases/fourslash/navigationBarItemsPropertiesDefinedInConstructors.ts
View File

@ -9,7 +9,7 @@
verify.navigationBar([
{
"text": "<global>",
"kind": "module",
"kind": "script",
"childItems": [
{
"text": "List",

2
tests/cases/fourslash/navigationBarItemsSymbols1.ts
View File

@ -9,7 +9,7 @@
verify.navigationBar([
{
"text": "<global>",
"kind": "module",
"kind": "script",
"childItems": [
{
"text": "C",

2
tests/cases/fourslash/navigationBarItemsSymbols2.ts
View File

@ -8,7 +8,7 @@
verify.navigationBar([
{
"text": "<global>",
"kind": "module",
"kind": "script",
"childItems": [
{
"text": "I",

2
tests/cases/fourslash/navigationBarItemsSymbols3.ts
View File

@ -8,7 +8,7 @@
verify.navigationBar([
{
"text": "<global>",
"kind": "module",
"kind": "script",
"childItems": [
{
"text": "E",

2
tests/cases/fourslash/navigationBarItemsTypeAlias.ts
View File

@ -5,7 +5,7 @@
verify.navigationBar([
{
"text": "<global>",
"kind": "module",
"kind": "script",
"childItems": [
{
"text": "T",

2
tests/cases/fourslash/navigationBarJsDoc.ts
View File

@ -8,7 +8,7 @@
verify.navigationBar([
{
"text": "<global>",
"kind": "module",
"kind": "script",
"childItems": [
{
"text": "NumberLike",

8
tests/cases/fourslash/navigationBarMerging.ts
View File

@ -14,7 +14,7 @@
verify.navigationBar([
{
"text": "<global>",
"kind": "module",
"kind": "script",
"childItems": [
{
"text": "a",
@ -63,7 +63,7 @@ goTo.file("file2.ts");
verify.navigationBar([
{
"text": "<global>",
"kind": "module",
"kind": "script",
"childItems": [
{
"text": "a",
@ -104,7 +104,7 @@ goTo.file("file3.ts");
verify.navigationBar([
{
"text": "<global>",
"kind": "module",
"kind": "script",
"childItems": [
{
"text": "a",
@ -150,7 +150,7 @@ goTo.file("file4.ts");
verify.navigationBar([
{
"text": "<global>",
"kind": "module",
"kind": "script",
"childItems": [
{
"text": "A",

4
tests/cases/fourslash/navigationBarVariables.ts
View File

@ -7,7 +7,7 @@
verify.navigationBar([
{
"text": "<global>",
"kind": "module",
"kind": "script",
"childItems": [
{
"text": "x",
@ -34,7 +34,7 @@ goTo.file("file2.ts");
verify.navigationBar([
{
"text": "<global>",
"kind": "module",
"kind": "script",
"childItems": [
{
"text": "a",

2
tests/cases/fourslash/server/jsdocTypedefTagNavigateTo.ts
View File

@ -13,7 +13,7 @@
verify.navigationBar([
{
"text": "<global>",
"kind": "module",
"kind": "script",
"childItems": [
{
"text": "numberLike",

8
tests/cases/fourslash/server/navbar01.ts
View File

@ -41,7 +41,7 @@
verify.navigationBar([
{
"text": "<global>",
"kind": "module",
"kind": "script",
"childItems": [
{
"text": "dist",
@ -154,15 +154,15 @@ verify.navigationBar([
"childItems": [
{
"text": "value1",
"kind": "property"
"kind": "const"
},
{
"text": "value2",
"kind": "property"
"kind": "const"
},
{
"text": "value3",
"kind": "property"
"kind": "const"
}
],
"indent": 2

2
tests/cases/fourslash/shims-pp/getNavigationBarItems.ts
View File

@ -5,7 +5,7 @@
verify.navigationBar([
{
"text": "<global>",
"kind": "module",
"kind": "script",
"childItems": [
{
"text": "c",

2
tests/cases/fourslash/shims/getNavigationBarItems.ts
View File

@ -5,7 +5,7 @@
verify.navigationBar([
{
"text": "<global>",
"kind": "module",
"kind": "script",
"childItems": [
{
"text": "c",