From a9714257cc8555faabafe10896b60d0c1496db27 Mon Sep 17 00:00:00 2001 From: Mohamed Hegazy Date: Mon, 1 Dec 2014 23:46:09 -0800 Subject: [PATCH 1/3] Handel modifier const in getOccurrances --- src/services/services.ts | 5 +++++ tests/cases/fourslash/getOccurrencesConst.ts | 14 ++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 tests/cases/fourslash/getOccurrencesConst.ts diff --git a/src/services/services.ts b/src/services/services.ts index 8bbc03aad6f..c12a1f53e02 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -3802,6 +3802,9 @@ module ts { return undefined; } } + else if (declaration.flags & NodeFlags.Const) { + return undefined; + } var keywords: Node[] = []; var modifierFlag: NodeFlags = getFlagFromModifier(modifier); @@ -3857,6 +3860,8 @@ module ts { return NodeFlags.Export; case SyntaxKind.DeclareKeyword: return NodeFlags.Ambient; + case SyntaxKind.ConstKeyword: + return NodeFlags.Const; default: Debug.fail(); } diff --git a/tests/cases/fourslash/getOccurrencesConst.ts b/tests/cases/fourslash/getOccurrencesConst.ts new file mode 100644 index 00000000000..107ad4a5c24 --- /dev/null +++ b/tests/cases/fourslash/getOccurrencesConst.ts @@ -0,0 +1,14 @@ +/// + +/////*1*/const enum E1 { +//// v1, +//// v2 +////} +//// +/////*2*/const c = 0; + +goTo.marker("1"); +verify.occurrencesAtPositionCount(0); + +goTo.marker("2"); +verify.occurrencesAtPositionCount(0); From d31dfd6f2f94add51df9c66fb4e21f4b81e42b3e Mon Sep 17 00:00:00 2001 From: Mohamed Hegazy Date: Tue, 2 Dec 2014 20:20:53 -0800 Subject: [PATCH 2/3] Handel unsuported modiefiers in getModifierOccurrences --- src/services/services.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/services/services.ts b/src/services/services.ts index 96817e276e2..48adbed9169 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -3807,7 +3807,8 @@ module ts { return undefined; } } - else if (declaration.flags & NodeFlags.Const) { + else { + // unsuported modifier return undefined; } @@ -3865,8 +3866,6 @@ module ts { return NodeFlags.Export; case SyntaxKind.DeclareKeyword: return NodeFlags.Ambient; - case SyntaxKind.ConstKeyword: - return NodeFlags.Const; default: Debug.fail(); } From 4a318bb73dbeb6ffb2b4cda9e4a9113daf7b4fc4 Mon Sep 17 00:00:00 2001 From: Mohamed Hegazy Date: Tue, 2 Dec 2014 21:08:16 -0800 Subject: [PATCH 3/3] Fix typo in comment --- src/services/services.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/services/services.ts b/src/services/services.ts index 48adbed9169..4a6848ef3b0 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -3808,7 +3808,7 @@ module ts { } } else { - // unsuported modifier + // unsupported modifier return undefined; }