From 8df6ab9a0da8917921fc659026aeae2b3c6fd7dd Mon Sep 17 00:00:00 2001
From: Steven Knight <steven@knight.cx>
Date: Tue, 22 Jul 2014 16:47:29 -0400
Subject: [PATCH] Update syntax to support using variables (create using the
 'set' keyword) in the various commands (e.g. bindsym, client.*, background,
 etc).

The use-case for this change came about from using j4-make-config (https://github.com/okraits/j4-make-config).
---
 Syntax/i3wm_config.YAML-tmLanguage | 197 +++++++++---
 Syntax/i3wm_config.tmLanguage      | 474 ++++++++++++++++++++++++++---
 2 files changed, 594 insertions(+), 77 deletions(-)

diff --git a/Syntax/i3wm_config.YAML-tmLanguage b/Syntax/i3wm_config.YAML-tmLanguage
index ec89e15..f3e1dc9 100644
--- a/Syntax/i3wm_config.YAML-tmLanguage
+++ b/Syntax/i3wm_config.YAML-tmLanguage
@@ -5,7 +5,6 @@ scopeName: source.i3wm_config
 fileTypes: [i3/config, config]
 uuid: bb9ebd33-1b88-4310-acef-41720bcac38f
 
-
 patterns:
 - name: criteria
   match: \[(.*)\]
@@ -14,10 +13,10 @@ patterns:
 
 # Chapter 4, Configuring i3
 - name: comment
-  match: ((#).*)
+  match: (\#)(.*)
   captures:
-    '1': {name: comment}
-    '2': {name: comment.source.i3wm_config}
+    '1': {name: comment.line.number-sign.i3wm_config}
+    '2': {name: comment.line.i3wm_config}
 
 - name: font_pango
   match: (font\ pango\:)\s*([- ,\w]*)
@@ -100,13 +99,22 @@ patterns:
     '3': {name: constant.string.i3wm_config}
 
 # set $mod Mod4
-- name: set
+- name: set1
   match: (set)\s*(\$\w*)\s*(\w*)
   captures:
     '1': {name: keyword.control.i3wm_config}
-    '2': {name: meta.scope.variable.other.i3wm_config}
+    '2': {name: variable.other.i3wm_config}
     '3': {name: constant.language.i3wm_config}
 
+# set $mod #012345
+- name: set2
+  match: (set)\s*(\$\w*)\s*(#\w{6})
+  captures:
+    '1': {name: keyword.control.i3wm_config}
+    '2': {name: variable.other.i3wm_config}
+    '3': {name: constant.other.i3wm_config}
+
+
 #assign <criteria> command
 - name: assign
   match: (assign)\s*\[(.*)]\s*(→)?\s*([\w\d]*)
@@ -133,44 +141,86 @@ patterns:
     '3': {name: constant.string.i3wm_config}
 
 # client.focused <color> <color> <color> <color>
-- name: client_focused
-  match: (client.focused)\s*(#\w{6})\s*(#\w{6})\s*(#\w{6})\s*(#\w{6})
+- name: client_focused1
+  match: (client\.focused)\s*(#\w{6})\s*(#\w{6})\s*(#\w{6})\s*(#\w{6})
   captures:
     '1': {name: keyword.control.i3wm_config}
-    '2': {name: constant.string.i3wm_config}
-    '3': {name: constant.string.i3wm_config}
-    '4': {name: constant.string.i3wm_config}
-    '5': {name: constant.string.i3wm_config}
+    '2': {name: constant.other.i3wm_config}
+    '3': {name: constant.other.i3wm_config}
+    '4': {name: constant.other.i3wm_config}
+    '5': {name: constant.other.i3wm_config}
+
+- name: client_focused2
+  match: (client\.focused)\s*(\$\w*)\s*(\$\w*)\s*(\$\w*)\s*(\$\w*)
+  captures:
+    '1': {name: keyword.control.i3wm_config}
+    '2': {name: variable.other.i3wm_config}
+    '3': {name: variable.other.i3wm_config}
+    '4': {name: variable.other.i3wm_config}
+    '5': {name: variable.other.i3wm_config}
+
+
 
 # client.focused_inactive <color> <color> <color> <color>
-- name: client_focused_inactive
-  match: (client\.focused\_inactive)\s*(#\w{6})\s*(#\w{6})\s*(#\w{6})\s*(#\w{6})
+- name: client_focused_inactive1
+  match: (client\.focused_inactive)\s*(#\w{6})\s*(#\w{6})\s*(#\w{6})\s*(#\w{6})
   captures:
     '1': {name: keyword.control.i3wm_config}
-    '2': {name: constant.string.i3wm_config}
-    '3': {name: constant.string.i3wm_config}
-    '4': {name: constant.string.i3wm_config}
-    '5': {name: constant.string.i3wm_config}
+    '2': {name: constant.other.i3wm_config}
+    '3': {name: constant.other.i3wm_config}
+    '4': {name: constant.other.i3wm_config}
+    '5': {name: constant.other.i3wm_config}
+
+- name: client_focused_inactive2
+  match: (client\.focused_inactive)\s*(\$\w*)\s*(\$\w*)\s*(\$\w*)\s*(\$\w*)
+  captures:
+    '1': {name: keyword.control.i3wm_config}
+    '2': {name: variable.other.i3wm_config}
+    '3': {name: variable.other.i3wm_config}
+    '4': {name: variable.other.i3wm_config}
+    '5': {name: variable.other.i3wm_config}
+
+
 
 # client.unfocused <color> <color> <color> <color>
-- name: client_unfocused
+- name: client_unfocused1
   match: (client\.unfocused)\s*(#\w{6})\s*(#\w{6})\s*(#\w{6})\s*(#\w{6})
   captures:
     '1': {name: keyword.control.i3wm_config}
-    '2': {name: constant.string.i3wm_config}
-    '3': {name: constant.string.i3wm_config}
-    '4': {name: constant.string.i3wm_config}
-    '5': {name: constant.string.i3wm_config}
+    '2': {name: constant.other.i3wm_config}
+    '3': {name: constant.other.i3wm_config}
+    '4': {name: constant.other.i3wm_config}
+    '5': {name: constant.other.i3wm_config}
+
+- name: client_unfocused2
+  match: (client\.unfocused)\s*(\$\w*)\s*(\$\w*)\s*(\$\w*)\s*(\$\w*)
+  captures:
+    '1': {name: keyword.control.i3wm_config}
+    '2': {name: variable.other.i3wm_config}
+    '3': {name: variable.other.i3wm_config}
+    '4': {name: variable.other.i3wm_config}
+    '5': {name: variable.other.i3wm_config}
+
 
 # client.urgent <color> <color> <color> <color>
-- name: client_urgent
+- name: client_urgent1
   match: (client\.urgent)\s*(#\w{6})\s*(#\w{6})\s*(#\w{6})\s*(#\w{6})
   captures:
     '1': {name: keyword.control.i3wm_config}
-    '2': {name: constant.string.i3wm_config}
-    '3': {name: constant.string.i3wm_config}
-    '4': {name: constant.string.i3wm_config}
-    '5': {name: constant.string.i3wm_config}
+    '2': {name: constant.other.i3wm_config}
+    '3': {name: constant.other.i3wm_config}
+    '4': {name: constant.other.i3wm_config}
+    '5': {name: constant.other.i3wm_config}
+
+- name: client_urgent2
+  match: (client\.urgent)\s*(\$\w*)\s*(\$\w*)\s*(\$\w*)\s*(\$\w*)
+  captures:
+    '1': {name: keyword.control.i3wm_config}
+    '2': {name: variable.other.i3wm_config}
+    '3': {name: variable.other.i3wm_config}
+    '4': {name: variable.other.i3wm_config}
+    '5': {name: variable.other.i3wm_config}
+
 
 # ipc-socket <path>
 - name: ipc_socket
@@ -320,27 +370,34 @@ patterns:
 
 # background <color>
 - name: background
-  match: (background)\s*(#\w{6})
+  match: (background)\s*([#$\w]*)
   captures:
     '1': {name: keyword.control.i3wm_config}
     '2': {name: constant.language.i3wm_config}
 
 # statusline <color>
-- name: statusline
+- name: statusline1
   match: (statusline)\s*(#\w{6})
   captures:
     '1': {name: keyword.control.i3wm_config}
     '2': {name: constant.language.i3wm_config}
 
+- name: statusline2
+  match: (statusline)\s*(\$\w*)
+  captures:
+    '1': {name: keyword.control.i3wm_config}
+    '2': {name: variable.other.i3wm_config}
+
+
 # separator <color>
 - name: separator
-  match: (separator)\s*(#\w{6})
+  match: (separator)\s*([#$\w]*)
   captures:
     '1': {name: keyword.control.i3wm_config}
     '2': {name: constant.language.i3wm_config}
 
 # focused_workspace <color> <color> <color>
-- name: focused_workspace
+- name: focused_workspace1
   match: (focused_workspace)\s*(#\w{6})\s*(#\w{6})\s*(#\w{6})
   captures:
     '1': {name: keyword.control.i3wm_config}
@@ -349,8 +406,18 @@ patterns:
     '4': {name: constant.language.i3wm_config}
     '5': {name: constant.language.i3wm_config}
 
+- name: focused_workspace2
+  match: (focused_workspace)\s*(\$\w*)\s*(\$\w*)\s*(\$\w*)
+  captures:
+    '1': {name: keyword.control.i3wm_config}
+    '2': {name: variable.other.i3wm_config}
+    '3': {name: variable.other.i3wm_config}
+    '4': {name: variable.other.i3wm_config}
+    '5': {name: variable.other.i3wm_config}
+
+
 # active_workspace <color> <color> <color>
-- name: active_workspace
+- name: active_workspace1
   match: (active_workspace)\s*(#\w{6})\s*(#\w{6})\s*(#\w{6})
   captures:
     '1': {name: keyword.control.i3wm_config}
@@ -359,9 +426,19 @@ patterns:
     '4': {name: constant.language.i3wm_config}
     '5': {name: constant.language.i3wm_config}
 
+- name: active_workspace2
+  match: (active_workspace)\s*(\$\w*)\s*(\$\w*)\s*(\$\w*)
+  captures:
+    '1': {name: keyword.control.i3wm_config}
+    '2': {name: variable.other.i3wm_config}
+    '3': {name: variable.other.i3wm_config}
+    '4': {name: variable.other.i3wm_config}
+    '5': {name: variable.other.i3wm_config}
+
+
 # inactive_workspace <color> <color> <color>
-- name: inactive_workspace
-  match: (inactive_workspace)\s*(#\w{6})\s*(#\w{6})\s*(#\w{6})
+- name: inactive_workspace1
+  match: (inactive_workspace)\s*([#\$\w]*)\s*([#\$\w]*)\s*([#\$\w]*)
   captures:
     '1': {name: keyword.control.i3wm_config}
     '2': {name: constant.language.i3wm_config}
@@ -369,8 +446,18 @@ patterns:
     '4': {name: constant.language.i3wm_config}
     '5': {name: constant.language.i3wm_config}
 
+- name: inactive_workspace2
+  match: (inactive_workspace)\s*(\$\w*)\s*(\$\w*)\s*(\$\w*)
+  captures:
+    '1': {name: keyword.control.i3wm_config}
+    '2': {name: variable.other.i3wm_config}
+    '3': {name: variable.other.i3wm_config}
+    '4': {name: variable.other.i3wm_config}
+    '5': {name: variable.other.i3wm_config}
+
+
 # urgent_workspace <color> <color> <color>
-- name: urgent_workspace
+- name: urgent_workspace1
   match: (urgent_workspace)\s*(#\w{6})\s*(#\w{6})\s*(#\w{6})
   captures:
     '1': {name: keyword.control.i3wm_config}
@@ -379,6 +466,15 @@ patterns:
     '4': {name: constant.language.i3wm_config}
     '5': {name: constant.language.i3wm_config}
 
+- name: urgent_workspace2
+  match: (urgent_workspace)\s*(\$\w*)\s*(\$\w*)\s*(\$\w*)
+  captures:
+    '1': {name: keyword.control.i3wm_config}
+    '2': {name: variable.other.i3wm_config}
+    '3': {name: variable.other.i3wm_config}
+    '4': {name: variable.other.i3wm_config}
+    '5': {name: variable.other.i3wm_config}
+
 # Chapter 6, List of commands
 
 - name: bindcode
@@ -476,6 +572,7 @@ patterns:
     '1': {name: keyword.control.i3wm_config}
     '2': {name: constant.language.i3wm_config}
 
+
 # rename workspace <old_name> to <new_name>
 # rename workspace to <new_name>
 - name: rename_workspace
@@ -506,21 +603,43 @@ patterns:
 # move workspace <name>
 # move workspace number <name>
 - name: move_workspace
-  match: (move)\s*(workspace)\s*(next|prev|next_on_output|prev_on_output|back_and_forth|(?:\w)*|(?:\d*\s*\w*))
+  match: (move)\s*(workspace)\s*(next|prev|next_on_output|prev_on_output|back_and_forth|(?:\w)*|(?:\d*\s*\w*))(\$\w*){0,1}
   captures:
     '1': {name: keyword.control.i3wm_config}
     '2': {name: keyword.control.i3wm_config}
     '3': {name: constant.language.i3wm_config}
+    '4': {name: variable.other.i3wm_config}
 
 # move [window|container] [to] workspace <name>
+- name: move__window_or_container1
+  match: (move)\s*(window|container)\s*(to)?\s*(workspace)?\s*(\$\w*)
+  captures:
+    '1': {name: keyword.control.i3wm_config}
+    '2': {name: keyword.control.i3wm_config}
+    '3': {name: keyword.control.i3wm_config}
+    '4': {name: keyword.control.i3wm_config}
+    '5': {name: variable.other.i3wm_config}
+
 # move [window|container] [to] workspace number <name>
+- name: move__window_or_container2
+  match: (move)\s*(window|container)\s*(to)?\s*(workspace)?\s*(\d*)\s*(\$?\w*)?
+  captures:
+    '1': {name: keyword.control.i3wm_config}
+    '2': {name: keyword.control.i3wm_config}
+    '3': {name: keyword.control.i3wm_config}
+    '4': {name: variable.other.i3wm_config}
+    '5': {name: constant.numeric.i3wm_config}
+    '6': {name: variable.other.i3wm_config}
+
 # move [window|container] [to] workspace <prev|next|current>
-- name: move__window_or_container
-  match: (move)\s*(window|container)\s*(to)?
+- name: move__window_or_container3
+  match: (move)\s*(window|container)\s*(to)?\s*(workspace)\s*(prev|next|current)
   captures:
     '1': {name: keyword.control.i3wm_config}
     '2': {name: keyword.control.i3wm_config}
     '3': {name: keyword.control.i3wm_config}
+    '4': {name: constant.language.i3wm_config}
+
 
 # resize_mode
 - name: resize_mode
diff --git a/Syntax/i3wm_config.tmLanguage b/Syntax/i3wm_config.tmLanguage
index 49dc1ba..79858a7 100644
--- a/Syntax/i3wm_config.tmLanguage
+++ b/Syntax/i3wm_config.tmLanguage
@@ -35,18 +35,18 @@
         <key>name</key>
         <string>comment</string>
         <key>match</key>
-        <string>((#).*)</string>
+        <string>(\#)(.*)</string>
         <key>captures</key>
         <dict>
           <key>1</key>
           <dict>
             <key>name</key>
-            <string>comment</string>
+            <string>comment.line.number-sign.i3wm_config</string>
           </dict>
           <key>2</key>
           <dict>
             <key>name</key>
-            <string>comment.source.i3wm_config</string>
+            <string>comment.line.i3wm_config</string>
           </dict>
         </dict>
       </dict>
@@ -286,7 +286,7 @@
       </dict>
       <dict>
         <key>name</key>
-        <string>set</string>
+        <string>set1</string>
         <key>match</key>
         <string>(set)\s*(\$\w*)\s*(\w*)</string>
         <key>captures</key>
@@ -299,7 +299,7 @@
           <key>2</key>
           <dict>
             <key>name</key>
-            <string>meta.scope.variable.other.i3wm_config</string>
+            <string>variable.other.i3wm_config</string>
           </dict>
           <key>3</key>
           <dict>
@@ -308,6 +308,30 @@
           </dict>
         </dict>
       </dict>
+      <dict>
+        <key>name</key>
+        <string>set2</string>
+        <key>match</key>
+        <string>(set)\s*(\$\w*)\s*(#\w{6})</string>
+        <key>captures</key>
+        <dict>
+          <key>1</key>
+          <dict>
+            <key>name</key>
+            <string>keyword.control.i3wm_config</string>
+          </dict>
+          <key>2</key>
+          <dict>
+            <key>name</key>
+            <string>variable.other.i3wm_config</string>
+          </dict>
+          <key>3</key>
+          <dict>
+            <key>name</key>
+            <string>constant.other.i3wm_config</string>
+          </dict>
+        </dict>
+      </dict>
       <dict>
         <key>name</key>
         <string>assign</string>
@@ -387,9 +411,9 @@
       </dict>
       <dict>
         <key>name</key>
-        <string>client_focused</string>
+        <string>client_focused1</string>
         <key>match</key>
-        <string>(client.focused)\s*(#\w{6})\s*(#\w{6})\s*(#\w{6})\s*(#\w{6})</string>
+        <string>(client\.focused)\s*(#\w{6})\s*(#\w{6})\s*(#\w{6})\s*(#\w{6})</string>
         <key>captures</key>
         <dict>
           <key>1</key>
@@ -400,30 +424,30 @@
           <key>2</key>
           <dict>
             <key>name</key>
-            <string>constant.string.i3wm_config</string>
+            <string>constant.other.i3wm_config</string>
           </dict>
           <key>3</key>
           <dict>
             <key>name</key>
-            <string>constant.string.i3wm_config</string>
+            <string>constant.other.i3wm_config</string>
           </dict>
           <key>4</key>
           <dict>
             <key>name</key>
-            <string>constant.string.i3wm_config</string>
+            <string>constant.other.i3wm_config</string>
           </dict>
           <key>5</key>
           <dict>
             <key>name</key>
-            <string>constant.string.i3wm_config</string>
+            <string>constant.other.i3wm_config</string>
           </dict>
         </dict>
       </dict>
       <dict>
         <key>name</key>
-        <string>client_focused_inactive</string>
+        <string>client_focused2</string>
         <key>match</key>
-        <string>(client\.focused\_inactive)\s*(#\w{6})\s*(#\w{6})\s*(#\w{6})\s*(#\w{6})</string>
+        <string>(client\.focused)\s*(\$\w*)\s*(\$\w*)\s*(\$\w*)\s*(\$\w*)</string>
         <key>captures</key>
         <dict>
           <key>1</key>
@@ -434,28 +458,96 @@
           <key>2</key>
           <dict>
             <key>name</key>
-            <string>constant.string.i3wm_config</string>
+            <string>variable.other.i3wm_config</string>
           </dict>
           <key>3</key>
           <dict>
             <key>name</key>
-            <string>constant.string.i3wm_config</string>
+            <string>variable.other.i3wm_config</string>
           </dict>
           <key>4</key>
           <dict>
             <key>name</key>
-            <string>constant.string.i3wm_config</string>
+            <string>variable.other.i3wm_config</string>
           </dict>
           <key>5</key>
           <dict>
             <key>name</key>
-            <string>constant.string.i3wm_config</string>
+            <string>variable.other.i3wm_config</string>
+          </dict>
+        </dict>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>client_focused_inactive1</string>
+        <key>match</key>
+        <string>(client\.focused_inactive)\s*(#\w{6})\s*(#\w{6})\s*(#\w{6})\s*(#\w{6})</string>
+        <key>captures</key>
+        <dict>
+          <key>1</key>
+          <dict>
+            <key>name</key>
+            <string>keyword.control.i3wm_config</string>
+          </dict>
+          <key>2</key>
+          <dict>
+            <key>name</key>
+            <string>constant.other.i3wm_config</string>
+          </dict>
+          <key>3</key>
+          <dict>
+            <key>name</key>
+            <string>constant.other.i3wm_config</string>
+          </dict>
+          <key>4</key>
+          <dict>
+            <key>name</key>
+            <string>constant.other.i3wm_config</string>
+          </dict>
+          <key>5</key>
+          <dict>
+            <key>name</key>
+            <string>constant.other.i3wm_config</string>
+          </dict>
+        </dict>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>client_focused_inactive2</string>
+        <key>match</key>
+        <string>(client\.focused_inactive)\s*(\$\w*)\s*(\$\w*)\s*(\$\w*)\s*(\$\w*)</string>
+        <key>captures</key>
+        <dict>
+          <key>1</key>
+          <dict>
+            <key>name</key>
+            <string>keyword.control.i3wm_config</string>
+          </dict>
+          <key>2</key>
+          <dict>
+            <key>name</key>
+            <string>variable.other.i3wm_config</string>
+          </dict>
+          <key>3</key>
+          <dict>
+            <key>name</key>
+            <string>variable.other.i3wm_config</string>
+          </dict>
+          <key>4</key>
+          <dict>
+            <key>name</key>
+            <string>variable.other.i3wm_config</string>
+          </dict>
+          <key>5</key>
+          <dict>
+            <key>name</key>
+            <string>variable.other.i3wm_config</string>
           </dict>
         </dict>
       </dict>
       <dict>
         <key>name</key>
-        <string>client_unfocused</string>
+        <string>client_unfocused1</string>
         <key>match</key>
         <string>(client\.unfocused)\s*(#\w{6})\s*(#\w{6})\s*(#\w{6})\s*(#\w{6})</string>
         <key>captures</key>
@@ -468,28 +560,62 @@
           <key>2</key>
           <dict>
             <key>name</key>
-            <string>constant.string.i3wm_config</string>
+            <string>constant.other.i3wm_config</string>
           </dict>
           <key>3</key>
           <dict>
             <key>name</key>
-            <string>constant.string.i3wm_config</string>
+            <string>constant.other.i3wm_config</string>
           </dict>
           <key>4</key>
           <dict>
             <key>name</key>
-            <string>constant.string.i3wm_config</string>
+            <string>constant.other.i3wm_config</string>
           </dict>
           <key>5</key>
           <dict>
             <key>name</key>
-            <string>constant.string.i3wm_config</string>
+            <string>constant.other.i3wm_config</string>
+          </dict>
+        </dict>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>client_unfocused2</string>
+        <key>match</key>
+        <string>(client\.unfocused)\s*(\$\w*)\s*(\$\w*)\s*(\$\w*)\s*(\$\w*)</string>
+        <key>captures</key>
+        <dict>
+          <key>1</key>
+          <dict>
+            <key>name</key>
+            <string>keyword.control.i3wm_config</string>
+          </dict>
+          <key>2</key>
+          <dict>
+            <key>name</key>
+            <string>variable.other.i3wm_config</string>
+          </dict>
+          <key>3</key>
+          <dict>
+            <key>name</key>
+            <string>variable.other.i3wm_config</string>
+          </dict>
+          <key>4</key>
+          <dict>
+            <key>name</key>
+            <string>variable.other.i3wm_config</string>
+          </dict>
+          <key>5</key>
+          <dict>
+            <key>name</key>
+            <string>variable.other.i3wm_config</string>
           </dict>
         </dict>
       </dict>
       <dict>
         <key>name</key>
-        <string>client_urgent</string>
+        <string>client_urgent1</string>
         <key>match</key>
         <string>(client\.urgent)\s*(#\w{6})\s*(#\w{6})\s*(#\w{6})\s*(#\w{6})</string>
         <key>captures</key>
@@ -502,22 +628,56 @@
           <key>2</key>
           <dict>
             <key>name</key>
-            <string>constant.string.i3wm_config</string>
+            <string>constant.other.i3wm_config</string>
           </dict>
           <key>3</key>
           <dict>
             <key>name</key>
-            <string>constant.string.i3wm_config</string>
+            <string>constant.other.i3wm_config</string>
           </dict>
           <key>4</key>
           <dict>
             <key>name</key>
-            <string>constant.string.i3wm_config</string>
+            <string>constant.other.i3wm_config</string>
           </dict>
           <key>5</key>
           <dict>
             <key>name</key>
-            <string>constant.string.i3wm_config</string>
+            <string>constant.other.i3wm_config</string>
+          </dict>
+        </dict>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>client_urgent2</string>
+        <key>match</key>
+        <string>(client\.urgent)\s*(\$\w*)\s*(\$\w*)\s*(\$\w*)\s*(\$\w*)</string>
+        <key>captures</key>
+        <dict>
+          <key>1</key>
+          <dict>
+            <key>name</key>
+            <string>keyword.control.i3wm_config</string>
+          </dict>
+          <key>2</key>
+          <dict>
+            <key>name</key>
+            <string>variable.other.i3wm_config</string>
+          </dict>
+          <key>3</key>
+          <dict>
+            <key>name</key>
+            <string>variable.other.i3wm_config</string>
+          </dict>
+          <key>4</key>
+          <dict>
+            <key>name</key>
+            <string>variable.other.i3wm_config</string>
+          </dict>
+          <key>5</key>
+          <dict>
+            <key>name</key>
+            <string>variable.other.i3wm_config</string>
           </dict>
         </dict>
       </dict>
@@ -900,7 +1060,7 @@
         <key>name</key>
         <string>background</string>
         <key>match</key>
-        <string>(background)\s*(#\w{6})</string>
+        <string>(background)\s*([#$\w]*)</string>
         <key>captures</key>
         <dict>
           <key>1</key>
@@ -917,7 +1077,7 @@
       </dict>
       <dict>
         <key>name</key>
-        <string>statusline</string>
+        <string>statusline1</string>
         <key>match</key>
         <string>(statusline)\s*(#\w{6})</string>
         <key>captures</key>
@@ -934,11 +1094,30 @@
           </dict>
         </dict>
       </dict>
+      <dict>
+        <key>name</key>
+        <string>statusline2</string>
+        <key>match</key>
+        <string>(statusline)\s*(\$\w*)</string>
+        <key>captures</key>
+        <dict>
+          <key>1</key>
+          <dict>
+            <key>name</key>
+            <string>keyword.control.i3wm_config</string>
+          </dict>
+          <key>2</key>
+          <dict>
+            <key>name</key>
+            <string>variable.other.i3wm_config</string>
+          </dict>
+        </dict>
+      </dict>
       <dict>
         <key>name</key>
         <string>separator</string>
         <key>match</key>
-        <string>(separator)\s*(#\w{6})</string>
+        <string>(separator)\s*([#$\w]*)</string>
         <key>captures</key>
         <dict>
           <key>1</key>
@@ -955,7 +1134,7 @@
       </dict>
       <dict>
         <key>name</key>
-        <string>focused_workspace</string>
+        <string>focused_workspace1</string>
         <key>match</key>
         <string>(focused_workspace)\s*(#\w{6})\s*(#\w{6})\s*(#\w{6})</string>
         <key>captures</key>
@@ -989,7 +1168,41 @@
       </dict>
       <dict>
         <key>name</key>
-        <string>active_workspace</string>
+        <string>focused_workspace2</string>
+        <key>match</key>
+        <string>(focused_workspace)\s*(\$\w*)\s*(\$\w*)\s*(\$\w*)</string>
+        <key>captures</key>
+        <dict>
+          <key>1</key>
+          <dict>
+            <key>name</key>
+            <string>keyword.control.i3wm_config</string>
+          </dict>
+          <key>2</key>
+          <dict>
+            <key>name</key>
+            <string>variable.other.i3wm_config</string>
+          </dict>
+          <key>3</key>
+          <dict>
+            <key>name</key>
+            <string>variable.other.i3wm_config</string>
+          </dict>
+          <key>4</key>
+          <dict>
+            <key>name</key>
+            <string>variable.other.i3wm_config</string>
+          </dict>
+          <key>5</key>
+          <dict>
+            <key>name</key>
+            <string>variable.other.i3wm_config</string>
+          </dict>
+        </dict>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>active_workspace1</string>
         <key>match</key>
         <string>(active_workspace)\s*(#\w{6})\s*(#\w{6})\s*(#\w{6})</string>
         <key>captures</key>
@@ -1023,9 +1236,43 @@
       </dict>
       <dict>
         <key>name</key>
-        <string>inactive_workspace</string>
+        <string>active_workspace2</string>
+        <key>match</key>
+        <string>(active_workspace)\s*(\$\w*)\s*(\$\w*)\s*(\$\w*)</string>
+        <key>captures</key>
+        <dict>
+          <key>1</key>
+          <dict>
+            <key>name</key>
+            <string>keyword.control.i3wm_config</string>
+          </dict>
+          <key>2</key>
+          <dict>
+            <key>name</key>
+            <string>variable.other.i3wm_config</string>
+          </dict>
+          <key>3</key>
+          <dict>
+            <key>name</key>
+            <string>variable.other.i3wm_config</string>
+          </dict>
+          <key>4</key>
+          <dict>
+            <key>name</key>
+            <string>variable.other.i3wm_config</string>
+          </dict>
+          <key>5</key>
+          <dict>
+            <key>name</key>
+            <string>variable.other.i3wm_config</string>
+          </dict>
+        </dict>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>inactive_workspace1</string>
         <key>match</key>
-        <string>(inactive_workspace)\s*(#\w{6})\s*(#\w{6})\s*(#\w{6})</string>
+        <string>(inactive_workspace)\s*([#\$\w]*)\s*([#\$\w]*)\s*([#\$\w]*)</string>
         <key>captures</key>
         <dict>
           <key>1</key>
@@ -1057,7 +1304,41 @@
       </dict>
       <dict>
         <key>name</key>
-        <string>urgent_workspace</string>
+        <string>inactive_workspace2</string>
+        <key>match</key>
+        <string>(inactive_workspace)\s*(\$\w*)\s*(\$\w*)\s*(\$\w*)</string>
+        <key>captures</key>
+        <dict>
+          <key>1</key>
+          <dict>
+            <key>name</key>
+            <string>keyword.control.i3wm_config</string>
+          </dict>
+          <key>2</key>
+          <dict>
+            <key>name</key>
+            <string>variable.other.i3wm_config</string>
+          </dict>
+          <key>3</key>
+          <dict>
+            <key>name</key>
+            <string>variable.other.i3wm_config</string>
+          </dict>
+          <key>4</key>
+          <dict>
+            <key>name</key>
+            <string>variable.other.i3wm_config</string>
+          </dict>
+          <key>5</key>
+          <dict>
+            <key>name</key>
+            <string>variable.other.i3wm_config</string>
+          </dict>
+        </dict>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>urgent_workspace1</string>
         <key>match</key>
         <string>(urgent_workspace)\s*(#\w{6})\s*(#\w{6})\s*(#\w{6})</string>
         <key>captures</key>
@@ -1089,6 +1370,40 @@
           </dict>
         </dict>
       </dict>
+      <dict>
+        <key>name</key>
+        <string>urgent_workspace2</string>
+        <key>match</key>
+        <string>(urgent_workspace)\s*(\$\w*)\s*(\$\w*)\s*(\$\w*)</string>
+        <key>captures</key>
+        <dict>
+          <key>1</key>
+          <dict>
+            <key>name</key>
+            <string>keyword.control.i3wm_config</string>
+          </dict>
+          <key>2</key>
+          <dict>
+            <key>name</key>
+            <string>variable.other.i3wm_config</string>
+          </dict>
+          <key>3</key>
+          <dict>
+            <key>name</key>
+            <string>variable.other.i3wm_config</string>
+          </dict>
+          <key>4</key>
+          <dict>
+            <key>name</key>
+            <string>variable.other.i3wm_config</string>
+          </dict>
+          <key>5</key>
+          <dict>
+            <key>name</key>
+            <string>variable.other.i3wm_config</string>
+          </dict>
+        </dict>
+      </dict>
       <dict>
         <key>name</key>
         <string>bindcode</string>
@@ -1450,7 +1765,7 @@
         <key>name</key>
         <string>move_workspace</string>
         <key>match</key>
-        <string>(move)\s*(workspace)\s*(next|prev|next_on_output|prev_on_output|back_and_forth|(?:\w)*|(?:\d*\s*\w*))</string>
+        <string>(move)\s*(workspace)\s*(next|prev|next_on_output|prev_on_output|back_and_forth|(?:\w)*|(?:\d*\s*\w*))(\$\w*){0,1}</string>
         <key>captures</key>
         <dict>
           <key>1</key>
@@ -1468,13 +1783,91 @@
             <key>name</key>
             <string>constant.language.i3wm_config</string>
           </dict>
+          <key>4</key>
+          <dict>
+            <key>name</key>
+            <string>variable.other.i3wm_config</string>
+          </dict>
+        </dict>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>move__window_or_container1</string>
+        <key>match</key>
+        <string>(move)\s*(window|container)\s*(to)?\s*(workspace)?\s*(\$\w*)</string>
+        <key>captures</key>
+        <dict>
+          <key>1</key>
+          <dict>
+            <key>name</key>
+            <string>keyword.control.i3wm_config</string>
+          </dict>
+          <key>2</key>
+          <dict>
+            <key>name</key>
+            <string>keyword.control.i3wm_config</string>
+          </dict>
+          <key>3</key>
+          <dict>
+            <key>name</key>
+            <string>keyword.control.i3wm_config</string>
+          </dict>
+          <key>4</key>
+          <dict>
+            <key>name</key>
+            <string>keyword.control.i3wm_config</string>
+          </dict>
+          <key>5</key>
+          <dict>
+            <key>name</key>
+            <string>variable.other.i3wm_config</string>
+          </dict>
+        </dict>
+      </dict>
+      <dict>
+        <key>name</key>
+        <string>move__window_or_container2</string>
+        <key>match</key>
+        <string>(move)\s*(window|container)\s*(to)?\s*(workspace)?\s*(\d*)\s*(\$?\w*)?</string>
+        <key>captures</key>
+        <dict>
+          <key>1</key>
+          <dict>
+            <key>name</key>
+            <string>keyword.control.i3wm_config</string>
+          </dict>
+          <key>2</key>
+          <dict>
+            <key>name</key>
+            <string>keyword.control.i3wm_config</string>
+          </dict>
+          <key>3</key>
+          <dict>
+            <key>name</key>
+            <string>keyword.control.i3wm_config</string>
+          </dict>
+          <key>4</key>
+          <dict>
+            <key>name</key>
+            <string>variable.other.i3wm_config</string>
+          </dict>
+          <key>5</key>
+          <dict>
+            <key>name</key>
+            <string>constant.numeric.i3wm_config</string>
+          </dict>
+          <key>6</key>
+          <dict>
+            <key>name</key>
+            <string>variable.other.i3wm_config</string>
+          </dict>
         </dict>
       </dict>
       <dict>
         <key>name</key>
-        <string>move__window_or_container</string>
+        <string>move__window_or_container3</string>
         <key>match</key>
-        <string>(move)\s*(window|container)\s*(to)?</string>
+        <string>(move)\s*(window|container)\s*(to)?\s*(workspace)\s*(prev|next|current)</string>
         <key>captures</key>
         <dict>
           <key>1</key>
@@ -1492,6 +1885,11 @@
             <key>name</key>
             <string>keyword.control.i3wm_config</string>
           </dict>
+          <key>4</key>
+          <dict>
+            <key>name</key>
+            <string>constant.language.i3wm_config</string>
+          </dict>
         </dict>
       </dict>
       <dict>