Skip to content

feat: add string literal unions typescript generic parsing and test #208

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
yilanboy wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −1
Open

feat: add string literal unions typescript generic parsing and test #208

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
2 changes: 1 addition & 1 deletion src/Languages/TypeScript/Patterns/TsGenericPattern.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ final class TsGenericPattern implements Pattern

public function getPattern(): string
{
return '/(?<=\w)(?<match><[A-Z][\w\s,\.\[\]]*>)/';
return '/(?<=\w)(?<match><[A-Z\'"][\w\s,\.\[\]\'"|]*>)/';
}

public function getTokenType(): TokenTypeEnum
Expand Down
8 changes: 8 additions & 0 deletions tests/Languages/TypeScript/TypeScriptLanguageTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,14 @@ interface User {
'class Service<K, V extends Base> {}',
'<span class="hl-keyword">class</span> <span class="hl-type">Service</span><span class="hl-generic">&lt;K, V <span class="hl-keyword">extends</span> Base&gt;</span> {}',
],
[
"let filter: State<'all' | 'active' | 'done'> = 'all';",
'<span class="hl-keyword">let</span> <span class="hl-property">filter</span>: <span class="hl-type">State</span><span class="hl-generic">&lt;<span class="hl-value">\'all\'</span> | <span class="hl-value">\'active\'</span> | <span class="hl-value">\'done\'</span>&gt;</span> = <span class="hl-value">\'all\'</span>;',
],
[
'let filter: State<"all" | "active" | "done"> = "all";',
'<span class="hl-keyword">let</span> <span class="hl-property">filter</span>: <span class="hl-type">State</span><span class="hl-generic">&lt;<span class="hl-value">&quot;all&quot;</span> | <span class="hl-value">&quot;active&quot;</span> | <span class="hl-value">&quot;done&quot;</span>&gt;</span> = <span class="hl-value">&quot;all&quot;</span>;',
],
[
<<<'TXT'
@Component({ selector: 'x' })
Expand Down