migrate-config: mode foo → mode "foo" (+test) (Thanks cradle)

diff --git a/i3-migrate-config-to-v4.pl b/i3-migrate-config-to-v4.pl
index 0d1d018350b69d426f59e4f9d00b75b40df79201..99e58635e2f0c0500485c2e1fad1cf193068ec70 100755 (executable)
--- a/i3-migrate-config-to-v4.pl
+++ b/i3-migrate-config-to-v4.pl
@@ -179,7 +179,6 @@ sub convert_command {
 
     my @unchanged_cmds = qw(
         exec
-        mode
         mark
         kill
         restart
@@ -277,6 +276,12 @@ sub convert_command {
         return;
     }
 
+    if ($command =~ /^mode/) {
+        my ($parameters) = ($command =~ /^mode (.*)/);
+        print qq|$statement $key mode "$parameters"\n|;
+        return;
+    }
+
     # the parameters of the resize command have changed
     if ($command =~ /^resize/) {
         # OLD: resize <left|right|top|bottom> [+|-]<pixels>\n")

diff --git a/testcases/t/71-config-migrate.t b/testcases/t/71-config-migrate.t
index c467a4b410896f36b96f666ab36db5c6e738c41c..ba83a6a1538d377b3a71195c03ea699475cff6ad 100644 (file)
--- a/testcases/t/71-config-migrate.t
+++ b/testcases/t/71-config-migrate.t
@@ -155,7 +155,7 @@ ok(line_exists($output, qr|^bindsym Mod1\+s stack-limit cols 2$|), 'stack-limit
 ok(line_exists($output, qr|^bindsym Mod1\+s stack-limit rows 3$|), 'stack-limit unchanged');
 ok(line_exists($output, qr|^bindcode Mod1\+c exec /usr/bin/urxvt$|), 'bind changed to bindcode');
 ok(line_exists($output, qr|^mode "asdf" {$|), 'mode asdf unchanged');
-ok(line_exists($output, qr|^bindcode 36 mode default$|), 'mode default unchanged');
+ok(line_exists($output, qr|^bindcode 36 mode \"default\"$|), 'mode default unchanged');
 ok(line_exists($output, qr|^}$|), 'closing mode bracket still there');
 
 #####################################################################
@@ -335,4 +335,11 @@ ok(line_exists($output, qr|i3bar|), 'i3bar added');
 $output = migrate_config('workspace_bar no');
 ok(!line_exists($output, qr|i3bar|), 'no i3bar added');
 
+#####################################################################
+# check whether the mode command gets quotes
+#####################################################################
+
+$output = migrate_config('bindsym Mod1+m mode foobar');
+ok(line_exists($output, qr|^bindsym Mod1\+m mode "foobar"|), 'mode got quotes');
+
 done_testing();