@salesforce/apex-tmlanguage 1.7.0 → 1.8.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/grammars/apex.tmLanguage +59 -59
- package/grammars/apex.tmLanguage.cson +59 -59
- package/grammars/soql.tmLanguage +59 -59
- package/package.json +22 -22
package/grammars/apex.tmLanguage
CHANGED
|
@@ -1914,15 +1914,15 @@
|
|
|
1914
1914
|
<dict>
|
|
1915
1915
|
<key>begin</key>
|
|
1916
1916
|
<string>(?x)
|
|
1917
|
-
(?<
|
|
1917
|
+
(?<type_name>
|
|
1918
1918
|
(?:
|
|
1919
1919
|
(?:
|
|
1920
1920
|
(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\s*\:\:\s*)? # alias-qualification
|
|
1921
|
-
(?<
|
|
1921
|
+
(?<name_and_type_args> # identifier + type arguments (if any)
|
|
1922
1922
|
\g<identifier>\s*
|
|
1923
|
-
(?<
|
|
1923
|
+
(?<type_args>\s*<(?:[^<>]|\g<type_args>)+>\s*)?
|
|
1924
1924
|
)
|
|
1925
|
-
(?:\s*\.\s*\g<
|
|
1925
|
+
(?:\s*\.\s*\g<name_and_type_args>)*
|
|
1926
1926
|
)
|
|
1927
1927
|
(?:\s*\?\s*)? # nullable suffix?
|
|
1928
1928
|
(?:\s*\[(?:\s*,\s*)*\]\s*)* # array suffix?
|
|
@@ -1985,25 +1985,25 @@
|
|
|
1985
1985
|
<key>begin</key>
|
|
1986
1986
|
<string>(?x)
|
|
1987
1987
|
(?!.*\b(?:class|interface|enum)\b)\s*
|
|
1988
|
-
(?<
|
|
1989
|
-
(?<
|
|
1988
|
+
(?<return_type>
|
|
1989
|
+
(?<type_name>
|
|
1990
1990
|
(?:
|
|
1991
1991
|
(?:ref\s+)? # ref return
|
|
1992
1992
|
(?:
|
|
1993
1993
|
(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\s*\:\:\s*)? # alias-qualification
|
|
1994
|
-
(?<
|
|
1994
|
+
(?<name_and_type_args> # identifier + type arguments (if any)
|
|
1995
1995
|
\g<identifier>\s*
|
|
1996
|
-
(?<
|
|
1996
|
+
(?<type_args>\s*<(?:[^<>]|\g<type_args>)+>\s*)?
|
|
1997
1997
|
)
|
|
1998
|
-
(?:\s*\.\s*\g<
|
|
1998
|
+
(?:\s*\.\s*\g<name_and_type_args>)*
|
|
1999
1999
|
)
|
|
2000
2000
|
(?:\s*\?\s*)? # nullable suffix?
|
|
2001
2001
|
(?:\s*\[(?:\s*,\s*)*\]\s*)* # array suffix?
|
|
2002
2002
|
)
|
|
2003
2003
|
)\s+
|
|
2004
2004
|
)
|
|
2005
|
-
(?<
|
|
2006
|
-
(?<
|
|
2005
|
+
(?<interface_name>\g<type_name>\s*\.\s*)?
|
|
2006
|
+
(?<property_name>\g<identifier>)\s*
|
|
2007
2007
|
(?=\{|=>|$)</string>
|
|
2008
2008
|
<key>beginCaptures</key>
|
|
2009
2009
|
<dict>
|
|
@@ -2067,25 +2067,25 @@
|
|
|
2067
2067
|
<dict>
|
|
2068
2068
|
<key>begin</key>
|
|
2069
2069
|
<string>(?x)
|
|
2070
|
-
(?<
|
|
2071
|
-
(?<
|
|
2070
|
+
(?<return_type>
|
|
2071
|
+
(?<type_name>
|
|
2072
2072
|
(?:
|
|
2073
2073
|
(?:ref\s+)? # ref return
|
|
2074
2074
|
(?:
|
|
2075
2075
|
(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\s*\:\:\s*)? # alias-qualification
|
|
2076
|
-
(?<
|
|
2076
|
+
(?<name_and_type_args> # identifier + type arguments (if any)
|
|
2077
2077
|
\g<identifier>\s*
|
|
2078
|
-
(?<
|
|
2078
|
+
(?<type_args>\s*<(?:[^<>]|\g<type_args>)+>\s*)?
|
|
2079
2079
|
)
|
|
2080
|
-
(?:\s*\.\s*\g<
|
|
2080
|
+
(?:\s*\.\s*\g<name_and_type_args>)*
|
|
2081
2081
|
)
|
|
2082
2082
|
(?:\s*\?\s*)? # nullable suffix?
|
|
2083
2083
|
(?:\s*\[(?:\s*,\s*)*\]\s*)* # array suffix?
|
|
2084
2084
|
)
|
|
2085
2085
|
)\s+
|
|
2086
2086
|
)
|
|
2087
|
-
(?<
|
|
2088
|
-
(?<
|
|
2087
|
+
(?<interface_name>\g<type_name>\s*\.\s*)?
|
|
2088
|
+
(?<indexer_name>this)\s*
|
|
2089
2089
|
(?=\[)</string>
|
|
2090
2090
|
<key>beginCaptures</key>
|
|
2091
2091
|
<dict>
|
|
@@ -2205,24 +2205,24 @@
|
|
|
2205
2205
|
<dict>
|
|
2206
2206
|
<key>begin</key>
|
|
2207
2207
|
<string>(?x)
|
|
2208
|
-
(?<
|
|
2209
|
-
(?<
|
|
2208
|
+
(?<return_type>
|
|
2209
|
+
(?<type_name>
|
|
2210
2210
|
(?:
|
|
2211
2211
|
(?:ref\s+)? # ref return
|
|
2212
2212
|
(?:
|
|
2213
2213
|
(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\s*\:\:\s*)? # alias-qualification
|
|
2214
|
-
(?<
|
|
2214
|
+
(?<name_and_type_args> # identifier + type arguments (if any)
|
|
2215
2215
|
\g<identifier>\s*
|
|
2216
|
-
(?<
|
|
2216
|
+
(?<type_args>\s*<(?:[^<>]|\g<type_args>)+>\s*)?
|
|
2217
2217
|
)
|
|
2218
|
-
(?:\s*\.\s*\g<
|
|
2218
|
+
(?:\s*\.\s*\g<name_and_type_args>)*
|
|
2219
2219
|
)
|
|
2220
2220
|
(?:\s*\?\s*)? # nullable suffix?
|
|
2221
2221
|
(?:\s*\[(?:\s*,\s*)*\]\s*)* # array suffix?
|
|
2222
2222
|
)
|
|
2223
2223
|
)\s+
|
|
2224
2224
|
)
|
|
2225
|
-
(?<
|
|
2225
|
+
(?<interface_name>\g<type_name>\s*\.\s*)?
|
|
2226
2226
|
(\g<identifier>)\s*
|
|
2227
2227
|
(<([^<>]+)>)?\s*
|
|
2228
2228
|
(?=\()</string>
|
|
@@ -3235,15 +3235,15 @@
|
|
|
3235
3235
|
<dict>
|
|
3236
3236
|
<key>match</key>
|
|
3237
3237
|
<string>(?x)
|
|
3238
|
-
(?<
|
|
3238
|
+
(?<type_name>
|
|
3239
3239
|
(?:
|
|
3240
3240
|
(?:
|
|
3241
3241
|
(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\s*\:\:\s*)? # alias-qualification
|
|
3242
|
-
(?<
|
|
3242
|
+
(?<name_and_type_args> # identifier + type arguments (if any)
|
|
3243
3243
|
\g<identifier>\s*
|
|
3244
|
-
(?<
|
|
3244
|
+
(?<type_args>\s*<(?:[^<>]|\g<type_args>)+>\s*)?
|
|
3245
3245
|
)
|
|
3246
|
-
(?:\s*\.\s*\g<
|
|
3246
|
+
(?:\s*\.\s*\g<name_and_type_args>)*
|
|
3247
3247
|
)
|
|
3248
3248
|
(?:\s*\?\s*)? # nullable suffix?
|
|
3249
3249
|
(?:\s*\[(?:\s*,\s*)*\]\s*)* # array suffix?
|
|
@@ -3305,16 +3305,16 @@
|
|
|
3305
3305
|
<string>(?x)
|
|
3306
3306
|
(?:
|
|
3307
3307
|
(?:(\bref)\s+)?(\bvar\b)| # ref local
|
|
3308
|
-
(?<
|
|
3308
|
+
(?<type_name>
|
|
3309
3309
|
(?:
|
|
3310
3310
|
(?:ref\s+)? # ref local
|
|
3311
3311
|
(?:
|
|
3312
3312
|
(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\s*\:\:\s*)? # alias-qualification
|
|
3313
|
-
(?<
|
|
3313
|
+
(?<name_and_type_args> # identifier + type arguments (if any)
|
|
3314
3314
|
\g<identifier>\s*
|
|
3315
|
-
(?<
|
|
3315
|
+
(?<type_args>\s*<(?:[^<>]|\g<type_args>)+>\s*)?
|
|
3316
3316
|
)
|
|
3317
|
-
(?:\s*\.\s*\g<
|
|
3317
|
+
(?:\s*\.\s*\g<name_and_type_args>)*
|
|
3318
3318
|
)
|
|
3319
3319
|
(?:\s*\?\s*)? # nullable suffix?
|
|
3320
3320
|
(?:\s*\[(?:\s*,\s*)*\]\s*)* # array suffix?
|
|
@@ -3383,16 +3383,16 @@
|
|
|
3383
3383
|
<dict>
|
|
3384
3384
|
<key>begin</key>
|
|
3385
3385
|
<string>(?x)
|
|
3386
|
-
(?<
|
|
3387
|
-
(?<
|
|
3386
|
+
(?<const_keyword>\b(?:const)\b)\s*
|
|
3387
|
+
(?<type_name>
|
|
3388
3388
|
(?:
|
|
3389
3389
|
(?:
|
|
3390
3390
|
(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\s*\:\:\s*)? # alias-qualification
|
|
3391
|
-
(?<
|
|
3391
|
+
(?<name_and_type_args> # identifier + type arguments (if any)
|
|
3392
3392
|
\g<identifier>\s*
|
|
3393
|
-
(?<
|
|
3393
|
+
(?<type_args>\s*<(?:[^<>]|\g<type_args>)+>\s*)?
|
|
3394
3394
|
)
|
|
3395
|
-
(?:\s*\.\s*\g<
|
|
3395
|
+
(?:\s*\.\s*\g<name_and_type_args>)*
|
|
3396
3396
|
)
|
|
3397
3397
|
(?:\s*\?\s*)? # nullable suffix?
|
|
3398
3398
|
(?:\s*\[(?:\s*,\s*)*\]\s*)* # array suffix?
|
|
@@ -3796,15 +3796,15 @@
|
|
|
3796
3796
|
<key>match</key>
|
|
3797
3797
|
<string>(?x)
|
|
3798
3798
|
(\()\s*
|
|
3799
|
-
(?<
|
|
3799
|
+
(?<type_name>
|
|
3800
3800
|
(?:
|
|
3801
3801
|
(?:
|
|
3802
3802
|
(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\s*\:\:\s*)? # alias-qualification
|
|
3803
|
-
(?<
|
|
3803
|
+
(?<name_and_type_args> # identifier + type arguments (if any)
|
|
3804
3804
|
\g<identifier>\s*
|
|
3805
|
-
(?<
|
|
3805
|
+
(?<type_args>\s*<(?:[^<>]|\g<type_args>)+>\s*)?
|
|
3806
3806
|
)
|
|
3807
|
-
(?:\s*\.\s*\g<
|
|
3807
|
+
(?:\s*\.\s*\g<name_and_type_args>)*
|
|
3808
3808
|
)
|
|
3809
3809
|
(?:\s*\?\s*)? # nullable suffix?
|
|
3810
3810
|
(?:\s*\[(?:\s*,\s*)*\]\s*)* # array suffix?
|
|
@@ -3858,7 +3858,7 @@
|
|
|
3858
3858
|
<string>(?x)
|
|
3859
3859
|
(?:(\??\.)\s*)? # safe navigator or accessor
|
|
3860
3860
|
(@?[_[:alpha:]][_[:alnum:]]*)\s* # method name
|
|
3861
|
-
(?<
|
|
3861
|
+
(?<type_args>\s*<([^<>]|\g<type_args>)+>\s*)?\s* # type arguments
|
|
3862
3862
|
(?=\() # open paren of argument list</string>
|
|
3863
3863
|
<key>beginCaptures</key>
|
|
3864
3864
|
<dict>
|
|
@@ -3985,7 +3985,7 @@
|
|
|
3985
3985
|
<string>(?x)
|
|
3986
3986
|
(\??\.)?\s*
|
|
3987
3987
|
(@?[_[:alpha:]][_[:alnum:]]*)
|
|
3988
|
-
(?<
|
|
3988
|
+
(?<type_params>\s*<([^<>]|\g<type_params>)+>\s*)
|
|
3989
3989
|
(?=
|
|
3990
3990
|
(\s*\?)?
|
|
3991
3991
|
\s*\.\s*@?[_[:alpha:]][_[:alnum:]]*
|
|
@@ -4066,15 +4066,15 @@
|
|
|
4066
4066
|
<string>(?x)
|
|
4067
4067
|
(delete|insert|undelete|update|upsert)?
|
|
4068
4068
|
\s*(new)\s+
|
|
4069
|
-
(?<
|
|
4069
|
+
(?<type_name>
|
|
4070
4070
|
(?:
|
|
4071
4071
|
(?:
|
|
4072
4072
|
(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\s*\:\:\s*)? # alias-qualification
|
|
4073
|
-
(?<
|
|
4073
|
+
(?<name_and_type_args> # identifier + type arguments (if any)
|
|
4074
4074
|
\g<identifier>\s*
|
|
4075
|
-
(?<
|
|
4075
|
+
(?<type_args>\s*<(?:[^<>]|\g<type_args>)+>\s*)?
|
|
4076
4076
|
)
|
|
4077
|
-
(?:\s*\.\s*\g<
|
|
4077
|
+
(?:\s*\.\s*\g<name_and_type_args>)*
|
|
4078
4078
|
)
|
|
4079
4079
|
(?:\s*\?\s*)? # nullable suffix?
|
|
4080
4080
|
(?:\s*\[(?:\s*,\s*)*\]\s*)* # array suffix?
|
|
@@ -4124,15 +4124,15 @@
|
|
|
4124
4124
|
<string>(?x)
|
|
4125
4125
|
(delete|insert|undelete|update|upsert)?
|
|
4126
4126
|
\s*(new)\s+
|
|
4127
|
-
(?<
|
|
4127
|
+
(?<type_name>
|
|
4128
4128
|
(?:
|
|
4129
4129
|
(?:
|
|
4130
4130
|
(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\s*\:\:\s*)? # alias-qualification
|
|
4131
|
-
(?<
|
|
4131
|
+
(?<name_and_type_args> # identifier + type arguments (if any)
|
|
4132
4132
|
\g<identifier>\s*
|
|
4133
|
-
(?<
|
|
4133
|
+
(?<type_args>\s*<(?:[^<>]|\g<type_args>)+>\s*)?
|
|
4134
4134
|
)
|
|
4135
|
-
(?:\s*\.\s*\g<
|
|
4135
|
+
(?:\s*\.\s*\g<name_and_type_args>)*
|
|
4136
4136
|
)
|
|
4137
4137
|
(?:\s*\?\s*)? # nullable suffix?
|
|
4138
4138
|
(?:\s*\[(?:\s*,\s*)*\]\s*)* # array suffix?
|
|
@@ -4172,15 +4172,15 @@
|
|
|
4172
4172
|
<key>begin</key>
|
|
4173
4173
|
<string>(?x)
|
|
4174
4174
|
\b(new)\b\s*
|
|
4175
|
-
(?<
|
|
4175
|
+
(?<type_name>
|
|
4176
4176
|
(?:
|
|
4177
4177
|
(?:
|
|
4178
4178
|
(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\s*\:\:\s*)? # alias-qualification
|
|
4179
|
-
(?<
|
|
4179
|
+
(?<name_and_type_args> # identifier + type arguments (if any)
|
|
4180
4180
|
\g<identifier>\s*
|
|
4181
|
-
(?<
|
|
4181
|
+
(?<type_args>\s*<(?:[^<>]|\g<type_args>)+>\s*)?
|
|
4182
4182
|
)
|
|
4183
|
-
(?:\s*\.\s*\g<
|
|
4183
|
+
(?:\s*\.\s*\g<name_and_type_args>)*
|
|
4184
4184
|
)
|
|
4185
4185
|
(?:\s*\?\s*)? # nullable suffix?
|
|
4186
4186
|
(?:\s*\[(?:\s*,\s*)*\]\s*)* # array suffix?
|
|
@@ -4266,16 +4266,16 @@
|
|
|
4266
4266
|
<key>match</key>
|
|
4267
4267
|
<string>(?x)
|
|
4268
4268
|
(?:(?:\b(this)\b)\s+)?
|
|
4269
|
-
(?<
|
|
4269
|
+
(?<type_name>
|
|
4270
4270
|
(?:
|
|
4271
4271
|
(?:ref\s+)? # ref return
|
|
4272
4272
|
(?:
|
|
4273
4273
|
(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\s*\:\:\s*)? # alias-qualification
|
|
4274
|
-
(?<
|
|
4274
|
+
(?<name_and_type_args> # identifier + type arguments (if any)
|
|
4275
4275
|
\g<identifier>\s*
|
|
4276
|
-
(?<
|
|
4276
|
+
(?<type_args>\s*<(?:[^<>]|\g<type_args>)+>\s*)?
|
|
4277
4277
|
)
|
|
4278
|
-
(?:\s*\.\s*\g<
|
|
4278
|
+
(?:\s*\.\s*\g<name_and_type_args>)*
|
|
4279
4279
|
)
|
|
4280
4280
|
(?:\s*\?\s*)? # nullable suffix?
|
|
4281
4281
|
(?:\s*\[(?:\s*,\s*)*\]\s*)* # array suffix?
|
|
@@ -1108,15 +1108,15 @@ repository:
|
|
|
1108
1108
|
"field-declaration":
|
|
1109
1109
|
begin: '''
|
|
1110
1110
|
(?x)
|
|
1111
|
-
(?<
|
|
1111
|
+
(?<type_name>
|
|
1112
1112
|
(?:
|
|
1113
1113
|
(?:
|
|
1114
1114
|
(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)? # alias-qualification
|
|
1115
|
-
(?<
|
|
1115
|
+
(?<name_and_type_args> # identifier + type arguments (if any)
|
|
1116
1116
|
\\g<identifier>\\s*
|
|
1117
|
-
(?<
|
|
1117
|
+
(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?
|
|
1118
1118
|
)
|
|
1119
|
-
(?:\\s*\\.\\s*\\g<
|
|
1119
|
+
(?:\\s*\\.\\s*\\g<name_and_type_args>)*
|
|
1120
1120
|
)
|
|
1121
1121
|
(?:\\s*\\?\\s*)? # nullable suffix?
|
|
1122
1122
|
(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*)* # array suffix?
|
|
@@ -1160,25 +1160,25 @@ repository:
|
|
|
1160
1160
|
begin: '''
|
|
1161
1161
|
(?x)
|
|
1162
1162
|
(?!.*\\b(?:class|interface|enum)\\b)\\s*
|
|
1163
|
-
(?<
|
|
1164
|
-
(?<
|
|
1163
|
+
(?<return_type>
|
|
1164
|
+
(?<type_name>
|
|
1165
1165
|
(?:
|
|
1166
1166
|
(?:ref\\s+)? # ref return
|
|
1167
1167
|
(?:
|
|
1168
1168
|
(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)? # alias-qualification
|
|
1169
|
-
(?<
|
|
1169
|
+
(?<name_and_type_args> # identifier + type arguments (if any)
|
|
1170
1170
|
\\g<identifier>\\s*
|
|
1171
|
-
(?<
|
|
1171
|
+
(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?
|
|
1172
1172
|
)
|
|
1173
|
-
(?:\\s*\\.\\s*\\g<
|
|
1173
|
+
(?:\\s*\\.\\s*\\g<name_and_type_args>)*
|
|
1174
1174
|
)
|
|
1175
1175
|
(?:\\s*\\?\\s*)? # nullable suffix?
|
|
1176
1176
|
(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*)* # array suffix?
|
|
1177
1177
|
)
|
|
1178
1178
|
)\\s+
|
|
1179
1179
|
)
|
|
1180
|
-
(?<
|
|
1181
|
-
(?<
|
|
1180
|
+
(?<interface_name>\\g<type_name>\\s*\\.\\s*)?
|
|
1181
|
+
(?<property_name>\\g<identifier>)\\s*
|
|
1182
1182
|
(?=\\{|=>|$)
|
|
1183
1183
|
'''
|
|
1184
1184
|
beginCaptures:
|
|
@@ -1220,25 +1220,25 @@ repository:
|
|
|
1220
1220
|
"indexer-declaration":
|
|
1221
1221
|
begin: '''
|
|
1222
1222
|
(?x)
|
|
1223
|
-
(?<
|
|
1224
|
-
(?<
|
|
1223
|
+
(?<return_type>
|
|
1224
|
+
(?<type_name>
|
|
1225
1225
|
(?:
|
|
1226
1226
|
(?:ref\\s+)? # ref return
|
|
1227
1227
|
(?:
|
|
1228
1228
|
(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)? # alias-qualification
|
|
1229
|
-
(?<
|
|
1229
|
+
(?<name_and_type_args> # identifier + type arguments (if any)
|
|
1230
1230
|
\\g<identifier>\\s*
|
|
1231
|
-
(?<
|
|
1231
|
+
(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?
|
|
1232
1232
|
)
|
|
1233
|
-
(?:\\s*\\.\\s*\\g<
|
|
1233
|
+
(?:\\s*\\.\\s*\\g<name_and_type_args>)*
|
|
1234
1234
|
)
|
|
1235
1235
|
(?:\\s*\\?\\s*)? # nullable suffix?
|
|
1236
1236
|
(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*)* # array suffix?
|
|
1237
1237
|
)
|
|
1238
1238
|
)\\s+
|
|
1239
1239
|
)
|
|
1240
|
-
(?<
|
|
1241
|
-
(?<
|
|
1240
|
+
(?<interface_name>\\g<type_name>\\s*\\.\\s*)?
|
|
1241
|
+
(?<indexer_name>this)\\s*
|
|
1242
1242
|
(?=\\[)
|
|
1243
1243
|
'''
|
|
1244
1244
|
beginCaptures:
|
|
@@ -1312,24 +1312,24 @@ repository:
|
|
|
1312
1312
|
"method-declaration":
|
|
1313
1313
|
begin: '''
|
|
1314
1314
|
(?x)
|
|
1315
|
-
(?<
|
|
1316
|
-
(?<
|
|
1315
|
+
(?<return_type>
|
|
1316
|
+
(?<type_name>
|
|
1317
1317
|
(?:
|
|
1318
1318
|
(?:ref\\s+)? # ref return
|
|
1319
1319
|
(?:
|
|
1320
1320
|
(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)? # alias-qualification
|
|
1321
|
-
(?<
|
|
1321
|
+
(?<name_and_type_args> # identifier + type arguments (if any)
|
|
1322
1322
|
\\g<identifier>\\s*
|
|
1323
|
-
(?<
|
|
1323
|
+
(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?
|
|
1324
1324
|
)
|
|
1325
|
-
(?:\\s*\\.\\s*\\g<
|
|
1325
|
+
(?:\\s*\\.\\s*\\g<name_and_type_args>)*
|
|
1326
1326
|
)
|
|
1327
1327
|
(?:\\s*\\?\\s*)? # nullable suffix?
|
|
1328
1328
|
(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*)* # array suffix?
|
|
1329
1329
|
)
|
|
1330
1330
|
)\\s+
|
|
1331
1331
|
)
|
|
1332
|
-
(?<
|
|
1332
|
+
(?<interface_name>\\g<type_name>\\s*\\.\\s*)?
|
|
1333
1333
|
(\\g<identifier>)\\s*
|
|
1334
1334
|
(<([^<>]+)>)?\\s*
|
|
1335
1335
|
(?=\\()
|
|
@@ -1879,15 +1879,15 @@ repository:
|
|
|
1879
1879
|
{
|
|
1880
1880
|
match: '''
|
|
1881
1881
|
(?x)
|
|
1882
|
-
(?<
|
|
1882
|
+
(?<type_name>
|
|
1883
1883
|
(?:
|
|
1884
1884
|
(?:
|
|
1885
1885
|
(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)? # alias-qualification
|
|
1886
|
-
(?<
|
|
1886
|
+
(?<name_and_type_args> # identifier + type arguments (if any)
|
|
1887
1887
|
\\g<identifier>\\s*
|
|
1888
|
-
(?<
|
|
1888
|
+
(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?
|
|
1889
1889
|
)
|
|
1890
|
-
(?:\\s*\\.\\s*\\g<
|
|
1890
|
+
(?:\\s*\\.\\s*\\g<name_and_type_args>)*
|
|
1891
1891
|
)
|
|
1892
1892
|
(?:\\s*\\?\\s*)? # nullable suffix?
|
|
1893
1893
|
(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*)* # array suffix?
|
|
@@ -1931,16 +1931,16 @@ repository:
|
|
|
1931
1931
|
(?x)
|
|
1932
1932
|
(?:
|
|
1933
1933
|
(?:(\\bref)\\s+)?(\\bvar\\b)| # ref local
|
|
1934
|
-
(?<
|
|
1934
|
+
(?<type_name>
|
|
1935
1935
|
(?:
|
|
1936
1936
|
(?:ref\\s+)? # ref local
|
|
1937
1937
|
(?:
|
|
1938
1938
|
(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)? # alias-qualification
|
|
1939
|
-
(?<
|
|
1939
|
+
(?<name_and_type_args> # identifier + type arguments (if any)
|
|
1940
1940
|
\\g<identifier>\\s*
|
|
1941
|
-
(?<
|
|
1941
|
+
(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?
|
|
1942
1942
|
)
|
|
1943
|
-
(?:\\s*\\.\\s*\\g<
|
|
1943
|
+
(?:\\s*\\.\\s*\\g<name_and_type_args>)*
|
|
1944
1944
|
)
|
|
1945
1945
|
(?:\\s*\\?\\s*)? # nullable suffix?
|
|
1946
1946
|
(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*)* # array suffix?
|
|
@@ -1985,16 +1985,16 @@ repository:
|
|
|
1985
1985
|
"local-constant-declaration":
|
|
1986
1986
|
begin: '''
|
|
1987
1987
|
(?x)
|
|
1988
|
-
(?<
|
|
1989
|
-
(?<
|
|
1988
|
+
(?<const_keyword>\\b(?:const)\\b)\\s*
|
|
1989
|
+
(?<type_name>
|
|
1990
1990
|
(?:
|
|
1991
1991
|
(?:
|
|
1992
1992
|
(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)? # alias-qualification
|
|
1993
|
-
(?<
|
|
1993
|
+
(?<name_and_type_args> # identifier + type arguments (if any)
|
|
1994
1994
|
\\g<identifier>\\s*
|
|
1995
|
-
(?<
|
|
1995
|
+
(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?
|
|
1996
1996
|
)
|
|
1997
|
-
(?:\\s*\\.\\s*\\g<
|
|
1997
|
+
(?:\\s*\\.\\s*\\g<name_and_type_args>)*
|
|
1998
1998
|
)
|
|
1999
1999
|
(?:\\s*\\?\\s*)? # nullable suffix?
|
|
2000
2000
|
(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*)* # array suffix?
|
|
@@ -2225,15 +2225,15 @@ repository:
|
|
|
2225
2225
|
match: '''
|
|
2226
2226
|
(?x)
|
|
2227
2227
|
(\\()\\s*
|
|
2228
|
-
(?<
|
|
2228
|
+
(?<type_name>
|
|
2229
2229
|
(?:
|
|
2230
2230
|
(?:
|
|
2231
2231
|
(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)? # alias-qualification
|
|
2232
|
-
(?<
|
|
2232
|
+
(?<name_and_type_args> # identifier + type arguments (if any)
|
|
2233
2233
|
\\g<identifier>\\s*
|
|
2234
|
-
(?<
|
|
2234
|
+
(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?
|
|
2235
2235
|
)
|
|
2236
|
-
(?:\\s*\\.\\s*\\g<
|
|
2236
|
+
(?:\\s*\\.\\s*\\g<name_and_type_args>)*
|
|
2237
2237
|
)
|
|
2238
2238
|
(?:\\s*\\?\\s*)? # nullable suffix?
|
|
2239
2239
|
(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*)* # array suffix?
|
|
@@ -2265,7 +2265,7 @@ repository:
|
|
|
2265
2265
|
(?x)
|
|
2266
2266
|
(?:(\\??\\.)\\s*)? # safe navigator or accessor
|
|
2267
2267
|
(@?[_[:alpha:]][_[:alnum:]]*)\\s* # method name
|
|
2268
|
-
(?<
|
|
2268
|
+
(?<type_args>\\s*<([^<>]|\\g<type_args>)+>\\s*)?\\s* # type arguments
|
|
2269
2269
|
(?=\\() # open paren of argument list
|
|
2270
2270
|
'''
|
|
2271
2271
|
beginCaptures:
|
|
@@ -2347,7 +2347,7 @@ repository:
|
|
|
2347
2347
|
(?x)
|
|
2348
2348
|
(\\??\\.)?\\s*
|
|
2349
2349
|
(@?[_[:alpha:]][_[:alnum:]]*)
|
|
2350
|
-
(?<
|
|
2350
|
+
(?<type_params>\\s*<([^<>]|\\g<type_params>)+>\\s*)
|
|
2351
2351
|
(?=
|
|
2352
2352
|
(\\s*\\?)?
|
|
2353
2353
|
\\s*\\.\\s*@?[_[:alpha:]][_[:alnum:]]*
|
|
@@ -2403,15 +2403,15 @@ repository:
|
|
|
2403
2403
|
(?x)
|
|
2404
2404
|
(delete|insert|undelete|update|upsert)?
|
|
2405
2405
|
\\s*(new)\\s+
|
|
2406
|
-
(?<
|
|
2406
|
+
(?<type_name>
|
|
2407
2407
|
(?:
|
|
2408
2408
|
(?:
|
|
2409
2409
|
(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)? # alias-qualification
|
|
2410
|
-
(?<
|
|
2410
|
+
(?<name_and_type_args> # identifier + type arguments (if any)
|
|
2411
2411
|
\\g<identifier>\\s*
|
|
2412
|
-
(?<
|
|
2412
|
+
(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?
|
|
2413
2413
|
)
|
|
2414
|
-
(?:\\s*\\.\\s*\\g<
|
|
2414
|
+
(?:\\s*\\.\\s*\\g<name_and_type_args>)*
|
|
2415
2415
|
)
|
|
2416
2416
|
(?:\\s*\\?\\s*)? # nullable suffix?
|
|
2417
2417
|
(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*)* # array suffix?
|
|
@@ -2444,15 +2444,15 @@ repository:
|
|
|
2444
2444
|
(?x)
|
|
2445
2445
|
(delete|insert|undelete|update|upsert)?
|
|
2446
2446
|
\\s*(new)\\s+
|
|
2447
|
-
(?<
|
|
2447
|
+
(?<type_name>
|
|
2448
2448
|
(?:
|
|
2449
2449
|
(?:
|
|
2450
2450
|
(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)? # alias-qualification
|
|
2451
|
-
(?<
|
|
2451
|
+
(?<name_and_type_args> # identifier + type arguments (if any)
|
|
2452
2452
|
\\g<identifier>\\s*
|
|
2453
|
-
(?<
|
|
2453
|
+
(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?
|
|
2454
2454
|
)
|
|
2455
|
-
(?:\\s*\\.\\s*\\g<
|
|
2455
|
+
(?:\\s*\\.\\s*\\g<name_and_type_args>)*
|
|
2456
2456
|
)
|
|
2457
2457
|
(?:\\s*\\?\\s*)? # nullable suffix?
|
|
2458
2458
|
(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*)* # array suffix?
|
|
@@ -2478,15 +2478,15 @@ repository:
|
|
|
2478
2478
|
begin: '''
|
|
2479
2479
|
(?x)
|
|
2480
2480
|
\\b(new)\\b\\s*
|
|
2481
|
-
(?<
|
|
2481
|
+
(?<type_name>
|
|
2482
2482
|
(?:
|
|
2483
2483
|
(?:
|
|
2484
2484
|
(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)? # alias-qualification
|
|
2485
|
-
(?<
|
|
2485
|
+
(?<name_and_type_args> # identifier + type arguments (if any)
|
|
2486
2486
|
\\g<identifier>\\s*
|
|
2487
|
-
(?<
|
|
2487
|
+
(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?
|
|
2488
2488
|
)
|
|
2489
|
-
(?:\\s*\\.\\s*\\g<
|
|
2489
|
+
(?:\\s*\\.\\s*\\g<name_and_type_args>)*
|
|
2490
2490
|
)
|
|
2491
2491
|
(?:\\s*\\?\\s*)? # nullable suffix?
|
|
2492
2492
|
(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*)* # array suffix?
|
|
@@ -2539,16 +2539,16 @@ repository:
|
|
|
2539
2539
|
match: '''
|
|
2540
2540
|
(?x)
|
|
2541
2541
|
(?:(?:\\b(this)\\b)\\s+)?
|
|
2542
|
-
(?<
|
|
2542
|
+
(?<type_name>
|
|
2543
2543
|
(?:
|
|
2544
2544
|
(?:ref\\s+)? # ref return
|
|
2545
2545
|
(?:
|
|
2546
2546
|
(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)? # alias-qualification
|
|
2547
|
-
(?<
|
|
2547
|
+
(?<name_and_type_args> # identifier + type arguments (if any)
|
|
2548
2548
|
\\g<identifier>\\s*
|
|
2549
|
-
(?<
|
|
2549
|
+
(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?
|
|
2550
2550
|
)
|
|
2551
|
-
(?:\\s*\\.\\s*\\g<
|
|
2551
|
+
(?:\\s*\\.\\s*\\g<name_and_type_args>)*
|
|
2552
2552
|
)
|
|
2553
2553
|
(?:\\s*\\?\\s*)? # nullable suffix?
|
|
2554
2554
|
(?:\\s*\\[(?:\\s*,\\s*)*\\]\\s*)* # array suffix?
|
package/grammars/soql.tmLanguage
CHANGED
|
@@ -1896,15 +1896,15 @@
|
|
|
1896
1896
|
<dict>
|
|
1897
1897
|
<key>begin</key>
|
|
1898
1898
|
<string>(?x)
|
|
1899
|
-
(?<
|
|
1899
|
+
(?<type_name>
|
|
1900
1900
|
(?:
|
|
1901
1901
|
(?:
|
|
1902
1902
|
(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\s*\:\:\s*)? # alias-qualification
|
|
1903
|
-
(?<
|
|
1903
|
+
(?<name_and_type_args> # identifier + type arguments (if any)
|
|
1904
1904
|
\g<identifier>\s*
|
|
1905
|
-
(?<
|
|
1905
|
+
(?<type_args>\s*<(?:[^<>]|\g<type_args>)+>\s*)?
|
|
1906
1906
|
)
|
|
1907
|
-
(?:\s*\.\s*\g<
|
|
1907
|
+
(?:\s*\.\s*\g<name_and_type_args>)*
|
|
1908
1908
|
)
|
|
1909
1909
|
(?:\s*\?\s*)? # nullable suffix?
|
|
1910
1910
|
(?:\s*\[(?:\s*,\s*)*\]\s*)* # array suffix?
|
|
@@ -1967,25 +1967,25 @@
|
|
|
1967
1967
|
<key>begin</key>
|
|
1968
1968
|
<string>(?x)
|
|
1969
1969
|
(?!.*\b(?:class|interface|enum)\b)\s*
|
|
1970
|
-
(?<
|
|
1971
|
-
(?<
|
|
1970
|
+
(?<return_type>
|
|
1971
|
+
(?<type_name>
|
|
1972
1972
|
(?:
|
|
1973
1973
|
(?:ref\s+)? # ref return
|
|
1974
1974
|
(?:
|
|
1975
1975
|
(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\s*\:\:\s*)? # alias-qualification
|
|
1976
|
-
(?<
|
|
1976
|
+
(?<name_and_type_args> # identifier + type arguments (if any)
|
|
1977
1977
|
\g<identifier>\s*
|
|
1978
|
-
(?<
|
|
1978
|
+
(?<type_args>\s*<(?:[^<>]|\g<type_args>)+>\s*)?
|
|
1979
1979
|
)
|
|
1980
|
-
(?:\s*\.\s*\g<
|
|
1980
|
+
(?:\s*\.\s*\g<name_and_type_args>)*
|
|
1981
1981
|
)
|
|
1982
1982
|
(?:\s*\?\s*)? # nullable suffix?
|
|
1983
1983
|
(?:\s*\[(?:\s*,\s*)*\]\s*)* # array suffix?
|
|
1984
1984
|
)
|
|
1985
1985
|
)\s+
|
|
1986
1986
|
)
|
|
1987
|
-
(?<
|
|
1988
|
-
(?<
|
|
1987
|
+
(?<interface_name>\g<type_name>\s*\.\s*)?
|
|
1988
|
+
(?<property_name>\g<identifier>)\s*
|
|
1989
1989
|
(?=\{|=>|$)</string>
|
|
1990
1990
|
<key>beginCaptures</key>
|
|
1991
1991
|
<dict>
|
|
@@ -2049,25 +2049,25 @@
|
|
|
2049
2049
|
<dict>
|
|
2050
2050
|
<key>begin</key>
|
|
2051
2051
|
<string>(?x)
|
|
2052
|
-
(?<
|
|
2053
|
-
(?<
|
|
2052
|
+
(?<return_type>
|
|
2053
|
+
(?<type_name>
|
|
2054
2054
|
(?:
|
|
2055
2055
|
(?:ref\s+)? # ref return
|
|
2056
2056
|
(?:
|
|
2057
2057
|
(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\s*\:\:\s*)? # alias-qualification
|
|
2058
|
-
(?<
|
|
2058
|
+
(?<name_and_type_args> # identifier + type arguments (if any)
|
|
2059
2059
|
\g<identifier>\s*
|
|
2060
|
-
(?<
|
|
2060
|
+
(?<type_args>\s*<(?:[^<>]|\g<type_args>)+>\s*)?
|
|
2061
2061
|
)
|
|
2062
|
-
(?:\s*\.\s*\g<
|
|
2062
|
+
(?:\s*\.\s*\g<name_and_type_args>)*
|
|
2063
2063
|
)
|
|
2064
2064
|
(?:\s*\?\s*)? # nullable suffix?
|
|
2065
2065
|
(?:\s*\[(?:\s*,\s*)*\]\s*)* # array suffix?
|
|
2066
2066
|
)
|
|
2067
2067
|
)\s+
|
|
2068
2068
|
)
|
|
2069
|
-
(?<
|
|
2070
|
-
(?<
|
|
2069
|
+
(?<interface_name>\g<type_name>\s*\.\s*)?
|
|
2070
|
+
(?<indexer_name>this)\s*
|
|
2071
2071
|
(?=\[)</string>
|
|
2072
2072
|
<key>beginCaptures</key>
|
|
2073
2073
|
<dict>
|
|
@@ -2187,24 +2187,24 @@
|
|
|
2187
2187
|
<dict>
|
|
2188
2188
|
<key>begin</key>
|
|
2189
2189
|
<string>(?x)
|
|
2190
|
-
(?<
|
|
2191
|
-
(?<
|
|
2190
|
+
(?<return_type>
|
|
2191
|
+
(?<type_name>
|
|
2192
2192
|
(?:
|
|
2193
2193
|
(?:ref\s+)? # ref return
|
|
2194
2194
|
(?:
|
|
2195
2195
|
(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\s*\:\:\s*)? # alias-qualification
|
|
2196
|
-
(?<
|
|
2196
|
+
(?<name_and_type_args> # identifier + type arguments (if any)
|
|
2197
2197
|
\g<identifier>\s*
|
|
2198
|
-
(?<
|
|
2198
|
+
(?<type_args>\s*<(?:[^<>]|\g<type_args>)+>\s*)?
|
|
2199
2199
|
)
|
|
2200
|
-
(?:\s*\.\s*\g<
|
|
2200
|
+
(?:\s*\.\s*\g<name_and_type_args>)*
|
|
2201
2201
|
)
|
|
2202
2202
|
(?:\s*\?\s*)? # nullable suffix?
|
|
2203
2203
|
(?:\s*\[(?:\s*,\s*)*\]\s*)* # array suffix?
|
|
2204
2204
|
)
|
|
2205
2205
|
)\s+
|
|
2206
2206
|
)
|
|
2207
|
-
(?<
|
|
2207
|
+
(?<interface_name>\g<type_name>\s*\.\s*)?
|
|
2208
2208
|
(\g<identifier>)\s*
|
|
2209
2209
|
(<([^<>]+)>)?\s*
|
|
2210
2210
|
(?=\()</string>
|
|
@@ -3217,15 +3217,15 @@
|
|
|
3217
3217
|
<dict>
|
|
3218
3218
|
<key>match</key>
|
|
3219
3219
|
<string>(?x)
|
|
3220
|
-
(?<
|
|
3220
|
+
(?<type_name>
|
|
3221
3221
|
(?:
|
|
3222
3222
|
(?:
|
|
3223
3223
|
(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\s*\:\:\s*)? # alias-qualification
|
|
3224
|
-
(?<
|
|
3224
|
+
(?<name_and_type_args> # identifier + type arguments (if any)
|
|
3225
3225
|
\g<identifier>\s*
|
|
3226
|
-
(?<
|
|
3226
|
+
(?<type_args>\s*<(?:[^<>]|\g<type_args>)+>\s*)?
|
|
3227
3227
|
)
|
|
3228
|
-
(?:\s*\.\s*\g<
|
|
3228
|
+
(?:\s*\.\s*\g<name_and_type_args>)*
|
|
3229
3229
|
)
|
|
3230
3230
|
(?:\s*\?\s*)? # nullable suffix?
|
|
3231
3231
|
(?:\s*\[(?:\s*,\s*)*\]\s*)* # array suffix?
|
|
@@ -3287,16 +3287,16 @@
|
|
|
3287
3287
|
<string>(?x)
|
|
3288
3288
|
(?:
|
|
3289
3289
|
(?:(\bref)\s+)?(\bvar\b)| # ref local
|
|
3290
|
-
(?<
|
|
3290
|
+
(?<type_name>
|
|
3291
3291
|
(?:
|
|
3292
3292
|
(?:ref\s+)? # ref local
|
|
3293
3293
|
(?:
|
|
3294
3294
|
(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\s*\:\:\s*)? # alias-qualification
|
|
3295
|
-
(?<
|
|
3295
|
+
(?<name_and_type_args> # identifier + type arguments (if any)
|
|
3296
3296
|
\g<identifier>\s*
|
|
3297
|
-
(?<
|
|
3297
|
+
(?<type_args>\s*<(?:[^<>]|\g<type_args>)+>\s*)?
|
|
3298
3298
|
)
|
|
3299
|
-
(?:\s*\.\s*\g<
|
|
3299
|
+
(?:\s*\.\s*\g<name_and_type_args>)*
|
|
3300
3300
|
)
|
|
3301
3301
|
(?:\s*\?\s*)? # nullable suffix?
|
|
3302
3302
|
(?:\s*\[(?:\s*,\s*)*\]\s*)* # array suffix?
|
|
@@ -3365,16 +3365,16 @@
|
|
|
3365
3365
|
<dict>
|
|
3366
3366
|
<key>begin</key>
|
|
3367
3367
|
<string>(?x)
|
|
3368
|
-
(?<
|
|
3369
|
-
(?<
|
|
3368
|
+
(?<const_keyword>\b(?:const)\b)\s*
|
|
3369
|
+
(?<type_name>
|
|
3370
3370
|
(?:
|
|
3371
3371
|
(?:
|
|
3372
3372
|
(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\s*\:\:\s*)? # alias-qualification
|
|
3373
|
-
(?<
|
|
3373
|
+
(?<name_and_type_args> # identifier + type arguments (if any)
|
|
3374
3374
|
\g<identifier>\s*
|
|
3375
|
-
(?<
|
|
3375
|
+
(?<type_args>\s*<(?:[^<>]|\g<type_args>)+>\s*)?
|
|
3376
3376
|
)
|
|
3377
|
-
(?:\s*\.\s*\g<
|
|
3377
|
+
(?:\s*\.\s*\g<name_and_type_args>)*
|
|
3378
3378
|
)
|
|
3379
3379
|
(?:\s*\?\s*)? # nullable suffix?
|
|
3380
3380
|
(?:\s*\[(?:\s*,\s*)*\]\s*)* # array suffix?
|
|
@@ -3778,15 +3778,15 @@
|
|
|
3778
3778
|
<key>match</key>
|
|
3779
3779
|
<string>(?x)
|
|
3780
3780
|
(\()\s*
|
|
3781
|
-
(?<
|
|
3781
|
+
(?<type_name>
|
|
3782
3782
|
(?:
|
|
3783
3783
|
(?:
|
|
3784
3784
|
(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\s*\:\:\s*)? # alias-qualification
|
|
3785
|
-
(?<
|
|
3785
|
+
(?<name_and_type_args> # identifier + type arguments (if any)
|
|
3786
3786
|
\g<identifier>\s*
|
|
3787
|
-
(?<
|
|
3787
|
+
(?<type_args>\s*<(?:[^<>]|\g<type_args>)+>\s*)?
|
|
3788
3788
|
)
|
|
3789
|
-
(?:\s*\.\s*\g<
|
|
3789
|
+
(?:\s*\.\s*\g<name_and_type_args>)*
|
|
3790
3790
|
)
|
|
3791
3791
|
(?:\s*\?\s*)? # nullable suffix?
|
|
3792
3792
|
(?:\s*\[(?:\s*,\s*)*\]\s*)* # array suffix?
|
|
@@ -3840,7 +3840,7 @@
|
|
|
3840
3840
|
<string>(?x)
|
|
3841
3841
|
(?:(\??\.)\s*)? # safe navigator or accessor
|
|
3842
3842
|
(@?[_[:alpha:]][_[:alnum:]]*)\s* # method name
|
|
3843
|
-
(?<
|
|
3843
|
+
(?<type_args>\s*<([^<>]|\g<type_args>)+>\s*)?\s* # type arguments
|
|
3844
3844
|
(?=\() # open paren of argument list</string>
|
|
3845
3845
|
<key>beginCaptures</key>
|
|
3846
3846
|
<dict>
|
|
@@ -3967,7 +3967,7 @@
|
|
|
3967
3967
|
<string>(?x)
|
|
3968
3968
|
(\??\.)?\s*
|
|
3969
3969
|
(@?[_[:alpha:]][_[:alnum:]]*)
|
|
3970
|
-
(?<
|
|
3970
|
+
(?<type_params>\s*<([^<>]|\g<type_params>)+>\s*)
|
|
3971
3971
|
(?=
|
|
3972
3972
|
(\s*\?)?
|
|
3973
3973
|
\s*\.\s*@?[_[:alpha:]][_[:alnum:]]*
|
|
@@ -4048,15 +4048,15 @@
|
|
|
4048
4048
|
<string>(?x)
|
|
4049
4049
|
(delete|insert|undelete|update|upsert)?
|
|
4050
4050
|
\s*(new)\s+
|
|
4051
|
-
(?<
|
|
4051
|
+
(?<type_name>
|
|
4052
4052
|
(?:
|
|
4053
4053
|
(?:
|
|
4054
4054
|
(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\s*\:\:\s*)? # alias-qualification
|
|
4055
|
-
(?<
|
|
4055
|
+
(?<name_and_type_args> # identifier + type arguments (if any)
|
|
4056
4056
|
\g<identifier>\s*
|
|
4057
|
-
(?<
|
|
4057
|
+
(?<type_args>\s*<(?:[^<>]|\g<type_args>)+>\s*)?
|
|
4058
4058
|
)
|
|
4059
|
-
(?:\s*\.\s*\g<
|
|
4059
|
+
(?:\s*\.\s*\g<name_and_type_args>)*
|
|
4060
4060
|
)
|
|
4061
4061
|
(?:\s*\?\s*)? # nullable suffix?
|
|
4062
4062
|
(?:\s*\[(?:\s*,\s*)*\]\s*)* # array suffix?
|
|
@@ -4106,15 +4106,15 @@
|
|
|
4106
4106
|
<string>(?x)
|
|
4107
4107
|
(delete|insert|undelete|update|upsert)?
|
|
4108
4108
|
\s*(new)\s+
|
|
4109
|
-
(?<
|
|
4109
|
+
(?<type_name>
|
|
4110
4110
|
(?:
|
|
4111
4111
|
(?:
|
|
4112
4112
|
(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\s*\:\:\s*)? # alias-qualification
|
|
4113
|
-
(?<
|
|
4113
|
+
(?<name_and_type_args> # identifier + type arguments (if any)
|
|
4114
4114
|
\g<identifier>\s*
|
|
4115
|
-
(?<
|
|
4115
|
+
(?<type_args>\s*<(?:[^<>]|\g<type_args>)+>\s*)?
|
|
4116
4116
|
)
|
|
4117
|
-
(?:\s*\.\s*\g<
|
|
4117
|
+
(?:\s*\.\s*\g<name_and_type_args>)*
|
|
4118
4118
|
)
|
|
4119
4119
|
(?:\s*\?\s*)? # nullable suffix?
|
|
4120
4120
|
(?:\s*\[(?:\s*,\s*)*\]\s*)* # array suffix?
|
|
@@ -4154,15 +4154,15 @@
|
|
|
4154
4154
|
<key>begin</key>
|
|
4155
4155
|
<string>(?x)
|
|
4156
4156
|
\b(new)\b\s*
|
|
4157
|
-
(?<
|
|
4157
|
+
(?<type_name>
|
|
4158
4158
|
(?:
|
|
4159
4159
|
(?:
|
|
4160
4160
|
(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\s*\:\:\s*)? # alias-qualification
|
|
4161
|
-
(?<
|
|
4161
|
+
(?<name_and_type_args> # identifier + type arguments (if any)
|
|
4162
4162
|
\g<identifier>\s*
|
|
4163
|
-
(?<
|
|
4163
|
+
(?<type_args>\s*<(?:[^<>]|\g<type_args>)+>\s*)?
|
|
4164
4164
|
)
|
|
4165
|
-
(?:\s*\.\s*\g<
|
|
4165
|
+
(?:\s*\.\s*\g<name_and_type_args>)*
|
|
4166
4166
|
)
|
|
4167
4167
|
(?:\s*\?\s*)? # nullable suffix?
|
|
4168
4168
|
(?:\s*\[(?:\s*,\s*)*\]\s*)* # array suffix?
|
|
@@ -4248,16 +4248,16 @@
|
|
|
4248
4248
|
<key>match</key>
|
|
4249
4249
|
<string>(?x)
|
|
4250
4250
|
(?:(?:\b(this)\b)\s+)?
|
|
4251
|
-
(?<
|
|
4251
|
+
(?<type_name>
|
|
4252
4252
|
(?:
|
|
4253
4253
|
(?:ref\s+)? # ref return
|
|
4254
4254
|
(?:
|
|
4255
4255
|
(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\s*\:\:\s*)? # alias-qualification
|
|
4256
|
-
(?<
|
|
4256
|
+
(?<name_and_type_args> # identifier + type arguments (if any)
|
|
4257
4257
|
\g<identifier>\s*
|
|
4258
|
-
(?<
|
|
4258
|
+
(?<type_args>\s*<(?:[^<>]|\g<type_args>)+>\s*)?
|
|
4259
4259
|
)
|
|
4260
|
-
(?:\s*\.\s*\g<
|
|
4260
|
+
(?:\s*\.\s*\g<name_and_type_args>)*
|
|
4261
4261
|
)
|
|
4262
4262
|
(?:\s*\?\s*)? # nullable suffix?
|
|
4263
4263
|
(?:\s*\[(?:\s*,\s*)*\]\s*)* # array suffix?
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@salesforce/apex-tmlanguage",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.8.0",
|
|
4
4
|
"description": "Textmate grammar for Apex with outputs for VSCode, Atom and TextMate.",
|
|
5
5
|
"displayName": "apex-tmLanguage",
|
|
6
6
|
"keywords": [
|
|
@@ -36,8 +36,8 @@
|
|
|
36
36
|
"commit-init": "commitizen init cz-conventional-changelog --save-dev --save-exact --force",
|
|
37
37
|
"commit": "git-cz",
|
|
38
38
|
"watch": "node ./node_modules/typescript/bin/tsc -w -p .",
|
|
39
|
-
"test:soql-tmgrammar": "vscode-tmgrammar-test -
|
|
40
|
-
"test:soql-tmgrammar-snapshots": "vscode-tmgrammar-snap -s source.soql -g \"./grammars/soql.tmLanguage\"
|
|
39
|
+
"test:soql-tmgrammar": "vscode-tmgrammar-test -g \"./grammars/soql.tmLanguage\" \"./test/soql/*.soql\" ",
|
|
40
|
+
"test:soql-tmgrammar-snapshots": "vscode-tmgrammar-snap -s source.soql -g \"./grammars/soql.tmLanguage\" \"./test/soql/snapshots/*.soql\" ",
|
|
41
41
|
"test": "gulp test && yarn run test:soql-tmgrammar && yarn run test:soql-tmgrammar-snapshots",
|
|
42
42
|
"prepare": "gulp",
|
|
43
43
|
"build:default": "gulp default",
|
|
@@ -49,29 +49,29 @@
|
|
|
49
49
|
"README.md"
|
|
50
50
|
],
|
|
51
51
|
"engines": {
|
|
52
|
-
"node": ">=
|
|
52
|
+
"node": ">=16"
|
|
53
53
|
},
|
|
54
54
|
"devDependencies": {
|
|
55
|
-
"@commitlint/cli": "^
|
|
56
|
-
"@commitlint/config-conventional": "^
|
|
57
|
-
"@types/chai": "4.
|
|
58
|
-
"@types/gulp": "^4.0.
|
|
59
|
-
"@types/mocha": "^
|
|
60
|
-
"chai": "^4.
|
|
61
|
-
"commitizen": "^
|
|
62
|
-
"cz-conventional-changelog": "^
|
|
55
|
+
"@commitlint/cli": "^17",
|
|
56
|
+
"@commitlint/config-conventional": "^17",
|
|
57
|
+
"@types/chai": "4.3.4",
|
|
58
|
+
"@types/gulp": "^4.0.10",
|
|
59
|
+
"@types/mocha": "^10.0.1",
|
|
60
|
+
"chai": "^4.3.7",
|
|
61
|
+
"commitizen": "^4.2.5",
|
|
62
|
+
"cz-conventional-changelog": "^3.3.0",
|
|
63
63
|
"gulp": "4.0.2",
|
|
64
64
|
"gulp-json2cson": "^2.0.0",
|
|
65
|
-
"gulp-mocha": "^
|
|
66
|
-
"gulp-typescript": "^
|
|
67
|
-
"gulp-yaml": "^2.0.
|
|
68
|
-
"js-yaml": "^
|
|
69
|
-
"mocha": "^
|
|
70
|
-
"plist": "^3.0.
|
|
71
|
-
"prettier": "^
|
|
72
|
-
"typescript": "
|
|
73
|
-
"vscode-textmate": "
|
|
74
|
-
"vscode-tmgrammar-test": "^0.
|
|
65
|
+
"gulp-mocha": "^8.0.0",
|
|
66
|
+
"gulp-typescript": "^5.0.1",
|
|
67
|
+
"gulp-yaml": "^2.0.4",
|
|
68
|
+
"js-yaml": "^4.1.0",
|
|
69
|
+
"mocha": "^10.1.0",
|
|
70
|
+
"plist": "^3.0.6",
|
|
71
|
+
"prettier": "^2.8.0",
|
|
72
|
+
"typescript": "4.9.3",
|
|
73
|
+
"vscode-textmate": "7.0.4",
|
|
74
|
+
"vscode-tmgrammar-test": "^0.1.1"
|
|
75
75
|
},
|
|
76
76
|
"husky": {
|
|
77
77
|
"hooks": {
|