Skip to content
This repository has been archived by the owner on Dec 15, 2022. It is now read-only.

Add scope for PHP primitive types #389

Closed
wants to merge 16 commits into from
Closed

Add scope for PHP primitive types #389

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
4d1ef95
Add `storage.primitive.php` scope for PHP primitive types
bakerkretzmar Apr 15, 2020
688c886
Add primitive scope to typed properties and update tests
bakerkretzmar Apr 15, 2020
92e6bbf
Add primitive scope to closure return types and update tests
bakerkretzmar Apr 15, 2020
6478a28
Add primitive scope to arrow function return types and update tests
bakerkretzmar Apr 15, 2020
2a938ff
Add primitive scope to function return types and update tests
bakerkretzmar Apr 15, 2020
17e2c45
Add primitive scope to type casts and update tests
bakerkretzmar Apr 15, 2020
7206557
Add primitive scope to function and method argument typehints and upd…
bakerkretzmar Apr 15, 2020
484b025
Update more tests
bakerkretzmar Apr 15, 2020
91373a0
Add primitive scope to array and callable argument typehints and upda…
bakerkretzmar Apr 15, 2020
e818c0a
Update scope to `storage.type.primitive.php`
bakerkretzmar Apr 15, 2020
1bbb5a0
Add word boundaries to regex
bakerkretzmar Apr 15, 2020
261e693
Fix missing quotes on keys
bakerkretzmar Apr 29, 2020
d1071b8
Consistent quotes in tests
bakerkretzmar Apr 29, 2020
915ff09
Replace \b with ^...$ in regex
bakerkretzmar Apr 29, 2020
a097719
Remove parentheses from regex
bakerkretzmar Apr 29, 2020
054d564
Revert to using \b in regex
bakerkretzmar Apr 30, 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
42 changes: 42 additions & 0 deletions grammars/php.cson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,6 +462,11 @@
'name': 'keyword.operator.nullable-type.php'
'3':
'name': 'storage.type.php'
'patterns': [
{
'include': '#primitives'
}
]
}
]
}
Expand Down Expand Up @@ -503,6 +508,11 @@
'name': 'keyword.operator.nullable-type.php'
'3':
'name': 'storage.type.php'
'patterns': [
{
'include': '#primitives'
}
]
}
]
}
Expand Down Expand Up @@ -546,6 +556,11 @@
'name': 'keyword.operator.nullable-type.php'
'4':
'name': 'storage.type.php'
'patterns': [
{
'include': '#primitives'
}
]
'name': 'meta.function.php'
'patterns': [
{
Expand Down Expand Up @@ -585,6 +600,11 @@
]
'4':
'name': 'storage.type.php'
'patterns': [
{
'include': '#primitives'
}
]
'5':
'name': 'variable.other.php'
'6':
Expand Down Expand Up @@ -638,6 +658,11 @@
'name': 'punctuation.definition.storage-type.begin.bracket.round.php'
'2':
'name': 'storage.type.php'
'patterns': [
{
'include': '#primitives'
}
]
'3':
'name': 'punctuation.definition.storage-type.end.bracket.round.php'
}
Expand Down Expand Up @@ -825,6 +850,13 @@
}
]
'repository':
'primitives':
'patterns': [
{
'match': '^array|bool|callable|float|int|iterable|object|string$'
'name': 'storage.type.primitive.php'
}
]
'class-builtin':
'patterns': [
{
Expand Down Expand Up @@ -1267,6 +1299,11 @@
'name': 'keyword.operator.nullable-type.php'
'2':
'name': 'storage.type.php'
'patterns': [
{
'include': '#primitives'
}
]
'3':
'name': 'variable.other.php'
'4':
Expand Down Expand Up @@ -1314,6 +1351,11 @@
]
'3':
'name': 'storage.type.php'
'patterns': [
{
'include': '#primitives'
}
]
'4':
'name': 'variable.other.php'
'5':
Expand Down
Loading