Skip to content

Commit

Permalink
Adds highlighting for the 'accessor' keyword (#917)
Browse files Browse the repository at this point in the history
Co-authored-by: Sheetal Nandi <shkamat@microsoft.com>
  • Loading branch information
rbuckton and sheetalkamat committed Nov 11, 2022
1 parent a47089d commit 359e091
Show file tree
Hide file tree
Showing 5 changed files with 119 additions and 3 deletions.
2 changes: 1 addition & 1 deletion TypeScript.YAML-tmLanguage
Expand Up @@ -1004,7 +1004,7 @@ repository:

property-accessor:
name: storage.type.property.ts
match: '{{startOfIdentifier}}(get|set){{endOfIdentifier}}'
match: '{{startOfIdentifier}}(accessor|get|set){{endOfIdentifier}}'

async-modifier:
name: storage.modifier.async.ts
Expand Down
2 changes: 1 addition & 1 deletion TypeScript.tmLanguage
Expand Up @@ -3173,7 +3173,7 @@
<key>name</key>
<string>storage.type.property.ts</string>
<key>match</key>
<string>(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(get|set)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))</string>
<string>(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(accessor|get|set)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))</string>
</dict>
<key>async-modifier</key>
<dict>
Expand Down
2 changes: 1 addition & 1 deletion TypeScriptReact.tmLanguage
Expand Up @@ -3195,7 +3195,7 @@
<key>name</key>
<string>storage.type.property.tsx</string>
<key>match</key>
<string>(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(get|set)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))</string>
<string>(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(accessor|get|set)(?![_$[:alnum:]])(?:(?=\.\.\.)|(?!\.))</string>
</dict>
<key>async-modifier</key>
<dict>
Expand Down
110 changes: 110 additions & 0 deletions tests/baselines/autoAccessor.baseline.txt
@@ -0,0 +1,110 @@
original file
-----------------------------------
class C {
accessor a: number;
accessor b = 1;
abstract accessor c: number;
static accessor d = 1;
}

-----------------------------------

Grammar: TypeScript.tmLanguage
-----------------------------------
>class C {
^^^^^
source.ts meta.class.ts storage.type.class.ts
^
source.ts meta.class.ts
^
source.ts meta.class.ts entity.name.type.class.ts
^
source.ts meta.class.ts
^
source.ts meta.class.ts punctuation.definition.block.ts
> accessor a: number;
^^^^
source.ts meta.class.ts
^^^^^^^^
source.ts meta.class.ts storage.type.property.ts
^
source.ts meta.class.ts meta.field.declaration.ts
^
source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
source.ts meta.class.ts meta.field.declaration.ts meta.type.annotation.ts
^^^^^^
source.ts meta.class.ts meta.field.declaration.ts meta.type.annotation.ts support.type.primitive.ts
^
source.ts meta.class.ts punctuation.terminator.statement.ts
> accessor b = 1;
^^^^
source.ts meta.class.ts
^^^^^^^^
source.ts meta.class.ts storage.type.property.ts
^
source.ts meta.class.ts meta.field.declaration.ts
^
source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.field.declaration.ts
^
source.ts meta.class.ts meta.field.declaration.ts keyword.operator.assignment.ts
^
source.ts meta.class.ts meta.field.declaration.ts
^
source.ts meta.class.ts meta.field.declaration.ts constant.numeric.decimal.ts
^
source.ts meta.class.ts punctuation.terminator.statement.ts
> abstract accessor c: number;
^^^^
source.ts meta.class.ts
^^^^^^^^
source.ts meta.class.ts storage.modifier.ts
^
source.ts meta.class.ts
^^^^^^^^
source.ts meta.class.ts storage.type.property.ts
^
source.ts meta.class.ts meta.field.declaration.ts
^
source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
source.ts meta.class.ts meta.field.declaration.ts meta.type.annotation.ts
^^^^^^
source.ts meta.class.ts meta.field.declaration.ts meta.type.annotation.ts support.type.primitive.ts
^
source.ts meta.class.ts punctuation.terminator.statement.ts
> static accessor d = 1;
^^^^
source.ts meta.class.ts
^^^^^^
source.ts meta.class.ts storage.modifier.ts
^
source.ts meta.class.ts
^^^^^^^^
source.ts meta.class.ts storage.type.property.ts
^
source.ts meta.class.ts meta.field.declaration.ts
^
source.ts meta.class.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.class.ts meta.field.declaration.ts
^
source.ts meta.class.ts meta.field.declaration.ts keyword.operator.assignment.ts
^
source.ts meta.class.ts meta.field.declaration.ts
^
source.ts meta.class.ts meta.field.declaration.ts constant.numeric.decimal.ts
^
source.ts meta.class.ts punctuation.terminator.statement.ts
>}
^
source.ts meta.class.ts punctuation.definition.block.ts
>
^
source.ts
6 changes: 6 additions & 0 deletions tests/cases/autoAccessor.ts
@@ -0,0 +1,6 @@
class C {
accessor a: number;
accessor b = 1;
abstract accessor c: number;
static accessor d = 1;
}

0 comments on commit 359e091

Please sign in to comment.