@salesforce/apex-tmlanguage 2.0.2 → 2.0.3

package/grammars/apex.tmLanguage

@@ -2921,6 +2921,10 @@
           <dict>
             <key>patterns</key>
             <array>
+              <dict>
+                <key>include</key>
+                <string>#multiline-string-literal</string>
+              </dict>
               <dict>
                 <key>include</key>
                 <string>#string-literal</string>
@@ -2941,6 +2945,10 @@
           <dict>
             <key>patterns</key>
             <array>
+              <dict>
+                <key>include</key>
+                <string>#multiline-string-literal</string>
+              </dict>
               <dict>
                 <key>include</key>
                 <string>#string-literal</string>
@@ -3686,9 +3694,9 @@
       <key>multiline-string-literal</key>
       <dict>
         <key>name</key>
-        <string>string.quoted.single.multiline.apex</string>
+        <string>string.quoted.single.apex string.quoted.single.multiline.apex</string>
         <key>begin</key>
-        <string>'''</string>
+        <string>'''(?=$)</string>
         <key>beginCaptures</key>
         <dict>
           <key>0</key>
@@ -3713,10 +3721,6 @@
             <key>include</key>
             <string>#string-character-escape</string>
           </dict>
-          <dict>
-            <key>include</key>
-            <string>#string-template-expression</string>
-          </dict>
         </array>
       </dict>
       <key>string-literal</key>
@@ -3772,7 +3776,7 @@
         <key>name</key>
         <string>meta.template-expression.apex</string>
         <key>begin</key>
-        <string>\$\{</string>
+        <string>(?&lt;!\\)\$\{</string>
         <key>beginCaptures</key>
         <dict>
           <key>0</key>
@@ -3797,7 +3801,7 @@
             <key>name</key>
             <string>variable.other.readwrite.apex</string>
             <key>match</key>
-            <string>@?[_[:alpha:]][_[:alnum:]]*</string>
+            <string>\G@?[A-Za-z_][A-Za-z0-9_]*(?:\.[A-Za-z_][A-Za-z0-9_]*)*</string>
           </dict>
         </array>
       </dict>

package/grammars/apex.tmLanguage.cson

@@ -1720,6 +1720,9 @@ repository:
         name: 'keyword.control.switch.when.apex'
       '2':
         patterns: [
+          {
+            include: '#multiline-string-literal'
+          }
           {
             include: '#string-literal'
           }
@@ -1732,6 +1735,9 @@ repository:
         ]
       '5':
         patterns: [
+          {
+            include: '#multiline-string-literal'
+          }
           {
             include: '#string-literal'
           }
@@ -2178,8 +2184,8 @@ repository:
       }
     ]
   'multiline-string-literal':
-    name: 'string.quoted.single.multiline.apex'
-    begin: "'''"
+    name: 'string.quoted.single.apex string.quoted.single.multiline.apex'
+    begin: "'''(?=$)"
     beginCaptures:
       '0':
         name: 'punctuation.definition.string.begin.apex'
@@ -2191,9 +2197,6 @@ repository:
       {
         include: '#string-character-escape'
       }
-      {
-        include: '#string-template-expression'
-      }
     ]
   'string-literal':
     name: 'string.quoted.single.apex'
@@ -2220,7 +2223,7 @@ repository:
     match: '\\\\.'
   'string-template-expression':
     name: 'meta.template-expression.apex'
-    begin: '\\$\\{'
+    begin: '(?<!\\\\)\\$\\{'
     beginCaptures:
       '0':
         name: 'punctuation.definition.template-expression.begin.apex'
@@ -2231,7 +2234,7 @@ repository:
     patterns: [
       {
         name: 'variable.other.readwrite.apex'
-        match: '@?[_[:alpha:]][_[:alnum:]]*'
+        match: '\\G@?[A-Za-z_][A-Za-z0-9_]*(?:\\.[A-Za-z_][A-Za-z0-9_]*)*'
       }
     ]
   'expression-operators':

package/grammars/soql.tmLanguage

@@ -2903,6 +2903,10 @@
           <dict>
             <key>patterns</key>
             <array>
+              <dict>
+                <key>include</key>
+                <string>#multiline-string-literal</string>
+              </dict>
               <dict>
                 <key>include</key>
                 <string>#string-literal</string>
@@ -2923,6 +2927,10 @@
           <dict>
             <key>patterns</key>
             <array>
+              <dict>
+                <key>include</key>
+                <string>#multiline-string-literal</string>
+              </dict>
               <dict>
                 <key>include</key>
                 <string>#string-literal</string>
@@ -3668,9 +3676,9 @@
       <key>multiline-string-literal</key>
       <dict>
         <key>name</key>
-        <string>string.quoted.single.multiline.apex</string>
+        <string>string.quoted.single.apex string.quoted.single.multiline.apex</string>
         <key>begin</key>
-        <string>'''</string>
+        <string>'''(?=$)</string>
         <key>beginCaptures</key>
         <dict>
           <key>0</key>
@@ -3695,10 +3703,6 @@
             <key>include</key>
             <string>#string-character-escape</string>
           </dict>
-          <dict>
-            <key>include</key>
-            <string>#string-template-expression</string>
-          </dict>
         </array>
       </dict>
       <key>string-literal</key>
@@ -3754,7 +3758,7 @@
         <key>name</key>
         <string>meta.template-expression.apex</string>
         <key>begin</key>
-        <string>\$\{</string>
+        <string>(?&lt;!\\)\$\{</string>
         <key>beginCaptures</key>
         <dict>
           <key>0</key>
@@ -3779,7 +3783,7 @@
             <key>name</key>
             <string>variable.other.readwrite.apex</string>
             <key>match</key>
-            <string>@?[_[:alpha:]][_[:alnum:]]*</string>
+            <string>\G@?[A-Za-z_][A-Za-z0-9_]*(?:\.[A-Za-z_][A-Za-z0-9_]*)*</string>
           </dict>
         </array>
       </dict>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/apex-tmlanguage",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "Textmate grammar for Apex with outputs for VSCode, Atom and TextMate.",
   "displayName": "apex-tmLanguage",
   "keywords": [