Skip to content

Commit 25e792b

Browse files
committed
Indexer is something that has identifier(parameter) followed by [ with or without type annotation
Fixes #197
1 parent 9e3d7a2 commit 25e792b

File tree

6 files changed

+362
-8
lines changed

6 files changed

+362
-8
lines changed

TypeScript.YAML-tmLanguage

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -529,7 +529,7 @@ repository:
529529

530530
indexer-declaration:
531531
name: meta.indexer.declaration.ts
532-
begin: (?:(?<!\.|\$)\b(readonly)\s*)?(\[)
532+
begin: (?:(?<!\.|\$)\b(readonly)\s*)?(\[)(?=\s*[_$[:alpha:]][_$[:alnum:]]*\s*[:\]])
533533
beginCaptures:
534534
'1': { name: storage.modifier.ts }
535535
'2': { name: meta.brace.square.ts }
@@ -543,7 +543,7 @@ repository:
543543

544544
indexer-parameter:
545545
name: meta.indexer.parameter.ts
546-
match: ([_$[:alpha:]][_$[:alnum:]]*)(?=\:)
546+
match: ([_$[:alpha:]][_$[:alnum:]]*)
547547
captures:
548548
'1': { name: variable.parameter.ts}
549549

TypeScript.tmLanguage

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1735,7 +1735,7 @@
17351735
<key>name</key>
17361736
<string>meta.indexer.declaration.ts</string>
17371737
<key>begin</key>
1738-
<string>(?:(?&lt;!\.|\$)\b(readonly)\s*)?(\[)</string>
1738+
<string>(?:(?&lt;!\.|\$)\b(readonly)\s*)?(\[)(?=\s*[_$[:alpha:]][_$[:alnum:]]*\s*[:\]])</string>
17391739
<key>beginCaptures</key>
17401740
<dict>
17411741
<key>1</key>
@@ -1781,7 +1781,7 @@
17811781
<key>name</key>
17821782
<string>meta.indexer.parameter.ts</string>
17831783
<key>match</key>
1784-
<string>([_$[:alpha:]][_$[:alnum:]]*)(?=\:)</string>
1784+
<string>([_$[:alpha:]][_$[:alnum:]]*)</string>
17851785
<key>captures</key>
17861786
<dict>
17871787
<key>1</key>

TypeScriptReact.tmLanguage

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1739,7 +1739,7 @@
17391739
<key>name</key>
17401740
<string>meta.indexer.declaration.tsx</string>
17411741
<key>begin</key>
1742-
<string>(?:(?&lt;!\.|\$)\b(readonly)\s*)?(\[)</string>
1742+
<string>(?:(?&lt;!\.|\$)\b(readonly)\s*)?(\[)(?=\s*[_$[:alpha:]][_$[:alnum:]]*\s*[:\]])</string>
17431743
<key>beginCaptures</key>
17441744
<dict>
17451745
<key>1</key>
@@ -1785,7 +1785,7 @@
17851785
<key>name</key>
17861786
<string>meta.indexer.parameter.tsx</string>
17871787
<key>match</key>
1788-
<string>([_$[:alpha:]][_$[:alnum:]]*)(?=\:)</string>
1788+
<string>([_$[:alpha:]][_$[:alnum:]]*)</string>
17891789
<key>captures</key>
17901790
<dict>
17911791
<key>1</key>

0 commit comments

Comments
 (0)