Merge pull request #234 from elixir-lang/dont-highlight-lhs-as-variable

tonini · tonini · commit 68a7503a485f · 2015-08-05T07:52:30.000+02:00
don't highlights LHS as a variable in `==` case fixes #225
diff --git a/elixir-mode.el b/elixir-mode.el
@@ -374,8 +374,8 @@ is used to limit the scan."
     ;; Variable definitions
     (,(elixir-rx (group identifiers)
                  (zero-or-more space)
-                 "="
-                 (or (zero-or-more space)
+                 (repeat 1 "=")
+                 (or (or sigils identifiers space)
                      (one-or-more "\n")))
      1 font-lock-variable-name-face)
 
diff --git a/test/elixir-mode-font-test.el b/test/elixir-mode-font-test.el
@@ -77,7 +77,7 @@ match=~r/foo/"
   (elixir-test-with-temp-buffer
       "~r/\"/
 x = 15"
-    (should (eq (elixir-test-face-at 7) 'font-lock-variable-name-face))))
+    (should (eq (elixir-test-face-at 8) 'font-lock-variable-name-face))))
 
 (ert-deftest elixir-mode-syntax-table/fontify-regex-with-question/1 ()
   "https://github.com/elixir-lang/emacs-elixir/issues/36"
@@ -176,7 +176,6 @@ end"
   (elixir-test-with-temp-buffer
       "\"#{1 + 2} is 3.\""
     (should (eq (elixir-test-face-at 1) 'font-lock-string-face))
-    ;; (should (eq (elixir-test-face-at 3) 'font-lock-variable-name-face))
     (should (eq (elixir-test-face-at 11) 'font-lock-string-face))))
 
 (ert-deftest elixir-mode-syntax-table/fontify-continuation-lines-assignment ()
@@ -186,6 +185,12 @@ end"
 some_expr"
    (should (eq (elixir-test-face-at 1) 'font-lock-variable-name-face))))
 
+(ert-deftest elixir-mode-syntax-table/dont-fontify-equal-match ()
+  :tags '(fontification syntax-table)
+  (elixir-test-with-temp-buffer
+   "this == that"
+   (should-not (eq (elixir-test-face-at 2) 'font-lock-variable-name-face))))
+
 (ert-deftest elixir-mode-syntax-table/fontify-triple-quoted-string ()
   :tags '(fontification syntax-table)
   (elixir-test-with-temp-buffer
