@salesforce/apex-tmlanguage 1.8.1 → 1.8.2

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.
Files changed (4) hide show
  1. package/grammars/apex.tmLanguage +29 -43
  2. package/grammars/apex.tmLanguage.cson +17 -22
  3. package/grammars/soql.tmLanguage +29 -43
  4. package/package.json +1 -1
package/grammars/apex.tmLanguage CHANGED
@@ -1348,7 +1348,7 @@
1348
1348
  <key>implements-class</key>
1349
1349
  <dict>
1350
1350
  <key>begin</key>
1351
- <string>(implements)\b\s+([_[:alpha:]][_[:alnum:]]*)</string>
1351
+ <string>(implements)\b</string>
1352
1352
  <key>beginCaptures</key>
1353
1353
  <dict>
1354
1354
  <key>1</key>
@@ -1356,12 +1356,27 @@
1356
1356
  <key>name</key>
1357
1357
  <string>keyword.other.implements.apex</string>
1358
1358
  </dict>
1359
- <key>2</key>
1359
+ </dict>
1360
+ <key>patterns</key>
1361
+ <array>
1360
1362
  <dict>
1361
- <key>name</key>
1362
- <string>entity.name.type.implements.apex</string>
1363
+ <key>match</key>
1364
+ <string>([_[:alpha:]][_[:alnum:]]*)\b\s*(,)?</string>
1365
+ <key>captures</key>
1366
+ <dict>
1367
+ <key>1</key>
1368
+ <dict>
1369
+ <key>name</key>
1370
+ <string>entity.name.type.implements.apex</string>
1371
+ </dict>
1372
+ <key>2</key>
1373
+ <dict>
1374
+ <key>name</key>
1375
+ <string>punctuation.separator.comma.apex</string>
1376
+ </dict>
1377
+ </dict>
1363
1378
  </dict>
1364
- </dict>
1379
+ </array>
1365
1380
  <key>end</key>
1366
1381
  <string>(?={|extends)</string>
1367
1382
  </dict>
@@ -2663,7 +2678,7 @@
2663
2678
  <string>(?x)
2664
2679
  (switch)\b\s+
2665
2680
  (on)\b\s+
2666
- (?:([_.?\'\(\)[:alnum:]]+)\s*)?
2681
+ (.*)
2667
2682
  (\{)</string>
2668
2683
  <key>beginCaptures</key>
2669
2684
  <dict>
@@ -2782,7 +2797,7 @@
2782
2797
  <key>when-string</key>
2783
2798
  <dict>
2784
2799
  <key>begin</key>
2785
- <string>(when)(\b\s*)((\')[_.\,\'\s*[:alnum:]]+)</string>
2800
+ <string>(when)\b\s*('[^'\n]*')(,)?</string>
2786
2801
  <key>beginCaptures</key>
2787
2802
  <dict>
2788
2803
  <key>1</key>
@@ -2791,18 +2806,19 @@
2791
2806
  <string>keyword.control.switch.when.apex</string>
2792
2807
  </dict>
2793
2808
  <key>2</key>
2794
- <dict>
2795
- <key>name</key>
2796
- <string>punctuation.whitespace.apex</string>
2797
- </dict>
2798
- <key>3</key>
2799
2809
  <dict>
2800
2810
  <key>patterns</key>
2801
2811
  <array>
2802
2812
  <dict>
2803
2813
  <key>include</key>
2804
- <string>#when-string-statement</string>
2814
+ <string>#string-literal</string>
2805
2815
  </dict>
2816
+ </array>
2817
+ </dict>
2818
+ <key>3</key>
2819
+ <dict>
2820
+ <key>patterns</key>
2821
+ <array>
2806
2822
  <dict>
2807
2823
  <key>include</key>
2808
2824
  <string>#punctuation-comma</string>
@@ -2824,36 +2840,6 @@
2824
2840
  </dict>
2825
2841
  </array>
2826
2842
  </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
2843
  <key>when-else-statement</key>
2858
2844
  <dict>
2859
2845
  <key>begin</key>
package/grammars/apex.tmLanguage.cson CHANGED
@@ -805,12 +805,20 @@ repository:
805
805
  name: 'entity.name.type.extends.apex'
806
806
  end: '(?={|implements)'
807
807
  'implements-class':
808
- begin: '(implements)\\b\\s+([_[:alpha:]][_[:alnum:]]*)'
808
+ begin: '(implements)\\b'
809
809
  beginCaptures:
810
810
  '1':
811
811
  name: 'keyword.other.implements.apex'
812
- '2':
813
- name: 'entity.name.type.implements.apex'
812
+ patterns: [
813
+ {
814
+ match: '([_[:alpha:]][_[:alnum:]]*)\\b\\s*(,)?'
815
+ captures:
816
+ '1':
817
+ name: 'entity.name.type.implements.apex'
818
+ '2':
819
+ name: 'punctuation.separator.comma.apex'
820
+ }
821
+ ]
814
822
  end: '(?={|extends)'
815
823
  'soql-query-expression':
816
824
  begin: '\\b(SELECT)\\b\\s*'
@@ -1569,7 +1577,7 @@ repository:
1569
1577
  (?x)
1570
1578
  (switch)\\b\\s+
1571
1579
  (on)\\b\\s+
1572
- (?:([_.?\\'\\(\\)[:alnum:]]+)\\s*)?
1580
+ (.*)
1573
1581
  (\\{)
1574
1582
  '''
1575
1583
  beginCaptures:
@@ -1639,17 +1647,18 @@ repository:
1639
1647
  }
1640
1648
  ]
1641
1649
  'when-string':
1642
- begin: "(when)(\\b\\s*)((\\')[_.\\,\\'\\s*[:alnum:]]+)"
1650
+ begin: "(when)\\b\\s*('[^'\\n]*')(,)?"
1643
1651
  beginCaptures:
1644
1652
  '1':
1645
1653
  name: 'keyword.control.switch.when.apex'
1646
1654
  '2':
1647
- name: 'punctuation.whitespace.apex'
1648
- '3':
1649
1655
  patterns: [
1650
1656
  {
1651
- include: '#when-string-statement'
1657
+ include: '#string-literal'
1652
1658
  }
1659
+ ]
1660
+ '3':
1661
+ patterns: [
1653
1662
  {
1654
1663
  include: '#punctuation-comma'
1655
1664
  }
@@ -1663,20 +1672,6 @@ repository:
1663
1672
  include: '#expression'
1664
1673
  }
1665
1674
  ]
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
1675
  'when-else-statement':
1681
1676
  begin: '(when)\\b\\s+(else)\\b\\s*'
1682
1677
  beginCaptures:
package/grammars/soql.tmLanguage CHANGED
@@ -1334,7 +1334,7 @@
1334
1334
  <key>implements-class</key>
1335
1335
  <dict>
1336
1336
  <key>begin</key>
1337
- <string>(implements)\b\s+([_[:alpha:]][_[:alnum:]]*)</string>
1337
+ <string>(implements)\b</string>
1338
1338
  <key>beginCaptures</key>
1339
1339
  <dict>
1340
1340
  <key>1</key>
@@ -1342,12 +1342,27 @@
1342
1342
  <key>name</key>
1343
1343
  <string>keyword.other.implements.apex</string>
1344
1344
  </dict>
1345
- <key>2</key>
1345
+ </dict>
1346
+ <key>patterns</key>
1347
+ <array>
1346
1348
  <dict>
1347
- <key>name</key>
1348
- <string>entity.name.type.implements.apex</string>
1349
+ <key>match</key>
1350
+ <string>([_[:alpha:]][_[:alnum:]]*)\b\s*(,)?</string>
1351
+ <key>captures</key>
1352
+ <dict>
1353
+ <key>1</key>
1354
+ <dict>
1355
+ <key>name</key>
1356
+ <string>entity.name.type.implements.apex</string>
1357
+ </dict>
1358
+ <key>2</key>
1359
+ <dict>
1360
+ <key>name</key>
1361
+ <string>punctuation.separator.comma.apex</string>
1362
+ </dict>
1363
+ </dict>
1349
1364
  </dict>
1350
- </dict>
1365
+ </array>
1351
1366
  <key>end</key>
1352
1367
  <string>(?={|extends)</string>
1353
1368
  </dict>
@@ -2645,7 +2660,7 @@
2645
2660
  <string>(?x)
2646
2661
  (switch)\b\s+
2647
2662
  (on)\b\s+
2648
- (?:([_.?\'\(\)[:alnum:]]+)\s*)?
2663
+ (.*)
2649
2664
  (\{)</string>
2650
2665
  <key>beginCaptures</key>
2651
2666
  <dict>
@@ -2764,7 +2779,7 @@
2764
2779
  <key>when-string</key>
2765
2780
  <dict>
2766
2781
  <key>begin</key>
2767
- <string>(when)(\b\s*)((\')[_.\,\'\s*[:alnum:]]+)</string>
2782
+ <string>(when)\b\s*('[^'\n]*')(,)?</string>
2768
2783
  <key>beginCaptures</key>
2769
2784
  <dict>
2770
2785
  <key>1</key>
@@ -2773,18 +2788,19 @@
2773
2788
  <string>keyword.control.switch.when.apex</string>
2774
2789
  </dict>
2775
2790
  <key>2</key>
2776
- <dict>
2777
- <key>name</key>
2778
- <string>punctuation.whitespace.apex</string>
2779
- </dict>
2780
- <key>3</key>
2781
2791
  <dict>
2782
2792
  <key>patterns</key>
2783
2793
  <array>
2784
2794
  <dict>
2785
2795
  <key>include</key>
2786
- <string>#when-string-statement</string>
2796
+ <string>#string-literal</string>
2787
2797
  </dict>
2798
+ </array>
2799
+ </dict>
2800
+ <key>3</key>
2801
+ <dict>
2802
+ <key>patterns</key>
2803
+ <array>
2788
2804
  <dict>
2789
2805
  <key>include</key>
2790
2806
  <string>#punctuation-comma</string>
@@ -2806,36 +2822,6 @@
2806
2822
  </dict>
2807
2823
  </array>
2808
2824
  </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
2825
  <key>when-else-statement</key>
2840
2826
  <dict>
2841
2827
  <key>begin</key>
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@salesforce/apex-tmlanguage",
3
- "version": "1.8.1",
3
+ "version": "1.8.2",
4
4
  "description": "Textmate grammar for Apex with outputs for VSCode, Atom and TextMate.",
5
5
  "displayName": "apex-tmLanguage",
6
6
  "keywords": [