From 0877a650c35a740cd17ba732d896037f3d551fa2 Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Wed, 12 Nov 2014 18:42:31 -0800 Subject: [PATCH] Code review feedback --- src/services/navigationBar.ts | 4 +-- src/services/services.ts | 10 +++---- .../fourslash/completionEntryForConst.ts | 2 +- .../constQuickInfoAndCompletionList.ts | 26 +++++++++---------- tests/cases/fourslash/navbar_const.ts | 2 +- tests/cases/fourslash/navigateItemsConst.ts | 4 +-- .../fourslash/quickInfoForConstDeclaration.ts | 2 +- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/services/navigationBar.ts b/src/services/navigationBar.ts index fd3ea13ce6b..be865a6d232 100644 --- a/src/services/navigationBar.ts +++ b/src/services/navigationBar.ts @@ -236,9 +236,9 @@ module ts.NavigationBar { case SyntaxKind.VariableDeclaration: if (isConst(node)) { - return createItem(node, getTextOfNode((node).name), ts.ScriptElementKind.constantElement); + return createItem(node, getTextOfNode((node).name), ts.ScriptElementKind.constElement); } - else if (node.flags & NodeFlags.Let) { + else if (isLet(node)) { return createItem(node, getTextOfNode((node).name), ts.ScriptElementKind.letElement); } else { diff --git a/src/services/services.ts b/src/services/services.ts index bf9bdb0ee77..0a2eb21ced3 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -1224,7 +1224,7 @@ module ts { static alias = "alias"; - static constantElement = "constant"; + static constElement = "const"; static letElement = "let"; } @@ -2860,9 +2860,9 @@ module ts { return ScriptElementKind.parameterElement; } else if (symbol.valueDeclaration && isConst(symbol.valueDeclaration)) { - return ScriptElementKind.constantElement; + return ScriptElementKind.constElement; } - else if (forEach(symbol.declarations, declaration => declaration.flags & NodeFlags.Let)) { + else if (forEach(symbol.declarations, declaration => isLet(declaration))) { return ScriptElementKind.letElement; } return isLocalVariableOrFunction(symbol) ? ScriptElementKind.localVariableElement : ScriptElementKind.variableElement; @@ -2921,7 +2921,7 @@ module ts { case SyntaxKind.TypeAliasDeclaration: return ScriptElementKind.typeElement; case SyntaxKind.EnumDeclaration: return ScriptElementKind.enumElement; case SyntaxKind.VariableDeclaration: return isConst(node) - ? ScriptElementKind.constantElement + ? ScriptElementKind.constElement : node.flags & NodeFlags.Let ? ScriptElementKind.letElement : ScriptElementKind.variableElement; @@ -3023,7 +3023,7 @@ module ts { switch (symbolKind) { case ScriptElementKind.memberVariableElement: case ScriptElementKind.variableElement: - case ScriptElementKind.constantElement: + case ScriptElementKind.constElement: case ScriptElementKind.parameterElement: case ScriptElementKind.localVariableElement: // If it is call or construct signature of lambda's write type name diff --git a/tests/cases/fourslash/completionEntryForConst.ts b/tests/cases/fourslash/completionEntryForConst.ts index f6b7cc42d63..dc2b2358b0a 100644 --- a/tests/cases/fourslash/completionEntryForConst.ts +++ b/tests/cases/fourslash/completionEntryForConst.ts @@ -4,4 +4,4 @@ /////**/ goTo.marker(); -verify.completionListContains("c", /*text*/ undefined, /*documentation*/ undefined, "constant"); \ No newline at end of file +verify.completionListContains("c", "(const) c: string", /*documentation*/ undefined, "const"); \ No newline at end of file diff --git a/tests/cases/fourslash/constQuickInfoAndCompletionList.ts b/tests/cases/fourslash/constQuickInfoAndCompletionList.ts index 421a9819d44..59a793df40b 100644 --- a/tests/cases/fourslash/constQuickInfoAndCompletionList.ts +++ b/tests/cases/fourslash/constQuickInfoAndCompletionList.ts @@ -10,28 +10,28 @@ //// /*7*/ ////} goTo.marker('1'); -verify.quickInfoIs("(constant) a: number"); +verify.quickInfoIs("(const) a: number"); goTo.marker('2'); -verify.completionListContains("a", "(constant) a: number"); -verify.quickInfoIs("(constant) a: number"); +verify.completionListContains("a", "(const) a: number"); +verify.quickInfoIs("(const) a: number"); goTo.marker('3'); -verify.completionListContains("a", "(constant) a: number"); +verify.completionListContains("a", "(const) a: number"); goTo.marker('4'); -verify.quickInfoIs("(constant) b: number"); +verify.quickInfoIs("(const) b: number"); goTo.marker('5'); -verify.completionListContains("a", "(constant) a: number"); -verify.completionListContains("b", "(constant) b: number"); -verify.quickInfoIs("(constant) b: number"); +verify.completionListContains("a", "(const) a: number"); +verify.completionListContains("b", "(const) b: number"); +verify.quickInfoIs("(const) b: number"); goTo.marker('6'); -verify.completionListContains("a", "(constant) a: number"); -verify.completionListContains("b", "(constant) b: number"); -verify.quickInfoIs("(constant) a: number"); +verify.completionListContains("a", "(const) a: number"); +verify.completionListContains("b", "(const) b: number"); +verify.quickInfoIs("(const) a: number"); goTo.marker('7'); -verify.completionListContains("a", "(constant) a: number"); -verify.completionListContains("b", "(constant) b: number"); \ No newline at end of file +verify.completionListContains("a", "(const) a: number"); +verify.completionListContains("b", "(const) b: number"); \ No newline at end of file diff --git a/tests/cases/fourslash/navbar_const.ts b/tests/cases/fourslash/navbar_const.ts index ede2a9cd1d8..6c0738747f3 100644 --- a/tests/cases/fourslash/navbar_const.ts +++ b/tests/cases/fourslash/navbar_const.ts @@ -1,6 +1,6 @@ /// -//// {| "itemName": "c", "kind": "constant", "parentName": "" |}const c = 0; +//// {| "itemName": "c", "kind": "const", "parentName": "" |}const c = 0; test.markers().forEach(marker => { verify.getScriptLexicalStructureListContains( diff --git a/tests/cases/fourslash/navigateItemsConst.ts b/tests/cases/fourslash/navigateItemsConst.ts index 6f0fdf717ff..d5ccb31066d 100644 --- a/tests/cases/fourslash/navigateItemsConst.ts +++ b/tests/cases/fourslash/navigateItemsConst.ts @@ -1,8 +1,8 @@ /// -////{| "itemName": "c", "kind": "constant", "parentName": "" |}const c = 10; +////{| "itemName": "c", "kind": "const", "parentName": "" |}const c = 10; ////function foo() { -//// {| "itemName": "d", "kind": "constant", "parentName": "foo" |}const d = 10; +//// {| "itemName": "d", "kind": "const", "parentName": "foo" |}const d = 10; ////} test.markers().forEach(marker => { diff --git a/tests/cases/fourslash/quickInfoForConstDeclaration.ts b/tests/cases/fourslash/quickInfoForConstDeclaration.ts index dc234b04050..2b1f108c579 100644 --- a/tests/cases/fourslash/quickInfoForConstDeclaration.ts +++ b/tests/cases/fourslash/quickInfoForConstDeclaration.ts @@ -3,4 +3,4 @@ ////const /**/c = 0 ; goTo.marker(); -verify.quickInfoIs("(constant) c: number"); \ No newline at end of file +verify.quickInfoIs("(const) c: number"); \ No newline at end of file