Fix text interpolations

mulesoft-labs · Sep 7, 2017 · c20cee1 · c20cee1
1 parent d208cea
commit c20cee1
Show file tree

Hide file tree

Showing 4 changed files with 1,232 additions and 0 deletions.
diff --git a/DataWeave.YAML-tmLanguage b/DataWeave.YAML-tmLanguage
@@ -403,6 +403,7 @@ repository:
       '0': { name: string.quoted.double.dw punctuation.definition.string.end.dw }
     patterns:
     - include: '#template-substitution-element'
+    - include: '#template-dollar'
     - include: '#string-character-escape'
     - match: ([^`])
       name: string.template.dw
@@ -417,6 +418,7 @@ repository:
       '0': { name: string.template.dw punctuation.definition.string.template.end.dw}
     patterns:
      - include: '#template-substitution-element'
+     - include: '#template-dollar'
      - include: '#string-character-escape'
      - match: ([^`])
        name: string.template.dw
@@ -434,6 +436,7 @@ repository:
       '0': { name: string.quoted.double.dw punctuation.definition.string.end.dw }
     patterns:
     - include: '#template-substitution-element'
+    - include: '#template-dollar'
     - include: '#string-character-escape'
     - match: ([^"])
       name: string.quoted.double.dw
@@ -448,10 +451,23 @@ repository:
       '2': { name: invalid.illegal.newline.dw }
     patterns:
     - include: '#template-substitution-element'
+    - include: '#template-dollar'
     - include: '#string-character-escape'
     - match: ([^'])
       name: string.quoted.single.dw
 
+  template-dollar:
+    patterns:
+    - match: (\$(\$)+)
+      name: variable.parameter.dw
+    - match: (\$)(?![a-zA-Z(])
+      name: variable.parameter.dw
+    - match: (\$)([a-zA-Z][a-zA-Z0-9_]*)
+      captures:
+        '1': {name: keyword.other.dw}
+        '2': {name: variable.other.dw}
+      name: variable.parameter.dw
+
   template-substitution-element:
     name: meta.template.expression.dw
     begin: \$\(

diff --git a/DataWeave.tmLanguage b/DataWeave.tmLanguage
@@ -1192,6 +1192,10 @@
             <key>include</key>
             <string>#template-substitution-element</string>
           </dict>
+          <dict>
+            <key>include</key>
+            <string>#template-dollar</string>
+          </dict>
           <dict>
             <key>include</key>
             <string>#string-character-escape</string>
@@ -1237,6 +1241,10 @@
             <key>include</key>
             <string>#template-substitution-element</string>
           </dict>
+          <dict>
+            <key>include</key>
+            <string>#template-dollar</string>
+          </dict>
           <dict>
             <key>include</key>
             <string>#string-character-escape</string>
@@ -1284,6 +1292,10 @@
             <key>include</key>
             <string>#template-substitution-element</string>
           </dict>
+          <dict>
+            <key>include</key>
+            <string>#template-dollar</string>
+          </dict>
           <dict>
             <key>include</key>
             <string>#string-character-escape</string>
@@ -1329,6 +1341,10 @@
             <key>include</key>
             <string>#template-substitution-element</string>
           </dict>
+          <dict>
+            <key>include</key>
+            <string>#template-dollar</string>
+          </dict>
           <dict>
             <key>include</key>
             <string>#string-character-escape</string>
@@ -1341,6 +1357,43 @@
           </dict>
         </array>
       </dict>
+      <key>template-dollar</key>
+      <dict>
+        <key>patterns</key>
+        <array>
+          <dict>
+            <key>match</key>
+            <string>(\$(\$)+)</string>
+            <key>name</key>
+            <string>variable.parameter.dw</string>
+          </dict>
+          <dict>
+            <key>match</key>
+            <string>(\$)(?![a-zA-Z(])</string>
+            <key>name</key>
+            <string>variable.parameter.dw</string>
+          </dict>
+          <dict>
+            <key>match</key>
+            <string>(\$)([a-zA-Z][a-zA-Z0-9_]*)</string>
+            <key>captures</key>
+            <dict>
+              <key>1</key>
+              <dict>
+                <key>name</key>
+                <string>keyword.other.dw</string>
+              </dict>
+              <key>2</key>
+              <dict>
+                <key>name</key>
+                <string>variable.other.dw</string>
+              </dict>
+            </dict>
+            <key>name</key>
+            <string>variable.parameter.dw</string>
+          </dict>
+        </array>
+      </dict>
       <key>template-substitution-element</key>
       <dict>
         <key>name</key>