Skip to content

Tokenize type on the line after as or satisfies #1080

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Tomer Aberbach (TomerAberbach) wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Tokenize type on the line after as or satisfies #1080

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions TypeScript.YAML-tmLanguage
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1752,6 +1752,14 @@ repository:
captures:
'1': { name: keyword.control.as.ts }
'2': { name: storage.modifier.ts }
# if type starts on next line use end of a non-empty line as end of type
- begin: '{{startOfIdentifier}}(?:(as)|(satisfies))(?=\s*$)'
beginCaptures:
'1': { name: keyword.control.as.ts }
'2': { name: keyword.control.satisfies.ts }
end: (?<!\bas|\bsatisfies|[|&])((?=[;),}\]:?\-\+\>]|\|\||\&\&|\!\=\=|^\s*$|({{startOfIdentifier}}(as|satisfies)\s+)|(\s+\<))|((?<=\S)(?=\s*$)))
patterns:
- include: '#type'
- begin: '{{startOfIdentifier}}(?:(as)|(satisfies))\s+'
beginCaptures:
'1': { name: keyword.control.as.ts }
Expand Down
26 changes: 26 additions & 0 deletions TypeScript.tmLanguage
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5696,6 +5696,32 @@
</dict>
</dict>
</dict>
<dict>
<key>begin</key>
<string>(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(?:(as)|(satisfies))(?=\s*$)</string>
<key>beginCaptures</key>
<dict>
<key>1</key>
<dict>
<key>name</key>
<string>keyword.control.as.ts</string>
</dict>
<key>2</key>
<dict>
<key>name</key>
<string>keyword.control.satisfies.ts</string>
</dict>
</dict>
<key>end</key>
<string>(?&lt;!\bas|\bsatisfies|[|&amp;])((?=[;),}\]:?\-\+\&gt;]|\|\||\&amp;\&amp;|\!\=\=|^\s*$|((?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(as|satisfies)\s+)|(\s+\&lt;))|((?&lt;=\S)(?=\s*$)))</string>
<key>patterns</key>
<array>
<dict>
<key>include</key>
<string>#type</string>
</dict>
</array>
</dict>
<dict>
<key>begin</key>
<string>(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(?:(as)|(satisfies))\s+</string>
Expand Down
26 changes: 26 additions & 0 deletions TypeScriptReact.tmLanguage
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5642,6 +5642,32 @@
</dict>
</dict>
</dict>
<dict>
<key>begin</key>
<string>(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(?:(as)|(satisfies))(?=\s*$)</string>
<key>beginCaptures</key>
<dict>
<key>1</key>
<dict>
<key>name</key>
<string>keyword.control.as.tsx</string>
</dict>
<key>2</key>
<dict>
<key>name</key>
<string>keyword.control.satisfies.tsx</string>
</dict>
</dict>
<key>end</key>
<string>(?&lt;!\bas|\bsatisfies|[|&amp;])((?=[;),}\]:?\-\+\&gt;]|\|\||\&amp;\&amp;|\!\=\=|^\s*$|((?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(as|satisfies)\s+)|(\s+\&lt;))|((?&lt;=\S)(?=\s*$)))</string>
<key>patterns</key>
<array>
<dict>
<key>include</key>
<string>#type</string>
</dict>
</array>
</dict>
<dict>
<key>begin</key>
<string>(?&lt;![_$[:alnum:]])(?:(?&lt;=\.\.\.)|(?&lt;!\.))(?:(as)|(satisfies))\s+</string>
Expand Down
184 changes: 184 additions & 0 deletions tests/baselines/Issue1079.baseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,184 @@
original file
-----------------------------------
const a = b as
A | undefined

const a = b satisfies
A | undefined

const inlineSourceMap = convertSourceMap.fromSource(content)?.toObject() as
SourceMap | undefined
foo(inlineSourceMap)

const e = (f as
G);

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

Grammar: TypeScript.tmLanguage
-----------------------------------
>const a = b as
^^^^^
source.ts meta.var.expr.ts storage.type.ts
^
source.ts meta.var.expr.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.constant.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
source.ts meta.var.expr.ts keyword.operator.assignment.ts
^
source.ts meta.var.expr.ts
^
source.ts meta.var.expr.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts
^^
source.ts meta.var.expr.ts keyword.control.as.ts
> A | undefined
^^
source.ts meta.var.expr.ts
^
source.ts meta.var.expr.ts entity.name.type.ts
^
source.ts meta.var.expr.ts
^
source.ts meta.var.expr.ts keyword.operator.type.ts
^
source.ts meta.var.expr.ts
^^^^^^^^^
source.ts meta.var.expr.ts support.type.builtin.ts
>
^
source.ts
>const a = b satisfies
^^^^^
source.ts meta.var.expr.ts storage.type.ts
^
source.ts meta.var.expr.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.constant.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
source.ts meta.var.expr.ts keyword.operator.assignment.ts
^
source.ts meta.var.expr.ts
^
source.ts meta.var.expr.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts
^^^^^^^^^
source.ts meta.var.expr.ts keyword.control.satisfies.ts
> A | undefined
^^
source.ts meta.var.expr.ts
^
source.ts meta.var.expr.ts entity.name.type.ts
^
source.ts meta.var.expr.ts
^
source.ts meta.var.expr.ts keyword.operator.type.ts
^
source.ts meta.var.expr.ts
^^^^^^^^^
source.ts meta.var.expr.ts support.type.builtin.ts
>
^
source.ts
>const inlineSourceMap = convertSourceMap.fromSource(content)?.toObject() as
^^^^^
source.ts meta.var.expr.ts storage.type.ts
^
source.ts meta.var.expr.ts
^^^^^^^^^^^^^^^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.constant.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
source.ts meta.var.expr.ts keyword.operator.assignment.ts
^
source.ts meta.var.expr.ts
^^^^^^^^^^^^^^^^
source.ts meta.var.expr.ts meta.function-call.ts variable.other.object.ts
^
source.ts meta.var.expr.ts meta.function-call.ts punctuation.accessor.ts
^^^^^^^^^^
source.ts meta.var.expr.ts meta.function-call.ts entity.name.function.ts
^
source.ts meta.var.expr.ts meta.brace.round.ts
^^^^^^^
source.ts meta.var.expr.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts meta.brace.round.ts
^^
source.ts meta.var.expr.ts meta.function-call.ts punctuation.accessor.optional.ts
^^^^^^^^
source.ts meta.var.expr.ts meta.function-call.ts entity.name.function.ts
^
source.ts meta.var.expr.ts meta.brace.round.ts
^
source.ts meta.var.expr.ts meta.brace.round.ts
^
source.ts meta.var.expr.ts
^^
source.ts meta.var.expr.ts keyword.control.as.ts
> SourceMap | undefined
^^
source.ts meta.var.expr.ts
^^^^^^^^^
source.ts meta.var.expr.ts entity.name.type.ts
^
source.ts meta.var.expr.ts
^
source.ts meta.var.expr.ts keyword.operator.type.ts
^
source.ts meta.var.expr.ts
^^^^^^^^^
source.ts meta.var.expr.ts support.type.builtin.ts
>foo(inlineSourceMap)
^^^
source.ts meta.function-call.ts entity.name.function.ts
^
source.ts meta.brace.round.ts
^^^^^^^^^^^^^^^
source.ts variable.other.readwrite.ts
^
source.ts meta.brace.round.ts
>
^
source.ts
>const e = (f as
^^^^^
source.ts meta.var.expr.ts storage.type.ts
^
source.ts meta.var.expr.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts meta.definition.variable.ts variable.other.constant.ts
^
source.ts meta.var.expr.ts meta.var-single-variable.expr.ts
^
source.ts meta.var.expr.ts keyword.operator.assignment.ts
^
source.ts meta.var.expr.ts
^
source.ts meta.var.expr.ts meta.brace.round.ts
^
source.ts meta.var.expr.ts variable.other.readwrite.ts
^
source.ts meta.var.expr.ts
^^
source.ts meta.var.expr.ts keyword.control.as.ts
> G);
^^
source.ts meta.var.expr.ts
^
source.ts meta.var.expr.ts entity.name.type.ts
^
source.ts meta.var.expr.ts meta.brace.round.ts
^
source.ts punctuation.terminator.statement.ts
>
^
source.ts
12 changes: 12 additions & 0 deletions tests/cases/Issue1079.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
const a = b as
A | undefined

const a = b satisfies
A | undefined

const inlineSourceMap = convertSourceMap.fromSource(content)?.toObject() as
SourceMap | undefined
foo(inlineSourceMap)

const e = (f as
G);