Skip to content

Commit 27bec0d

Browse files
author
Andy Hanson
committed
Support completions that require changing from dot to bracket access
1 parent 5e5b770 commit 27bec0d

7 files changed

Lines changed: 183 additions & 197 deletions

‎src/compiler/checker.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2091,7 +2091,7 @@ namespace ts {
20912091
// or the @ symbol. A third underscore indicates an escaped form of an identifer that started
20922092
// with at least two underscores. The @ character indicates that the name is denoted by a well known ES
20932093
// Symbol instance.
2094-
function isReservedMemberName(name: __String) {
2094+
function isReservedMemberName(name: __String) { //!
20952095
return (name as string).charCodeAt(0) === CharacterCodes._ &&
20962096
(name as string).charCodeAt(1) === CharacterCodes._ &&
20972097
(name as string).charCodeAt(2) !== CharacterCodes._ &&

‎src/compiler/diagnosticMessages.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3890,5 +3890,9 @@
38903890
"Install '{0}'": {
38913891
"category": "Message",
38923892
"code": 95014
3893+
},
3894+
"Use bracket notation instead of dot notation": {
3895+
"category": "Message",
3896+
"code": 95015
38933897
}
38943898
}

‎src/services/completions.ts‎

Lines changed: 154 additions & 103 deletions
Large diffs are not rendered by default.

‎tests/cases/fourslash/completionListInvalidMemberNames.ts‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,14 @@
1111
//// "\u0031\u0062": "invalid unicode identifer name (1b)"
1212
////};
1313
////
14-
////x./*a*/;
14+
////[|x./*a*/;|]
1515
////x["/*b*/"];
1616

17-
verify.completionsAt("a", ["bar", "break", "any", "$", "b"]);
18-
verify.completionsAt("b", ["foo ", "bar", "break", "any", "#", "$", "b", "\u0031\u0062"]);
17+
verify.completionsAt("b", ["foo ", "bar", "break", "any", "#", "$", "b", "1b"]);
18+
19+
verify.completionsAt("a", ["foo ", "bar", "break", "any", "#", "$", "b", "1b"]);
20+
verify.applyCodeActionFromCompletion("a", {
21+
name: "foo ",
22+
description: "Use bracket notation instead of dot notation",
23+
newRangeContent: 'x[""];',
24+
});

‎tests/cases/fourslash/completionListInvalidMemberNames2.ts‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,19 @@
11
/// <reference path='fourslash.ts' />
22

3-
////enum Foo {
4-
//// X, Y, '☆'
3+
// TODO: we should probably support this like we do in completionListInvalidMemberNames.ts
4+
5+
////declare var Symbol: SymbolConstructor;
6+
////interface SymbolConstructor {
7+
//// readonly hasInstance: symbol;
8+
////}
9+
////interface Function {
10+
//// [Symbol.hasInstance](value: any): boolean;
11+
////}
12+
////interface SomeInterface {
13+
//// (value: number): any;
514
////}
6-
////Foo./*a*/;
7-
////Foo["/*b*/"];
15+
////var _ : SomeInterface;
16+
////_./**/
817

9-
verify.completionsAt("a", ["X", "Y"]);
10-
verify.completionsAt("b", ["X", "Y", "☆"]);
18+
goTo.marker();
19+
verify.not.completionListContains("[Symbol.hasInstance]");

‎tests/cases/fourslash/completionListInvalidMemberNames3.ts‎

Lines changed: 0 additions & 71 deletions
This file was deleted.

‎tests/cases/fourslash/completion_enum-members-with-invalid-identifiers-should-not-show-in-completion.ts‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)