Skip to content

fix: accept newline type arguments without opening bracket #1072

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
jeengbe wants to merge 1 commit into
base: master
Choose a base branch
from
+67 −7
Open

fix: accept newline type arguments without opening bracket #1072

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
6 changes: 5 additions & 1 deletion TypeScript.YAML-tmLanguage
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ variables:
typeArgumentsStart: (((keyof|infer|typeof|readonly)\s+)|(({{identifier}}|{{matchingBraces}}|{{matchingParenthesis}}|{{matchingBrackets}}|{{quotedStrings}})(?=\s*([\<\>\,\.\[]|=>|&(?!&)|\|(?!\|)))))
typeArgumentsInnerExpressionPart: '[^<>\(]|{{matchingParenthesis}}|(?<==)\>'
typeArguments: '<\s*{{typeArgumentsStart}}({{typeArgumentsInnerExpressionPart}}|\<\s*{{typeArgumentsStart}}(({{typeArgumentsInnerExpressionPart}}|\<\s*{{typeArgumentsStart}}({{typeArgumentsInnerExpressionPart}})*(?<!=)\>))*(?<!=)\>)*(?<!=)>'
possiblyMultilineTypeArgument: (<\s*[\{\[\(]\s*$)
possiblyMultilineTypeArgument: (<\s*([\{\[\(]\s*)?$)
functionCallLookup: \s*(?:(\?\.\s*)|(\!))?(({{typeArguments}}\s*)?\()
functionCallNamedTarget: (({{identifier}})(\s*{{propertyAccessPreIdentifier}}({{propertyIdentifier}}))*)|({{propertyAccessPreIdentifier}}{{propertyIdentifier}})
functionCallTarget: (({{functionCallNamedTarget}})|(?<=[\)]))
Expand Down Expand Up @@ -988,6 +988,10 @@ repository:
- include: '#comment'
- include: '#class-or-interface-heritage'
- include: '#type-parameters'
# prevent expressionWithoutIdentifiers>function-call from claiming identifier<\n as a call target in heritage clauses
- match: '({{identifier}})(?=\s*<\s*$)'
captures:
'1': { name: entity.other.inherited-class.ts }
# match expressions before matching identifiers
- include: '#expressionWithoutIdentifiers'
# identifiers are treated as inherited class
Expand Down
18 changes: 15 additions & 3 deletions TypeScript.tmLanguage
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3120,6 +3120,18 @@
<key>include</key>
<string>#type-parameters</string>
</dict>
<dict>
<key>match</key>
<string>([_$[:alpha:]][_$[:alnum:]]*)(?=\s*&lt;\s*$)</string>
<key>captures</key>
<dict>
<key>1</key>
<dict>
<key>name</key>
<string>entity.other.inherited-class.ts</string>
</dict>
</dict>
</dict>
<dict>
<key>include</key>
<string>#expressionWithoutIdentifiers</string>
Expand Down Expand Up @@ -5033,9 +5045,9 @@
</dict>
<dict>
<key>begin</key>
<string>(?=(((([_$[:alpha:]][_$[:alnum:]]*)(\s*\??\.\s*(\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\??\.\s*\#?[_$[:alpha:]][_$[:alnum:]]*))|(?&lt;=[\)]))(&lt;\s*[\{\[\(]\s*$))</string>
<string>(?=(((([_$[:alpha:]][_$[:alnum:]]*)(\s*\??\.\s*(\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\??\.\s*\#?[_$[:alpha:]][_$[:alnum:]]*))|(?&lt;=[\)]))(&lt;\s*([\{\[\(]\s*)?$))</string>
<key>end</key>
<string>(?&lt;=\&gt;)(?!(((([_$[:alpha:]][_$[:alnum:]]*)(\s*\??\.\s*(\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\??\.\s*\#?[_$[:alpha:]][_$[:alnum:]]*))|(?&lt;=[\)]))(&lt;\s*[\{\[\(]\s*$))</string>
<string>(?&lt;=\&gt;)(?!(((([_$[:alpha:]][_$[:alnum:]]*)(\s*\??\.\s*(\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\??\.\s*\#?[_$[:alpha:]][_$[:alnum:]]*))|(?&lt;=[\)]))(&lt;\s*([\{\[\(]\s*)?$))</string>
<key>patterns</key>
<array>
<dict>
Expand All @@ -5044,7 +5056,7 @@
<key>begin</key>
<string>(?=(([_$[:alpha:]][_$[:alnum:]]*)(\s*\??\.\s*(\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\??\.\s*\#?[_$[:alpha:]][_$[:alnum:]]*))</string>
<key>end</key>
<string>(?=(&lt;\s*[\{\[\(]\s*$))</string>
<string>(?=(&lt;\s*([\{\[\(]\s*)?$))</string>
<key>patterns</key>
<array>
<dict>
Expand Down
18 changes: 15 additions & 3 deletions TypeScriptReact.tmLanguage
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3142,6 +3142,18 @@
<key>include</key>
<string>#type-parameters</string>
</dict>
<dict>
<key>match</key>
<string>([_$[:alpha:]][_$[:alnum:]]*)(?=\s*&lt;\s*$)</string>
<key>captures</key>
<dict>
<key>1</key>
<dict>
<key>name</key>
<string>entity.other.inherited-class.tsx</string>
</dict>
</dict>
</dict>
<dict>
<key>include</key>
<string>#expressionWithoutIdentifiers</string>
Expand Down Expand Up @@ -5057,9 +5069,9 @@
</dict>
<dict>
<key>begin</key>
<string>(?=(((([_$[:alpha:]][_$[:alnum:]]*)(\s*\??\.\s*(\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\??\.\s*\#?[_$[:alpha:]][_$[:alnum:]]*))|(?&lt;=[\)]))(&lt;\s*[\{\[\(]\s*$))</string>
<string>(?=(((([_$[:alpha:]][_$[:alnum:]]*)(\s*\??\.\s*(\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\??\.\s*\#?[_$[:alpha:]][_$[:alnum:]]*))|(?&lt;=[\)]))(&lt;\s*([\{\[\(]\s*)?$))</string>
<key>end</key>
<string>(?&lt;=\&gt;)(?!(((([_$[:alpha:]][_$[:alnum:]]*)(\s*\??\.\s*(\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\??\.\s*\#?[_$[:alpha:]][_$[:alnum:]]*))|(?&lt;=[\)]))(&lt;\s*[\{\[\(]\s*$))</string>
<string>(?&lt;=\&gt;)(?!(((([_$[:alpha:]][_$[:alnum:]]*)(\s*\??\.\s*(\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\??\.\s*\#?[_$[:alpha:]][_$[:alnum:]]*))|(?&lt;=[\)]))(&lt;\s*([\{\[\(]\s*)?$))</string>
<key>patterns</key>
<array>
<dict>
Expand All @@ -5068,7 +5080,7 @@
<key>begin</key>
<string>(?=(([_$[:alpha:]][_$[:alnum:]]*)(\s*\??\.\s*(\#?[_$[:alpha:]][_$[:alnum:]]*))*)|(\??\.\s*\#?[_$[:alpha:]][_$[:alnum:]]*))</string>
<key>end</key>
<string>(?=(&lt;\s*[\{\[\(]\s*$))</string>
<string>(?=(&lt;\s*([\{\[\(]\s*)?$))</string>
<key>patterns</key>
<array>
<dict>
Expand Down
30 changes: 30 additions & 0 deletions tests/baselines/Issue876.baseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
original file
-----------------------------------
fn<
A>();

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

Grammar: TypeScript.tmLanguage
-----------------------------------
>fn<
^^
source.ts meta.function-call.ts entity.name.function.ts
^
source.ts meta.type.parameters.ts punctuation.definition.typeparameters.begin.ts
> A>();
^^
source.ts meta.type.parameters.ts
^
source.ts meta.type.parameters.ts entity.name.type.ts
^
source.ts meta.type.parameters.ts punctuation.definition.typeparameters.end.ts
^
source.ts meta.brace.round.ts
^
source.ts meta.brace.round.ts
^
source.ts punctuation.terminator.statement.ts
>
^
source.ts
2 changes: 2 additions & 0 deletions tests/cases/Issue876.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
fn<
A>();