Skip to content

Add support for PHP 8.0 features #88

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
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Add support for PHP 8.0 features #88

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
413f949
respect indented HEREDOC terminator
miken32 Nov 24, 2020
fe03f52
allow uncaptured exceptions
miken32 Nov 24, 2020
53c788b
support native "mixed" type
miken32 Nov 24, 2020
9fd9c8f
add static return type
miken32 Nov 24, 2020
caa1832
recognize match control structure
miken32 Nov 24, 2020
c36b500
highlight nullsafe operator
miken32 Nov 24, 2020
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
50 changes: 28 additions & 22 deletions Syntaxes/PHP.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -547,17 +547,17 @@
<dict>
<key>begin</key>
<string>(?ix)
(?: # Optional
(?: # Optional
(\?)?
(?:
(array|bool|float|int|string) # scalar-type
| (callable|iterable) # base-type-declaration
(array|bool|float|int|string|mixed) # scalar-type
| (callable|iterable) # base-type-declaration
| ([a-z_0-9\\]*[a-z_][a-z_0-9]*)
)
\s+
)?
(?:(&amp;)\s*)? # Reference
((\$+)[a-z_\x{7f}-\x{ff}][a-z0-9_\x{7f}-\x{ff}]*) # Variable name
(?:(&amp;)\s*)? # Reference
((\$+)[a-z_\x{7f}-\x{ff}][a-z0-9_\x{7f}-\x{ff}]*) # Variable name
</string>
<key>beginCaptures</key>
<dict>
Expand Down Expand Up @@ -777,7 +777,7 @@
<key>contentName</key>
<string>text.html</string>
<key>end</key>
<string>^(\3)\b</string>
<string>^\s*(\3)\b</string>
<key>endCaptures</key>
<dict>
<key>0</key>
Expand Down Expand Up @@ -825,7 +825,7 @@
<key>contentName</key>
<string>text.xml</string>
<key>end</key>
<string>^(\3)\b</string>
<string>^\s*(\3)\b</string>
<key>endCaptures</key>
<dict>
<key>0</key>
Expand Down Expand Up @@ -873,7 +873,7 @@
<key>contentName</key>
<string>source.sql</string>
<key>end</key>
<string>^(\3)\b</string>
<string>^\s*(\3)\b</string>
<key>endCaptures</key>
<dict>
<key>0</key>
Expand Down Expand Up @@ -921,7 +921,7 @@
<key>contentName</key>
<string>source.js</string>
<key>end</key>
<string>^(\3)\b</string>
<string>^\s*(\3)\b</string>
<key>endCaptures</key>
<dict>
<key>0</key>
Expand Down Expand Up @@ -969,7 +969,7 @@
<key>contentName</key>
<string>source.json</string>
<key>end</key>
<string>^(\3)\b</string>
<string>^\s*(\3)\b</string>
<key>endCaptures</key>
<dict>
<key>0</key>
Expand Down Expand Up @@ -1017,7 +1017,7 @@
<key>contentName</key>
<string>source.css</string>
<key>end</key>
<string>^(\3)\b</string>
<string>^\s*(\3)\b</string>
<key>endCaptures</key>
<dict>
<key>0</key>
Expand Down Expand Up @@ -1065,7 +1065,7 @@
<key>contentName</key>
<string>string.regexp.heredoc.php</string>
<key>end</key>
<string>^(\3)\b</string>
<string>^\s*(\3)\b</string>
<key>endCaptures</key>
<dict>
<key>0</key>
Expand Down Expand Up @@ -1184,7 +1184,7 @@
</dict>
</dict>
<key>end</key>
<string>^(\3)\b</string>
<string>^\s*(\3)\b</string>
<key>endCaptures</key>
<dict>
<key>1</key>
Expand Down Expand Up @@ -1683,7 +1683,7 @@
</dict>
</dict>
<key>match</key>
<string>\s*\b((break|c(ase|ontinue)|d(e(clare|fault)|ie|o)|e(lse(if)?|nd(declare|for(each)?|if|switch|while)|xit)|for(each)?|if|return|switch|use|while|yield))\b</string>
<string>\s*\b((break|c(ase|ontinue)|d(e(clare|fault)|ie|o)|e(lse(if)?|nd(declare|for(each)?|if|switch|while)|xit)|for(each)?|if|match|return|switch|use|while|yield))\b</string>
</dict>
<dict>
<key>begin</key>
Expand Down Expand Up @@ -1720,7 +1720,7 @@
</dict>
</dict>
<key>end</key>
<string>([A-Za-z_][A-Za-z_0-9]*)\s*((\$+)[a-zA-Z_\x{7f}-\x{ff}][a-zA-Z0-9_\x{7f}-\x{ff}]*)\s*\)</string>
<string>([A-Za-z_][A-Za-z_0-9]*)\s*((\$+)[a-zA-Z_\x{7f}-\x{ff}][a-zA-Z0-9_\x{7f}-\x{ff}]*)?\s*\)</string>
<key>endCaptures</key>
<dict>
<key>1</key>
Expand Down Expand Up @@ -1920,15 +1920,16 @@
<string>meta.function.arguments.php</string>
<key>end</key>
<string>(?ix)
(\)) # Close arguments
(?: # Optional return type
(\)) # Close arguments
(?: # Optional return type
\s*(:)\s*
(\?)?
(?:
(array|bool|float|int|string) # scalar-type
| (callable|iterable) # base-type-declaration
(array|bool|float|int|string|mixed) # scalar-type
| (callable|iterable) # base-type-declaration
| (void)
| ([a-z_0-9\\]*[a-z_][a-z_0-9]*) # qualified-name
| (self|parent|static) # late static binding
| ([a-z_0-9\\]*[a-z_][a-z_0-9]*) # qualified-name
)
)?
</string>
Expand Down Expand Up @@ -1965,6 +1966,11 @@
<string>storage.type.void.php</string>
</dict>
<key>7</key>
<dict>
<key>name</key>
<string>storage.type.$7.php</string>
</dict>
<key>8</key>
<dict>
<key>patterns</key>
<array>
Expand Down Expand Up @@ -2138,7 +2144,7 @@
</dict>
<dict>
<key>match</key>
<string>(?i)\b(array|real|double|float|int(eger)?|bool(ean)?|string|class|clone|var|function|interface|parent|self|object)\b</string>
<string>(?i)\b(array|real|double|float|int(eger)?|bool(ean)?|string|mixed|class|clone|var|function|interface|parent|self|object)\b</string>
<key>name</key>
<string>storage.type.php</string>
</dict>
Expand Down Expand Up @@ -2450,7 +2456,7 @@
</dict>
</dict>
<key>match</key>
<string>(?x)(-&gt;)
<string>(?x)(\??-&gt;)
(?:
([A-Za-z_][A-Za-z_0-9]*)\s*\(
|
Expand Down