Skip to content

Commit

Permalink
Handle multiline type annotation that start with & or | operator
Browse files Browse the repository at this point in the history 
Fixes #935 #949
  • Loading branch information
@sheetalkamat
sheetalkamat committed Feb 9, 2023
1 parent f169c9d commit 88a7e09
Show file tree
Hide file tree
Showing 7 changed files with 401 additions and 3 deletions.
2 changes: 1 addition & 1 deletion TypeScript.YAML-tmLanguage
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2227,7 +2227,7 @@ repository:
begin: (:)
beginCaptures:
'1': { name: keyword.operator.type.annotation.ts }
end: (?<![:|&])((?=[,);\}\]]|//)|(?==[^>])|(?=^\s*$)|((?<=\S)(?=\s*$))|((?<=[\}>\]\)]|[_$[:alpha:]])\s*(?=\{)))
end: (?<![:|&])((?=[,);\}\]]|\/\/)|(?==[^>])|(?=^\s*$)|((?<=[\}>\]\)]|[_$[:alpha:]])\s*(?=\{)))
patterns:
- include: '#type'

Expand Down
2 changes: 1 addition & 1 deletion TypeScript.tmLanguage
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6799,7 +6799,7 @@
</dict>
</dict>
<key>end</key>
<string>(?&lt;![:|&amp;])((?=[,);\}\]]|//)|(?==[^&gt;])|(?=^\s*$)|((?&lt;=\S)(?=\s*$))|((?&lt;=[\}&gt;\]\)]|[_$[:alpha:]])\s*(?=\{)))</string>
<string>(?&lt;![:|&amp;])((?=[,);\}\]]|\/\/)|(?==[^&gt;])|(?=^\s*$)|((?&lt;=[\}&gt;\]\)]|[_$[:alpha:]])\s*(?=\{)))</string>
<key>patterns</key>
<array>
<dict>
Expand Down
2 changes: 1 addition & 1 deletion TypeScriptReact.tmLanguage
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6747,7 +6747,7 @@
</dict>
</dict>
<key>end</key>
<string>(?&lt;![:|&amp;])((?=[,);\}\]]|//)|(?==[^&gt;])|(?=^\s*$)|((?&lt;=\S)(?=\s*$))|((?&lt;=[\}&gt;\]\)]|[_$[:alpha:]])\s*(?=\{)))</string>
<string>(?&lt;![:|&amp;])((?=[,);\}\]]|\/\/)|(?==[^&gt;])|(?=^\s*$)|((?&lt;=[\}&gt;\]\)]|[_$[:alpha:]])\s*(?=\{)))</string>
<key>patterns</key>
<array>
<dict>
Expand Down
210 changes: 210 additions & 0 deletions tests/baselines/issue935.baseline.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,210 @@
original file
-----------------------------------
export interface FeatureControl {
enableCompletionProvider?:
string
| {
processCompletions?(completion: CustomCompletionItem): vsc.CompletionItem[]
}
}

export interface RegisterLanguageSupportOptions {
/** handle requesting position in document */
pathAutoRename?: {
glob: string
isSpecCanBeUsed?(specName): boolean | string
}
}

export interface API {
}
-----------------------------------

Grammar: TypeScript.tmLanguage
-----------------------------------
>export interface FeatureControl {
^^^^^^
source.ts meta.interface.ts keyword.control.export.ts
^
source.ts meta.interface.ts
^^^^^^^^^
source.ts meta.interface.ts storage.type.interface.ts
^
source.ts meta.interface.ts
^^^^^^^^^^^^^^
source.ts meta.interface.ts entity.name.type.interface.ts
^
source.ts meta.interface.ts
^
source.ts meta.interface.ts punctuation.definition.block.ts
> enableCompletionProvider?:
^^^^
source.ts meta.interface.ts meta.field.declaration.ts
^^^^^^^^^^^^^^^^^^^^^^^^
source.ts meta.interface.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.interface.ts meta.field.declaration.ts keyword.operator.optional.ts
^
source.ts meta.interface.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
> string
^^^^
source.ts meta.interface.ts meta.field.declaration.ts meta.type.annotation.ts
^^^^^^
source.ts meta.interface.ts meta.field.declaration.ts meta.type.annotation.ts support.type.primitive.ts
> | {
^^^^
source.ts meta.interface.ts meta.field.declaration.ts meta.type.annotation.ts
^
source.ts meta.interface.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.ts
^
source.ts meta.interface.ts meta.field.declaration.ts meta.type.annotation.ts
^
source.ts meta.interface.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts
> processCompletions?(completion: CustomCompletionItem): vsc.CompletionItem[]
^^^^^^^^
source.ts meta.interface.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.method.declaration.ts
^^^^^^^^^^^^^^^^^^
source.ts meta.interface.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.interface.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.method.declaration.ts keyword.operator.optional.ts
^
source.ts meta.interface.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^^^^^^^^^^
source.ts meta.interface.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts
^
source.ts meta.interface.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
source.ts meta.interface.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts
^^^^^^^^^^^^^^^^^^^^
source.ts meta.interface.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.method.declaration.ts meta.parameters.ts meta.type.annotation.ts entity.name.type.ts
^
source.ts meta.interface.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts
^
source.ts meta.interface.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.method.declaration.ts meta.return.type.ts keyword.operator.type.annotation.ts
^
source.ts meta.interface.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.method.declaration.ts meta.return.type.ts
^^^
source.ts meta.interface.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.method.declaration.ts meta.return.type.ts entity.name.type.module.ts
^
source.ts meta.interface.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.method.declaration.ts meta.return.type.ts punctuation.accessor.ts
^^^^^^^^^^^^^^
source.ts meta.interface.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.method.declaration.ts meta.return.type.ts entity.name.type.ts
^
source.ts meta.interface.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.method.declaration.ts meta.return.type.ts meta.type.tuple.ts meta.brace.square.ts
^
source.ts meta.interface.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.method.declaration.ts meta.return.type.ts meta.type.tuple.ts meta.brace.square.ts
> }
^^^^
source.ts meta.interface.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts
^
source.ts meta.interface.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts
>}
^
source.ts meta.interface.ts punctuation.definition.block.ts
>
^
source.ts
>export interface RegisterLanguageSupportOptions {
^^^^^^
source.ts meta.interface.ts keyword.control.export.ts
^
source.ts meta.interface.ts
^^^^^^^^^
source.ts meta.interface.ts storage.type.interface.ts
^
source.ts meta.interface.ts
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
source.ts meta.interface.ts entity.name.type.interface.ts
^
source.ts meta.interface.ts
^
source.ts meta.interface.ts punctuation.definition.block.ts
> /** handle requesting position in document */
^^^^
source.ts meta.interface.ts
^^^
source.ts meta.interface.ts comment.block.documentation.ts punctuation.definition.comment.ts
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
source.ts meta.interface.ts comment.block.documentation.ts
^^
source.ts meta.interface.ts comment.block.documentation.ts punctuation.definition.comment.ts
> pathAutoRename?: {
^^^^
source.ts meta.interface.ts meta.field.declaration.ts
^^^^^^^^^^^^^^
source.ts meta.interface.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.interface.ts meta.field.declaration.ts keyword.operator.optional.ts
^
source.ts meta.interface.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
source.ts meta.interface.ts meta.field.declaration.ts meta.type.annotation.ts
^
source.ts meta.interface.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts
> glob: string
^^^^^^^^
source.ts meta.interface.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts
^^^^
source.ts meta.interface.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.definition.property.ts variable.object.property.ts
^
source.ts meta.interface.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts keyword.operator.type.annotation.ts
^
source.ts meta.interface.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts
^^^^^^
source.ts meta.interface.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.field.declaration.ts meta.type.annotation.ts support.type.primitive.ts
> isSpecCanBeUsed?(specName): boolean | string
^^^^^^^^
source.ts meta.interface.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.method.declaration.ts
^^^^^^^^^^^^^^^
source.ts meta.interface.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.method.declaration.ts meta.definition.method.ts entity.name.function.ts
^
source.ts meta.interface.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.method.declaration.ts keyword.operator.optional.ts
^
source.ts meta.interface.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.begin.ts
^^^^^^^^
source.ts meta.interface.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.method.declaration.ts meta.parameters.ts variable.parameter.ts
^
source.ts meta.interface.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.method.declaration.ts meta.parameters.ts punctuation.definition.parameters.end.ts
^
source.ts meta.interface.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.method.declaration.ts meta.return.type.ts keyword.operator.type.annotation.ts
^
source.ts meta.interface.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.method.declaration.ts meta.return.type.ts
^^^^^^^
source.ts meta.interface.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.method.declaration.ts meta.return.type.ts support.type.primitive.ts
^
source.ts meta.interface.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.method.declaration.ts meta.return.type.ts
^
source.ts meta.interface.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.method.declaration.ts meta.return.type.ts keyword.operator.type.ts
^
source.ts meta.interface.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.method.declaration.ts meta.return.type.ts
^^^^^^
source.ts meta.interface.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts meta.method.declaration.ts meta.return.type.ts support.type.primitive.ts
> }
^^^^
source.ts meta.interface.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts
^
source.ts meta.interface.ts meta.field.declaration.ts meta.type.annotation.ts meta.object.type.ts punctuation.definition.block.ts
>}
^
source.ts meta.interface.ts punctuation.definition.block.ts
>
^
source.ts
>export interface API {
^^^^^^
source.ts meta.interface.ts keyword.control.export.ts
^
source.ts meta.interface.ts
^^^^^^^^^
source.ts meta.interface.ts storage.type.interface.ts
^
source.ts meta.interface.ts
^^^
source.ts meta.interface.ts entity.name.type.interface.ts
^
source.ts meta.interface.ts
^
source.ts meta.interface.ts punctuation.definition.block.ts
>}
^
source.ts meta.interface.ts punctuation.definition.block.ts
Loading

0 comments on commit 88a7e09

Please sign in to comment.