From ee1b641d13e82ec5021f3a784c7d5a5e9df8f1dc Mon Sep 17 00:00:00 2001
From: groenroos <oskari@groenroos.fi>
Date: Wed, 8 Sep 2021 20:32:35 +0100
Subject: [PATCH 1/2] Fix variables beginning with a keyword and dash

---
 lib/lexer.js                    |  2 +-
 test/cases/regression.2422.css  | 13 +++++++++++++
 test/cases/regression.2422.styl | 18 ++++++++++++++++++
 3 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 test/cases/regression.2422.css
 create mode 100644 test/cases/regression.2422.styl

diff --git a/lib/lexer.js b/lib/lexer.js
index 86c52b782..a3cb658de 100644
--- a/lib/lexer.js
+++ b/lib/lexer.js
@@ -448,7 +448,7 @@ Lexer.prototype = {
   keyword: function() {
     var captures
       , tok;
-    if (captures = /^(return|if|else|unless|for|in)\b[ \t]*/.exec(this.str)) {
+    if (captures = /^(return|if|else|unless|for|in)\b(?!-)[ \t]*/.exec(this.str)) {
       var keyword = captures[1];
       this.skip(captures);
       if (this.isPartOfSelector()) {
diff --git a/test/cases/regression.2422.css b/test/cases/regression.2422.css
new file mode 100644
index 000000000..48e5b0ea6
--- /dev/null
+++ b/test/cases/regression.2422.css
@@ -0,0 +1,13 @@
+.foobar {
+  border-radius: 4px;
+  columns: 5;
+  foo: 1;
+  foo: 2;
+  foo: 3;
+}
+@media (min-width: 600px) {
+  .foobar {
+    columns: 1;
+    font-weight: 700;
+  }
+}
\ No newline at end of file
diff --git a/test/cases/regression.2422.styl b/test/cases/regression.2422.styl
new file mode 100644
index 000000000..85adf208b
--- /dev/null
+++ b/test/cases/regression.2422.styl
@@ -0,0 +1,18 @@
+forsooth = 4px
+for-something = 5
+if_bar = 700
+
+for-tablet-portrait-up()
+  @media (min-width: 600px)
+    {block}
+
+.foobar
+  border-radius: forsooth
+  columns: for-something
+
+  for --num in 1 2 3
+    foo: --num
+
+  +for-tablet-portrait-up()
+    columns: 1
+    font-weight: if_bar

From 91b77012ae7e60a856accdce80114a1af711d173 Mon Sep 17 00:00:00 2001
From: groenroos <oskari@groenroos.fi>
Date: Thu, 9 Sep 2021 10:54:52 +0100
Subject: [PATCH 2/2] Add trailing space

---
 test/cases/regression.2422.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/cases/regression.2422.css b/test/cases/regression.2422.css
index 48e5b0ea6..0be86a401 100644
--- a/test/cases/regression.2422.css
+++ b/test/cases/regression.2422.css
@@ -10,4 +10,4 @@
     columns: 1;
     font-weight: 700;
   }
-}
\ No newline at end of file
+}