@salesforce/apex-tmlanguage 1.8.1 → 1.8.3
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 +168 -56
- package/grammars/apex.tmLanguage.cson +104 -33
- package/grammars/soql.tmLanguage +168 -56
- package/package.json +1 -1
package/grammars/apex.tmLanguage
CHANGED
|
@@ -175,6 +175,10 @@
|
|
|
175
175
|
<key>include</key>
|
|
176
176
|
<string>#method-declaration</string>
|
|
177
177
|
</dict>
|
|
178
|
+
<dict>
|
|
179
|
+
<key>include</key>
|
|
180
|
+
<string>#initializer-block</string>
|
|
181
|
+
</dict>
|
|
178
182
|
<dict>
|
|
179
183
|
<key>include</key>
|
|
180
184
|
<string>#punctuation-semicolon</string>
|
|
@@ -309,6 +313,10 @@
|
|
|
309
313
|
<key>include</key>
|
|
310
314
|
<string>#comment</string>
|
|
311
315
|
</dict>
|
|
316
|
+
<dict>
|
|
317
|
+
<key>include</key>
|
|
318
|
+
<string>#dml-expression</string>
|
|
319
|
+
</dict>
|
|
312
320
|
<dict>
|
|
313
321
|
<key>include</key>
|
|
314
322
|
<string>#merge-expression</string>
|
|
@@ -693,6 +701,32 @@
|
|
|
693
701
|
</dict>
|
|
694
702
|
</array>
|
|
695
703
|
</dict>
|
|
704
|
+
<key>dml-expression</key>
|
|
705
|
+
<dict>
|
|
706
|
+
<key>begin</key>
|
|
707
|
+
<string>\b(delete|insert|undelete|update|upsert)\b\s+(?!new\b)</string>
|
|
708
|
+
<key>beginCaptures</key>
|
|
709
|
+
<dict>
|
|
710
|
+
<key>1</key>
|
|
711
|
+
<dict>
|
|
712
|
+
<key>name</key>
|
|
713
|
+
<string>support.function.apex</string>
|
|
714
|
+
</dict>
|
|
715
|
+
</dict>
|
|
716
|
+
<key>end</key>
|
|
717
|
+
<string>(?<=\;)</string>
|
|
718
|
+
<key>patterns</key>
|
|
719
|
+
<array>
|
|
720
|
+
<dict>
|
|
721
|
+
<key>include</key>
|
|
722
|
+
<string>#expression</string>
|
|
723
|
+
</dict>
|
|
724
|
+
<dict>
|
|
725
|
+
<key>include</key>
|
|
726
|
+
<string>#punctuation-semicolon</string>
|
|
727
|
+
</dict>
|
|
728
|
+
</array>
|
|
729
|
+
</dict>
|
|
696
730
|
<key>merge-expression</key>
|
|
697
731
|
<dict>
|
|
698
732
|
<key>begin</key>
|
|
@@ -1328,7 +1362,7 @@
|
|
|
1328
1362
|
<key>extends-class</key>
|
|
1329
1363
|
<dict>
|
|
1330
1364
|
<key>begin</key>
|
|
1331
|
-
<string>(extends)\b\s
|
|
1365
|
+
<string>(extends)\b\s+</string>
|
|
1332
1366
|
<key>beginCaptures</key>
|
|
1333
1367
|
<dict>
|
|
1334
1368
|
<key>1</key>
|
|
@@ -1336,19 +1370,46 @@
|
|
|
1336
1370
|
<key>name</key>
|
|
1337
1371
|
<string>keyword.other.extends.apex</string>
|
|
1338
1372
|
</dict>
|
|
1339
|
-
<key>2</key>
|
|
1340
|
-
<dict>
|
|
1341
|
-
<key>name</key>
|
|
1342
|
-
<string>entity.name.type.extends.apex</string>
|
|
1343
|
-
</dict>
|
|
1344
1373
|
</dict>
|
|
1345
1374
|
<key>end</key>
|
|
1346
1375
|
<string>(?={|implements)</string>
|
|
1376
|
+
<key>patterns</key>
|
|
1377
|
+
<array>
|
|
1378
|
+
<dict>
|
|
1379
|
+
<key>begin</key>
|
|
1380
|
+
<string>(?=[_[:alpha:]][_[:alnum:]]*\s*\.)</string>
|
|
1381
|
+
<key>end</key>
|
|
1382
|
+
<string>(?={|implements)</string>
|
|
1383
|
+
<key>patterns</key>
|
|
1384
|
+
<array>
|
|
1385
|
+
<dict>
|
|
1386
|
+
<key>include</key>
|
|
1387
|
+
<string>#support-type</string>
|
|
1388
|
+
</dict>
|
|
1389
|
+
<dict>
|
|
1390
|
+
<key>include</key>
|
|
1391
|
+
<string>#type</string>
|
|
1392
|
+
</dict>
|
|
1393
|
+
</array>
|
|
1394
|
+
</dict>
|
|
1395
|
+
<dict>
|
|
1396
|
+
<key>match</key>
|
|
1397
|
+
<string>([_[:alpha:]][_[:alnum:]]*)</string>
|
|
1398
|
+
<key>captures</key>
|
|
1399
|
+
<dict>
|
|
1400
|
+
<key>1</key>
|
|
1401
|
+
<dict>
|
|
1402
|
+
<key>name</key>
|
|
1403
|
+
<string>entity.name.type.extends.apex</string>
|
|
1404
|
+
</dict>
|
|
1405
|
+
</dict>
|
|
1406
|
+
</dict>
|
|
1407
|
+
</array>
|
|
1347
1408
|
</dict>
|
|
1348
1409
|
<key>implements-class</key>
|
|
1349
1410
|
<dict>
|
|
1350
1411
|
<key>begin</key>
|
|
1351
|
-
<string>(implements)\b
|
|
1412
|
+
<string>(implements)\b</string>
|
|
1352
1413
|
<key>beginCaptures</key>
|
|
1353
1414
|
<dict>
|
|
1354
1415
|
<key>1</key>
|
|
@@ -1356,12 +1417,48 @@
|
|
|
1356
1417
|
<key>name</key>
|
|
1357
1418
|
<string>keyword.other.implements.apex</string>
|
|
1358
1419
|
</dict>
|
|
1359
|
-
|
|
1420
|
+
</dict>
|
|
1421
|
+
<key>patterns</key>
|
|
1422
|
+
<array>
|
|
1360
1423
|
<dict>
|
|
1361
|
-
<key>
|
|
1362
|
-
<string>
|
|
1424
|
+
<key>begin</key>
|
|
1425
|
+
<string>(?=[_[:alpha:]][_[:alnum:]]*\s*\.)</string>
|
|
1426
|
+
<key>end</key>
|
|
1427
|
+
<string>(?={|extends|,)</string>
|
|
1428
|
+
<key>patterns</key>
|
|
1429
|
+
<array>
|
|
1430
|
+
<dict>
|
|
1431
|
+
<key>include</key>
|
|
1432
|
+
<string>#support-type</string>
|
|
1433
|
+
</dict>
|
|
1434
|
+
<dict>
|
|
1435
|
+
<key>include</key>
|
|
1436
|
+
<string>#type</string>
|
|
1437
|
+
</dict>
|
|
1438
|
+
</array>
|
|
1363
1439
|
</dict>
|
|
1364
|
-
|
|
1440
|
+
<dict>
|
|
1441
|
+
<key>match</key>
|
|
1442
|
+
<string>([_[:alpha:]][_[:alnum:]]*)\b\s*(,)?</string>
|
|
1443
|
+
<key>captures</key>
|
|
1444
|
+
<dict>
|
|
1445
|
+
<key>1</key>
|
|
1446
|
+
<dict>
|
|
1447
|
+
<key>name</key>
|
|
1448
|
+
<string>entity.name.type.implements.apex</string>
|
|
1449
|
+
</dict>
|
|
1450
|
+
<key>2</key>
|
|
1451
|
+
<dict>
|
|
1452
|
+
<key>name</key>
|
|
1453
|
+
<string>punctuation.separator.comma.apex</string>
|
|
1454
|
+
</dict>
|
|
1455
|
+
</dict>
|
|
1456
|
+
</dict>
|
|
1457
|
+
<dict>
|
|
1458
|
+
<key>include</key>
|
|
1459
|
+
<string>#punctuation-comma</string>
|
|
1460
|
+
</dict>
|
|
1461
|
+
</array>
|
|
1365
1462
|
<key>end</key>
|
|
1366
1463
|
<string>(?={|extends)</string>
|
|
1367
1464
|
</dict>
|
|
@@ -2421,6 +2518,36 @@
|
|
|
2421
2518
|
</dict>
|
|
2422
2519
|
</array>
|
|
2423
2520
|
</dict>
|
|
2521
|
+
<key>initializer-block</key>
|
|
2522
|
+
<dict>
|
|
2523
|
+
<key>begin</key>
|
|
2524
|
+
<string>\{</string>
|
|
2525
|
+
<key>beginCaptures</key>
|
|
2526
|
+
<dict>
|
|
2527
|
+
<key>0</key>
|
|
2528
|
+
<dict>
|
|
2529
|
+
<key>name</key>
|
|
2530
|
+
<string>punctuation.curlybrace.open.apex</string>
|
|
2531
|
+
</dict>
|
|
2532
|
+
</dict>
|
|
2533
|
+
<key>end</key>
|
|
2534
|
+
<string>\}</string>
|
|
2535
|
+
<key>endCaptures</key>
|
|
2536
|
+
<dict>
|
|
2537
|
+
<key>0</key>
|
|
2538
|
+
<dict>
|
|
2539
|
+
<key>name</key>
|
|
2540
|
+
<string>punctuation.curlybrace.close.apex</string>
|
|
2541
|
+
</dict>
|
|
2542
|
+
</dict>
|
|
2543
|
+
<key>patterns</key>
|
|
2544
|
+
<array>
|
|
2545
|
+
<dict>
|
|
2546
|
+
<key>include</key>
|
|
2547
|
+
<string>#statement</string>
|
|
2548
|
+
</dict>
|
|
2549
|
+
</array>
|
|
2550
|
+
</dict>
|
|
2424
2551
|
<key>variable-initializer</key>
|
|
2425
2552
|
<dict>
|
|
2426
2553
|
<key>begin</key>
|
|
@@ -2663,7 +2790,7 @@
|
|
|
2663
2790
|
<string>(?x)
|
|
2664
2791
|
(switch)\b\s+
|
|
2665
2792
|
(on)\b\s+
|
|
2666
|
-
(
|
|
2793
|
+
(.*)
|
|
2667
2794
|
(\{)</string>
|
|
2668
2795
|
<key>beginCaptures</key>
|
|
2669
2796
|
<dict>
|
|
@@ -2746,7 +2873,7 @@
|
|
|
2746
2873
|
<key>when-statement</key>
|
|
2747
2874
|
<dict>
|
|
2748
2875
|
<key>begin</key>
|
|
2749
|
-
<string>(when)\b\s+([
|
|
2876
|
+
<string>(when)\b\s+([_\-[:alnum:]]+)\s*</string>
|
|
2750
2877
|
<key>beginCaptures</key>
|
|
2751
2878
|
<dict>
|
|
2752
2879
|
<key>1</key>
|
|
@@ -2766,7 +2893,7 @@
|
|
|
2766
2893
|
</dict>
|
|
2767
2894
|
</dict>
|
|
2768
2895
|
<key>end</key>
|
|
2769
|
-
<string>(
|
|
2896
|
+
<string>(?=\})|(?=when\b)</string>
|
|
2770
2897
|
<key>patterns</key>
|
|
2771
2898
|
<array>
|
|
2772
2899
|
<dict>
|
|
@@ -2782,7 +2909,7 @@
|
|
|
2782
2909
|
<key>when-string</key>
|
|
2783
2910
|
<dict>
|
|
2784
2911
|
<key>begin</key>
|
|
2785
|
-
<string>(when)
|
|
2912
|
+
<string>(when)\b\s*('[^'\n]*')(\s*(,)\s*('[^'\n]*'))*\s*</string>
|
|
2786
2913
|
<key>beginCaptures</key>
|
|
2787
2914
|
<dict>
|
|
2788
2915
|
<key>1</key>
|
|
@@ -2792,26 +2919,37 @@
|
|
|
2792
2919
|
</dict>
|
|
2793
2920
|
<key>2</key>
|
|
2794
2921
|
<dict>
|
|
2795
|
-
<key>
|
|
2796
|
-
<
|
|
2922
|
+
<key>patterns</key>
|
|
2923
|
+
<array>
|
|
2924
|
+
<dict>
|
|
2925
|
+
<key>include</key>
|
|
2926
|
+
<string>#string-literal</string>
|
|
2927
|
+
</dict>
|
|
2928
|
+
</array>
|
|
2797
2929
|
</dict>
|
|
2798
|
-
<key>
|
|
2930
|
+
<key>4</key>
|
|
2799
2931
|
<dict>
|
|
2800
2932
|
<key>patterns</key>
|
|
2801
2933
|
<array>
|
|
2802
2934
|
<dict>
|
|
2803
2935
|
<key>include</key>
|
|
2804
|
-
<string>#
|
|
2936
|
+
<string>#punctuation-comma</string>
|
|
2805
2937
|
</dict>
|
|
2938
|
+
</array>
|
|
2939
|
+
</dict>
|
|
2940
|
+
<key>5</key>
|
|
2941
|
+
<dict>
|
|
2942
|
+
<key>patterns</key>
|
|
2943
|
+
<array>
|
|
2806
2944
|
<dict>
|
|
2807
2945
|
<key>include</key>
|
|
2808
|
-
<string>#
|
|
2946
|
+
<string>#string-literal</string>
|
|
2809
2947
|
</dict>
|
|
2810
2948
|
</array>
|
|
2811
2949
|
</dict>
|
|
2812
2950
|
</dict>
|
|
2813
2951
|
<key>end</key>
|
|
2814
|
-
<string>(
|
|
2952
|
+
<string>(?=\})|(?=when\b)</string>
|
|
2815
2953
|
<key>patterns</key>
|
|
2816
2954
|
<array>
|
|
2817
2955
|
<dict>
|
|
@@ -2824,36 +2962,6 @@
|
|
|
2824
2962
|
</dict>
|
|
2825
2963
|
</array>
|
|
2826
2964
|
</dict>
|
|
2827
|
-
<key>when-string-statement</key>
|
|
2828
|
-
<dict>
|
|
2829
|
-
<key>patterns</key>
|
|
2830
|
-
<array>
|
|
2831
|
-
<dict>
|
|
2832
|
-
<key>name</key>
|
|
2833
|
-
<string>string.quoted.single.apex</string>
|
|
2834
|
-
<key>begin</key>
|
|
2835
|
-
<string>\'</string>
|
|
2836
|
-
<key>beginCaptures</key>
|
|
2837
|
-
<dict>
|
|
2838
|
-
<key>0</key>
|
|
2839
|
-
<dict>
|
|
2840
|
-
<key>name</key>
|
|
2841
|
-
<string>punctuation.definition.string.begin.apex</string>
|
|
2842
|
-
</dict>
|
|
2843
|
-
</dict>
|
|
2844
|
-
<key>end</key>
|
|
2845
|
-
<string>\'</string>
|
|
2846
|
-
<key>endCaptures</key>
|
|
2847
|
-
<dict>
|
|
2848
|
-
<key>0</key>
|
|
2849
|
-
<dict>
|
|
2850
|
-
<key>name</key>
|
|
2851
|
-
<string>punctuation.definition.string.end.apex</string>
|
|
2852
|
-
</dict>
|
|
2853
|
-
</dict>
|
|
2854
|
-
</dict>
|
|
2855
|
-
</array>
|
|
2856
|
-
</dict>
|
|
2857
2965
|
<key>when-else-statement</key>
|
|
2858
2966
|
<dict>
|
|
2859
2967
|
<key>begin</key>
|
|
@@ -2872,7 +2980,7 @@
|
|
|
2872
2980
|
</dict>
|
|
2873
2981
|
</dict>
|
|
2874
2982
|
<key>end</key>
|
|
2875
|
-
<string>(
|
|
2983
|
+
<string>(?=\})|(?=when\b)</string>
|
|
2876
2984
|
<key>patterns</key>
|
|
2877
2985
|
<array>
|
|
2878
2986
|
<dict>
|
|
@@ -2898,7 +3006,7 @@
|
|
|
2898
3006
|
</dict>
|
|
2899
3007
|
</dict>
|
|
2900
3008
|
<key>end</key>
|
|
2901
|
-
<string>(
|
|
3009
|
+
<string>(?=\})|(?=when\b)</string>
|
|
2902
3010
|
<key>patterns</key>
|
|
2903
3011
|
<array>
|
|
2904
3012
|
<dict>
|
|
@@ -2909,6 +3017,10 @@
|
|
|
2909
3017
|
<key>include</key>
|
|
2910
3018
|
<string>#expression</string>
|
|
2911
3019
|
</dict>
|
|
3020
|
+
<dict>
|
|
3021
|
+
<key>include</key>
|
|
3022
|
+
<string>#punctuation-comma</string>
|
|
3023
|
+
</dict>
|
|
2912
3024
|
</array>
|
|
2913
3025
|
</dict>
|
|
2914
3026
|
<key>when-sobject-statement</key>
|
|
@@ -2934,7 +3046,7 @@
|
|
|
2934
3046
|
</dict>
|
|
2935
3047
|
</dict>
|
|
2936
3048
|
<key>end</key>
|
|
2937
|
-
<string>(
|
|
3049
|
+
<string>(?=\})|(?=when\b)</string>
|
|
2938
3050
|
<key>patterns</key>
|
|
2939
3051
|
<array>
|
|
2940
3052
|
<dict>
|
|
@@ -4265,7 +4377,7 @@
|
|
|
4265
4377
|
<dict>
|
|
4266
4378
|
<key>match</key>
|
|
4267
4379
|
<string>(?x)
|
|
4268
|
-
(?:(?:\b(this)\b)\s+)?
|
|
4380
|
+
(?:(?:\b(this|final)\b)\s+)?
|
|
4269
4381
|
(?<type_name>
|
|
4270
4382
|
(?:
|
|
4271
4383
|
(?:ref\s+)? # ref return
|
|
@@ -4452,7 +4564,7 @@
|
|
|
4452
4564
|
<key>type-builtin</key>
|
|
4453
4565
|
<dict>
|
|
4454
4566
|
<key>match</key>
|
|
4455
|
-
<string>\b(Blob|Boolean|byte|Date|Datetime|Decimal|Double|ID|Integer|Long|Object|String|Time|void)\b</string>
|
|
4567
|
+
<string>\b(Blob|Boolean|byte|Date|Datetime|Decimal|Double|Id|ID|Integer|Long|Object|String|Time|void)\b</string>
|
|
4456
4568
|
<key>captures</key>
|
|
4457
4569
|
<dict>
|
|
4458
4570
|
<key>1</key>
|
|
@@ -119,6 +119,9 @@ repository:
|
|
|
119
119
|
{
|
|
120
120
|
include: '#method-declaration'
|
|
121
121
|
}
|
|
122
|
+
{
|
|
123
|
+
include: '#initializer-block'
|
|
124
|
+
}
|
|
122
125
|
{
|
|
123
126
|
include: '#punctuation-semicolon'
|
|
124
127
|
}
|
|
@@ -215,6 +218,9 @@ repository:
|
|
|
215
218
|
{
|
|
216
219
|
include: '#comment'
|
|
217
220
|
}
|
|
221
|
+
{
|
|
222
|
+
include: '#dml-expression'
|
|
223
|
+
}
|
|
218
224
|
{
|
|
219
225
|
include: '#merge-expression'
|
|
220
226
|
}
|
|
@@ -433,6 +439,20 @@ repository:
|
|
|
433
439
|
include: '#punctuation-comma'
|
|
434
440
|
}
|
|
435
441
|
]
|
|
442
|
+
'dml-expression':
|
|
443
|
+
begin: '\\b(delete|insert|undelete|update|upsert)\\b\\s+(?!new\\b)'
|
|
444
|
+
beginCaptures:
|
|
445
|
+
'1':
|
|
446
|
+
name: 'support.function.apex'
|
|
447
|
+
end: '(?<=\\;)'
|
|
448
|
+
patterns: [
|
|
449
|
+
{
|
|
450
|
+
include: '#expression'
|
|
451
|
+
}
|
|
452
|
+
{
|
|
453
|
+
include: '#punctuation-semicolon'
|
|
454
|
+
}
|
|
455
|
+
]
|
|
436
456
|
'merge-expression':
|
|
437
457
|
begin: '(merge)\\b\\s+'
|
|
438
458
|
beginCaptures:
|
|
@@ -797,20 +817,61 @@ repository:
|
|
|
797
817
|
}
|
|
798
818
|
]
|
|
799
819
|
'extends-class':
|
|
800
|
-
begin: '(extends)\\b\\s+
|
|
820
|
+
begin: '(extends)\\b\\s+'
|
|
801
821
|
beginCaptures:
|
|
802
822
|
'1':
|
|
803
823
|
name: 'keyword.other.extends.apex'
|
|
804
|
-
'2':
|
|
805
|
-
name: 'entity.name.type.extends.apex'
|
|
806
824
|
end: '(?={|implements)'
|
|
825
|
+
patterns: [
|
|
826
|
+
{
|
|
827
|
+
begin: '(?=[_[:alpha:]][_[:alnum:]]*\\s*\\.)'
|
|
828
|
+
end: '(?={|implements)'
|
|
829
|
+
patterns: [
|
|
830
|
+
{
|
|
831
|
+
include: '#support-type'
|
|
832
|
+
}
|
|
833
|
+
{
|
|
834
|
+
include: '#type'
|
|
835
|
+
}
|
|
836
|
+
]
|
|
837
|
+
}
|
|
838
|
+
{
|
|
839
|
+
match: '([_[:alpha:]][_[:alnum:]]*)'
|
|
840
|
+
captures:
|
|
841
|
+
'1':
|
|
842
|
+
name: 'entity.name.type.extends.apex'
|
|
843
|
+
}
|
|
844
|
+
]
|
|
807
845
|
'implements-class':
|
|
808
|
-
begin: '(implements)\\b
|
|
846
|
+
begin: '(implements)\\b'
|
|
809
847
|
beginCaptures:
|
|
810
848
|
'1':
|
|
811
849
|
name: 'keyword.other.implements.apex'
|
|
812
|
-
|
|
813
|
-
|
|
850
|
+
patterns: [
|
|
851
|
+
{
|
|
852
|
+
begin: '(?=[_[:alpha:]][_[:alnum:]]*\\s*\\.)'
|
|
853
|
+
end: '(?={|extends|,)'
|
|
854
|
+
patterns: [
|
|
855
|
+
{
|
|
856
|
+
include: '#support-type'
|
|
857
|
+
}
|
|
858
|
+
{
|
|
859
|
+
include: '#type'
|
|
860
|
+
}
|
|
861
|
+
]
|
|
862
|
+
}
|
|
863
|
+
{
|
|
864
|
+
match: '([_[:alpha:]][_[:alnum:]]*)\\b\\s*(,)?'
|
|
865
|
+
captures:
|
|
866
|
+
'1':
|
|
867
|
+
name: 'entity.name.type.implements.apex'
|
|
868
|
+
'2':
|
|
869
|
+
name: 'punctuation.separator.comma.apex'
|
|
870
|
+
}
|
|
871
|
+
{
|
|
872
|
+
include: '#punctuation-comma'
|
|
873
|
+
}
|
|
874
|
+
]
|
|
814
875
|
end: '(?={|extends)'
|
|
815
876
|
'soql-query-expression':
|
|
816
877
|
begin: '\\b(SELECT)\\b\\s*'
|
|
@@ -1446,6 +1507,20 @@ repository:
|
|
|
1446
1507
|
include: '#statement'
|
|
1447
1508
|
}
|
|
1448
1509
|
]
|
|
1510
|
+
'initializer-block':
|
|
1511
|
+
begin: '\\{'
|
|
1512
|
+
beginCaptures:
|
|
1513
|
+
'0':
|
|
1514
|
+
name: 'punctuation.curlybrace.open.apex'
|
|
1515
|
+
end: '\\}'
|
|
1516
|
+
endCaptures:
|
|
1517
|
+
'0':
|
|
1518
|
+
name: 'punctuation.curlybrace.close.apex'
|
|
1519
|
+
patterns: [
|
|
1520
|
+
{
|
|
1521
|
+
include: '#statement'
|
|
1522
|
+
}
|
|
1523
|
+
]
|
|
1449
1524
|
'variable-initializer':
|
|
1450
1525
|
begin: '(?<!=|!)(=)(?!=|>)'
|
|
1451
1526
|
beginCaptures:
|
|
@@ -1569,7 +1644,7 @@ repository:
|
|
|
1569
1644
|
(?x)
|
|
1570
1645
|
(switch)\\b\\s+
|
|
1571
1646
|
(on)\\b\\s+
|
|
1572
|
-
(
|
|
1647
|
+
(.*)
|
|
1573
1648
|
(\\{)
|
|
1574
1649
|
'''
|
|
1575
1650
|
beginCaptures:
|
|
@@ -1619,7 +1694,7 @@ repository:
|
|
|
1619
1694
|
}
|
|
1620
1695
|
]
|
|
1621
1696
|
'when-statement':
|
|
1622
|
-
begin:
|
|
1697
|
+
begin: '(when)\\b\\s+([_\\-[:alnum:]]+)\\s*'
|
|
1623
1698
|
beginCaptures:
|
|
1624
1699
|
'1':
|
|
1625
1700
|
name: 'keyword.control.switch.when.apex'
|
|
@@ -1629,7 +1704,7 @@ repository:
|
|
|
1629
1704
|
include: '#expression'
|
|
1630
1705
|
}
|
|
1631
1706
|
]
|
|
1632
|
-
end: '(
|
|
1707
|
+
end: '(?=\\})|(?=when\\b)'
|
|
1633
1708
|
patterns: [
|
|
1634
1709
|
{
|
|
1635
1710
|
include: '#block'
|
|
@@ -1639,22 +1714,29 @@ repository:
|
|
|
1639
1714
|
}
|
|
1640
1715
|
]
|
|
1641
1716
|
'when-string':
|
|
1642
|
-
begin: "(when)
|
|
1717
|
+
begin: "(when)\\b\\s*('[^'\\n]*')(\\s*(,)\\s*('[^'\\n]*'))*\\s*"
|
|
1643
1718
|
beginCaptures:
|
|
1644
1719
|
'1':
|
|
1645
1720
|
name: 'keyword.control.switch.when.apex'
|
|
1646
1721
|
'2':
|
|
1647
|
-
name: 'punctuation.whitespace.apex'
|
|
1648
|
-
'3':
|
|
1649
1722
|
patterns: [
|
|
1650
1723
|
{
|
|
1651
|
-
include: '#
|
|
1724
|
+
include: '#string-literal'
|
|
1652
1725
|
}
|
|
1726
|
+
]
|
|
1727
|
+
'4':
|
|
1728
|
+
patterns: [
|
|
1653
1729
|
{
|
|
1654
1730
|
include: '#punctuation-comma'
|
|
1655
1731
|
}
|
|
1656
1732
|
]
|
|
1657
|
-
|
|
1733
|
+
'5':
|
|
1734
|
+
patterns: [
|
|
1735
|
+
{
|
|
1736
|
+
include: '#string-literal'
|
|
1737
|
+
}
|
|
1738
|
+
]
|
|
1739
|
+
end: '(?=\\})|(?=when\\b)'
|
|
1658
1740
|
patterns: [
|
|
1659
1741
|
{
|
|
1660
1742
|
include: '#block'
|
|
@@ -1663,20 +1745,6 @@ repository:
|
|
|
1663
1745
|
include: '#expression'
|
|
1664
1746
|
}
|
|
1665
1747
|
]
|
|
1666
|
-
'when-string-statement':
|
|
1667
|
-
patterns: [
|
|
1668
|
-
{
|
|
1669
|
-
name: 'string.quoted.single.apex'
|
|
1670
|
-
begin: "\\'"
|
|
1671
|
-
beginCaptures:
|
|
1672
|
-
'0':
|
|
1673
|
-
name: 'punctuation.definition.string.begin.apex'
|
|
1674
|
-
end: "\\'"
|
|
1675
|
-
endCaptures:
|
|
1676
|
-
'0':
|
|
1677
|
-
name: 'punctuation.definition.string.end.apex'
|
|
1678
|
-
}
|
|
1679
|
-
]
|
|
1680
1748
|
'when-else-statement':
|
|
1681
1749
|
begin: '(when)\\b\\s+(else)\\b\\s*'
|
|
1682
1750
|
beginCaptures:
|
|
@@ -1684,7 +1752,7 @@ repository:
|
|
|
1684
1752
|
name: 'keyword.control.switch.when.apex'
|
|
1685
1753
|
'2':
|
|
1686
1754
|
name: 'keyword.control.switch.else.apex'
|
|
1687
|
-
end: '(
|
|
1755
|
+
end: '(?=\\})|(?=when\\b)'
|
|
1688
1756
|
patterns: [
|
|
1689
1757
|
{
|
|
1690
1758
|
include: '#block'
|
|
@@ -1698,7 +1766,7 @@ repository:
|
|
|
1698
1766
|
beginCaptures:
|
|
1699
1767
|
'1':
|
|
1700
1768
|
name: 'keyword.control.switch.when.apex'
|
|
1701
|
-
end: '(
|
|
1769
|
+
end: '(?=\\})|(?=when\\b)'
|
|
1702
1770
|
patterns: [
|
|
1703
1771
|
{
|
|
1704
1772
|
include: '#block'
|
|
@@ -1706,6 +1774,9 @@ repository:
|
|
|
1706
1774
|
{
|
|
1707
1775
|
include: '#expression'
|
|
1708
1776
|
}
|
|
1777
|
+
{
|
|
1778
|
+
include: '#punctuation-comma'
|
|
1779
|
+
}
|
|
1709
1780
|
]
|
|
1710
1781
|
'when-sobject-statement':
|
|
1711
1782
|
begin: '(when)\\b\\s+([_[:alnum:]]+)\\s+([_[:alnum:]]+)\\s*'
|
|
@@ -1716,7 +1787,7 @@ repository:
|
|
|
1716
1787
|
name: 'storage.type.apex'
|
|
1717
1788
|
'3':
|
|
1718
1789
|
name: 'entity.name.variable.local.apex'
|
|
1719
|
-
end: '(
|
|
1790
|
+
end: '(?=\\})|(?=when\\b)'
|
|
1720
1791
|
patterns: [
|
|
1721
1792
|
{
|
|
1722
1793
|
include: '#block'
|
|
@@ -2538,7 +2609,7 @@ repository:
|
|
|
2538
2609
|
parameter:
|
|
2539
2610
|
match: '''
|
|
2540
2611
|
(?x)
|
|
2541
|
-
(?:(?:\\b(this)\\b)\\s+)?
|
|
2612
|
+
(?:(?:\\b(this|final)\\b)\\s+)?
|
|
2542
2613
|
(?<type_name>
|
|
2543
2614
|
(?:
|
|
2544
2615
|
(?:ref\\s+)? # ref return
|
|
@@ -2649,7 +2720,7 @@ repository:
|
|
|
2649
2720
|
}
|
|
2650
2721
|
]
|
|
2651
2722
|
'type-builtin':
|
|
2652
|
-
match: '\\b(Blob|Boolean|byte|Date|Datetime|Decimal|Double|ID|Integer|Long|Object|String|Time|void)\\b'
|
|
2723
|
+
match: '\\b(Blob|Boolean|byte|Date|Datetime|Decimal|Double|Id|ID|Integer|Long|Object|String|Time|void)\\b'
|
|
2653
2724
|
captures:
|
|
2654
2725
|
'1':
|
|
2655
2726
|
name: 'keyword.type.apex'
|
package/grammars/soql.tmLanguage
CHANGED
|
@@ -161,6 +161,10 @@
|
|
|
161
161
|
<key>include</key>
|
|
162
162
|
<string>#method-declaration</string>
|
|
163
163
|
</dict>
|
|
164
|
+
<dict>
|
|
165
|
+
<key>include</key>
|
|
166
|
+
<string>#initializer-block</string>
|
|
167
|
+
</dict>
|
|
164
168
|
<dict>
|
|
165
169
|
<key>include</key>
|
|
166
170
|
<string>#punctuation-semicolon</string>
|
|
@@ -295,6 +299,10 @@
|
|
|
295
299
|
<key>include</key>
|
|
296
300
|
<string>#comment</string>
|
|
297
301
|
</dict>
|
|
302
|
+
<dict>
|
|
303
|
+
<key>include</key>
|
|
304
|
+
<string>#dml-expression</string>
|
|
305
|
+
</dict>
|
|
298
306
|
<dict>
|
|
299
307
|
<key>include</key>
|
|
300
308
|
<string>#merge-expression</string>
|
|
@@ -679,6 +687,32 @@
|
|
|
679
687
|
</dict>
|
|
680
688
|
</array>
|
|
681
689
|
</dict>
|
|
690
|
+
<key>dml-expression</key>
|
|
691
|
+
<dict>
|
|
692
|
+
<key>begin</key>
|
|
693
|
+
<string>\b(delete|insert|undelete|update|upsert)\b\s+(?!new\b)</string>
|
|
694
|
+
<key>beginCaptures</key>
|
|
695
|
+
<dict>
|
|
696
|
+
<key>1</key>
|
|
697
|
+
<dict>
|
|
698
|
+
<key>name</key>
|
|
699
|
+
<string>support.function.apex</string>
|
|
700
|
+
</dict>
|
|
701
|
+
</dict>
|
|
702
|
+
<key>end</key>
|
|
703
|
+
<string>(?<=\;)</string>
|
|
704
|
+
<key>patterns</key>
|
|
705
|
+
<array>
|
|
706
|
+
<dict>
|
|
707
|
+
<key>include</key>
|
|
708
|
+
<string>#expression</string>
|
|
709
|
+
</dict>
|
|
710
|
+
<dict>
|
|
711
|
+
<key>include</key>
|
|
712
|
+
<string>#punctuation-semicolon</string>
|
|
713
|
+
</dict>
|
|
714
|
+
</array>
|
|
715
|
+
</dict>
|
|
682
716
|
<key>merge-expression</key>
|
|
683
717
|
<dict>
|
|
684
718
|
<key>begin</key>
|
|
@@ -1314,7 +1348,7 @@
|
|
|
1314
1348
|
<key>extends-class</key>
|
|
1315
1349
|
<dict>
|
|
1316
1350
|
<key>begin</key>
|
|
1317
|
-
<string>(extends)\b\s
|
|
1351
|
+
<string>(extends)\b\s+</string>
|
|
1318
1352
|
<key>beginCaptures</key>
|
|
1319
1353
|
<dict>
|
|
1320
1354
|
<key>1</key>
|
|
@@ -1322,19 +1356,46 @@
|
|
|
1322
1356
|
<key>name</key>
|
|
1323
1357
|
<string>keyword.other.extends.apex</string>
|
|
1324
1358
|
</dict>
|
|
1325
|
-
<key>2</key>
|
|
1326
|
-
<dict>
|
|
1327
|
-
<key>name</key>
|
|
1328
|
-
<string>entity.name.type.extends.apex</string>
|
|
1329
|
-
</dict>
|
|
1330
1359
|
</dict>
|
|
1331
1360
|
<key>end</key>
|
|
1332
1361
|
<string>(?={|implements)</string>
|
|
1362
|
+
<key>patterns</key>
|
|
1363
|
+
<array>
|
|
1364
|
+
<dict>
|
|
1365
|
+
<key>begin</key>
|
|
1366
|
+
<string>(?=[_[:alpha:]][_[:alnum:]]*\s*\.)</string>
|
|
1367
|
+
<key>end</key>
|
|
1368
|
+
<string>(?={|implements)</string>
|
|
1369
|
+
<key>patterns</key>
|
|
1370
|
+
<array>
|
|
1371
|
+
<dict>
|
|
1372
|
+
<key>include</key>
|
|
1373
|
+
<string>#support-type</string>
|
|
1374
|
+
</dict>
|
|
1375
|
+
<dict>
|
|
1376
|
+
<key>include</key>
|
|
1377
|
+
<string>#type</string>
|
|
1378
|
+
</dict>
|
|
1379
|
+
</array>
|
|
1380
|
+
</dict>
|
|
1381
|
+
<dict>
|
|
1382
|
+
<key>match</key>
|
|
1383
|
+
<string>([_[:alpha:]][_[:alnum:]]*)</string>
|
|
1384
|
+
<key>captures</key>
|
|
1385
|
+
<dict>
|
|
1386
|
+
<key>1</key>
|
|
1387
|
+
<dict>
|
|
1388
|
+
<key>name</key>
|
|
1389
|
+
<string>entity.name.type.extends.apex</string>
|
|
1390
|
+
</dict>
|
|
1391
|
+
</dict>
|
|
1392
|
+
</dict>
|
|
1393
|
+
</array>
|
|
1333
1394
|
</dict>
|
|
1334
1395
|
<key>implements-class</key>
|
|
1335
1396
|
<dict>
|
|
1336
1397
|
<key>begin</key>
|
|
1337
|
-
<string>(implements)\b
|
|
1398
|
+
<string>(implements)\b</string>
|
|
1338
1399
|
<key>beginCaptures</key>
|
|
1339
1400
|
<dict>
|
|
1340
1401
|
<key>1</key>
|
|
@@ -1342,12 +1403,48 @@
|
|
|
1342
1403
|
<key>name</key>
|
|
1343
1404
|
<string>keyword.other.implements.apex</string>
|
|
1344
1405
|
</dict>
|
|
1345
|
-
|
|
1406
|
+
</dict>
|
|
1407
|
+
<key>patterns</key>
|
|
1408
|
+
<array>
|
|
1346
1409
|
<dict>
|
|
1347
|
-
<key>
|
|
1348
|
-
<string>
|
|
1410
|
+
<key>begin</key>
|
|
1411
|
+
<string>(?=[_[:alpha:]][_[:alnum:]]*\s*\.)</string>
|
|
1412
|
+
<key>end</key>
|
|
1413
|
+
<string>(?={|extends|,)</string>
|
|
1414
|
+
<key>patterns</key>
|
|
1415
|
+
<array>
|
|
1416
|
+
<dict>
|
|
1417
|
+
<key>include</key>
|
|
1418
|
+
<string>#support-type</string>
|
|
1419
|
+
</dict>
|
|
1420
|
+
<dict>
|
|
1421
|
+
<key>include</key>
|
|
1422
|
+
<string>#type</string>
|
|
1423
|
+
</dict>
|
|
1424
|
+
</array>
|
|
1349
1425
|
</dict>
|
|
1350
|
-
|
|
1426
|
+
<dict>
|
|
1427
|
+
<key>match</key>
|
|
1428
|
+
<string>([_[:alpha:]][_[:alnum:]]*)\b\s*(,)?</string>
|
|
1429
|
+
<key>captures</key>
|
|
1430
|
+
<dict>
|
|
1431
|
+
<key>1</key>
|
|
1432
|
+
<dict>
|
|
1433
|
+
<key>name</key>
|
|
1434
|
+
<string>entity.name.type.implements.apex</string>
|
|
1435
|
+
</dict>
|
|
1436
|
+
<key>2</key>
|
|
1437
|
+
<dict>
|
|
1438
|
+
<key>name</key>
|
|
1439
|
+
<string>punctuation.separator.comma.apex</string>
|
|
1440
|
+
</dict>
|
|
1441
|
+
</dict>
|
|
1442
|
+
</dict>
|
|
1443
|
+
<dict>
|
|
1444
|
+
<key>include</key>
|
|
1445
|
+
<string>#punctuation-comma</string>
|
|
1446
|
+
</dict>
|
|
1447
|
+
</array>
|
|
1351
1448
|
<key>end</key>
|
|
1352
1449
|
<string>(?={|extends)</string>
|
|
1353
1450
|
</dict>
|
|
@@ -2403,6 +2500,36 @@
|
|
|
2403
2500
|
</dict>
|
|
2404
2501
|
</array>
|
|
2405
2502
|
</dict>
|
|
2503
|
+
<key>initializer-block</key>
|
|
2504
|
+
<dict>
|
|
2505
|
+
<key>begin</key>
|
|
2506
|
+
<string>\{</string>
|
|
2507
|
+
<key>beginCaptures</key>
|
|
2508
|
+
<dict>
|
|
2509
|
+
<key>0</key>
|
|
2510
|
+
<dict>
|
|
2511
|
+
<key>name</key>
|
|
2512
|
+
<string>punctuation.curlybrace.open.apex</string>
|
|
2513
|
+
</dict>
|
|
2514
|
+
</dict>
|
|
2515
|
+
<key>end</key>
|
|
2516
|
+
<string>\}</string>
|
|
2517
|
+
<key>endCaptures</key>
|
|
2518
|
+
<dict>
|
|
2519
|
+
<key>0</key>
|
|
2520
|
+
<dict>
|
|
2521
|
+
<key>name</key>
|
|
2522
|
+
<string>punctuation.curlybrace.close.apex</string>
|
|
2523
|
+
</dict>
|
|
2524
|
+
</dict>
|
|
2525
|
+
<key>patterns</key>
|
|
2526
|
+
<array>
|
|
2527
|
+
<dict>
|
|
2528
|
+
<key>include</key>
|
|
2529
|
+
<string>#statement</string>
|
|
2530
|
+
</dict>
|
|
2531
|
+
</array>
|
|
2532
|
+
</dict>
|
|
2406
2533
|
<key>variable-initializer</key>
|
|
2407
2534
|
<dict>
|
|
2408
2535
|
<key>begin</key>
|
|
@@ -2645,7 +2772,7 @@
|
|
|
2645
2772
|
<string>(?x)
|
|
2646
2773
|
(switch)\b\s+
|
|
2647
2774
|
(on)\b\s+
|
|
2648
|
-
(
|
|
2775
|
+
(.*)
|
|
2649
2776
|
(\{)</string>
|
|
2650
2777
|
<key>beginCaptures</key>
|
|
2651
2778
|
<dict>
|
|
@@ -2728,7 +2855,7 @@
|
|
|
2728
2855
|
<key>when-statement</key>
|
|
2729
2856
|
<dict>
|
|
2730
2857
|
<key>begin</key>
|
|
2731
|
-
<string>(when)\b\s+([
|
|
2858
|
+
<string>(when)\b\s+([_\-[:alnum:]]+)\s*</string>
|
|
2732
2859
|
<key>beginCaptures</key>
|
|
2733
2860
|
<dict>
|
|
2734
2861
|
<key>1</key>
|
|
@@ -2748,7 +2875,7 @@
|
|
|
2748
2875
|
</dict>
|
|
2749
2876
|
</dict>
|
|
2750
2877
|
<key>end</key>
|
|
2751
|
-
<string>(
|
|
2878
|
+
<string>(?=\})|(?=when\b)</string>
|
|
2752
2879
|
<key>patterns</key>
|
|
2753
2880
|
<array>
|
|
2754
2881
|
<dict>
|
|
@@ -2764,7 +2891,7 @@
|
|
|
2764
2891
|
<key>when-string</key>
|
|
2765
2892
|
<dict>
|
|
2766
2893
|
<key>begin</key>
|
|
2767
|
-
<string>(when)
|
|
2894
|
+
<string>(when)\b\s*('[^'\n]*')(\s*(,)\s*('[^'\n]*'))*\s*</string>
|
|
2768
2895
|
<key>beginCaptures</key>
|
|
2769
2896
|
<dict>
|
|
2770
2897
|
<key>1</key>
|
|
@@ -2774,26 +2901,37 @@
|
|
|
2774
2901
|
</dict>
|
|
2775
2902
|
<key>2</key>
|
|
2776
2903
|
<dict>
|
|
2777
|
-
<key>
|
|
2778
|
-
<
|
|
2904
|
+
<key>patterns</key>
|
|
2905
|
+
<array>
|
|
2906
|
+
<dict>
|
|
2907
|
+
<key>include</key>
|
|
2908
|
+
<string>#string-literal</string>
|
|
2909
|
+
</dict>
|
|
2910
|
+
</array>
|
|
2779
2911
|
</dict>
|
|
2780
|
-
<key>
|
|
2912
|
+
<key>4</key>
|
|
2781
2913
|
<dict>
|
|
2782
2914
|
<key>patterns</key>
|
|
2783
2915
|
<array>
|
|
2784
2916
|
<dict>
|
|
2785
2917
|
<key>include</key>
|
|
2786
|
-
<string>#
|
|
2918
|
+
<string>#punctuation-comma</string>
|
|
2787
2919
|
</dict>
|
|
2920
|
+
</array>
|
|
2921
|
+
</dict>
|
|
2922
|
+
<key>5</key>
|
|
2923
|
+
<dict>
|
|
2924
|
+
<key>patterns</key>
|
|
2925
|
+
<array>
|
|
2788
2926
|
<dict>
|
|
2789
2927
|
<key>include</key>
|
|
2790
|
-
<string>#
|
|
2928
|
+
<string>#string-literal</string>
|
|
2791
2929
|
</dict>
|
|
2792
2930
|
</array>
|
|
2793
2931
|
</dict>
|
|
2794
2932
|
</dict>
|
|
2795
2933
|
<key>end</key>
|
|
2796
|
-
<string>(
|
|
2934
|
+
<string>(?=\})|(?=when\b)</string>
|
|
2797
2935
|
<key>patterns</key>
|
|
2798
2936
|
<array>
|
|
2799
2937
|
<dict>
|
|
@@ -2806,36 +2944,6 @@
|
|
|
2806
2944
|
</dict>
|
|
2807
2945
|
</array>
|
|
2808
2946
|
</dict>
|
|
2809
|
-
<key>when-string-statement</key>
|
|
2810
|
-
<dict>
|
|
2811
|
-
<key>patterns</key>
|
|
2812
|
-
<array>
|
|
2813
|
-
<dict>
|
|
2814
|
-
<key>name</key>
|
|
2815
|
-
<string>string.quoted.single.apex</string>
|
|
2816
|
-
<key>begin</key>
|
|
2817
|
-
<string>\'</string>
|
|
2818
|
-
<key>beginCaptures</key>
|
|
2819
|
-
<dict>
|
|
2820
|
-
<key>0</key>
|
|
2821
|
-
<dict>
|
|
2822
|
-
<key>name</key>
|
|
2823
|
-
<string>punctuation.definition.string.begin.apex</string>
|
|
2824
|
-
</dict>
|
|
2825
|
-
</dict>
|
|
2826
|
-
<key>end</key>
|
|
2827
|
-
<string>\'</string>
|
|
2828
|
-
<key>endCaptures</key>
|
|
2829
|
-
<dict>
|
|
2830
|
-
<key>0</key>
|
|
2831
|
-
<dict>
|
|
2832
|
-
<key>name</key>
|
|
2833
|
-
<string>punctuation.definition.string.end.apex</string>
|
|
2834
|
-
</dict>
|
|
2835
|
-
</dict>
|
|
2836
|
-
</dict>
|
|
2837
|
-
</array>
|
|
2838
|
-
</dict>
|
|
2839
2947
|
<key>when-else-statement</key>
|
|
2840
2948
|
<dict>
|
|
2841
2949
|
<key>begin</key>
|
|
@@ -2854,7 +2962,7 @@
|
|
|
2854
2962
|
</dict>
|
|
2855
2963
|
</dict>
|
|
2856
2964
|
<key>end</key>
|
|
2857
|
-
<string>(
|
|
2965
|
+
<string>(?=\})|(?=when\b)</string>
|
|
2858
2966
|
<key>patterns</key>
|
|
2859
2967
|
<array>
|
|
2860
2968
|
<dict>
|
|
@@ -2880,7 +2988,7 @@
|
|
|
2880
2988
|
</dict>
|
|
2881
2989
|
</dict>
|
|
2882
2990
|
<key>end</key>
|
|
2883
|
-
<string>(
|
|
2991
|
+
<string>(?=\})|(?=when\b)</string>
|
|
2884
2992
|
<key>patterns</key>
|
|
2885
2993
|
<array>
|
|
2886
2994
|
<dict>
|
|
@@ -2891,6 +2999,10 @@
|
|
|
2891
2999
|
<key>include</key>
|
|
2892
3000
|
<string>#expression</string>
|
|
2893
3001
|
</dict>
|
|
3002
|
+
<dict>
|
|
3003
|
+
<key>include</key>
|
|
3004
|
+
<string>#punctuation-comma</string>
|
|
3005
|
+
</dict>
|
|
2894
3006
|
</array>
|
|
2895
3007
|
</dict>
|
|
2896
3008
|
<key>when-sobject-statement</key>
|
|
@@ -2916,7 +3028,7 @@
|
|
|
2916
3028
|
</dict>
|
|
2917
3029
|
</dict>
|
|
2918
3030
|
<key>end</key>
|
|
2919
|
-
<string>(
|
|
3031
|
+
<string>(?=\})|(?=when\b)</string>
|
|
2920
3032
|
<key>patterns</key>
|
|
2921
3033
|
<array>
|
|
2922
3034
|
<dict>
|
|
@@ -4247,7 +4359,7 @@
|
|
|
4247
4359
|
<dict>
|
|
4248
4360
|
<key>match</key>
|
|
4249
4361
|
<string>(?x)
|
|
4250
|
-
(?:(?:\b(this)\b)\s+)?
|
|
4362
|
+
(?:(?:\b(this|final)\b)\s+)?
|
|
4251
4363
|
(?<type_name>
|
|
4252
4364
|
(?:
|
|
4253
4365
|
(?:ref\s+)? # ref return
|
|
@@ -4434,7 +4546,7 @@
|
|
|
4434
4546
|
<key>type-builtin</key>
|
|
4435
4547
|
<dict>
|
|
4436
4548
|
<key>match</key>
|
|
4437
|
-
<string>\b(Blob|Boolean|byte|Date|Datetime|Decimal|Double|ID|Integer|Long|Object|String|Time|void)\b</string>
|
|
4549
|
+
<string>\b(Blob|Boolean|byte|Date|Datetime|Decimal|Double|Id|ID|Integer|Long|Object|String|Time|void)\b</string>
|
|
4438
4550
|
<key>captures</key>
|
|
4439
4551
|
<dict>
|
|
4440
4552
|
<key>1</key>
|