Merge pull request #73 from elixir-lang/failing-highlight-tests

Fix buggy syntax highlighting behavior involving "?"

Author: mattdeboard

elixir-mode.el

@@ -213,6 +213,16 @@
   "For use with operators."
   :group 'font-lock-faces)
 
+(defvar elixir-negation-face 'elixir-negation-face)
+(defface elixir-negation-face
+  '((((class color) (min-colors 88) (background light))
+     :foreground "#ff4500")
+    (((class color) (background dark))
+     (:foreground "#ff4500"))
+    (t nil))
+  "For use with escape characters."
+  :group 'font-lock-faces)
+
 (eval-when-compile
   (defconst elixir-rx-constituents
     `(
@@ -285,7 +295,7 @@
                      (one-or-more (any "a-z" "A-Z" "0-9" "_"))
                      (and "\"" (one-or-more (not (any "\""))) "\"")
                      (and "'" (one-or-more (not (any "'"))) "'"))))
-      (code-point . ,(rx "?" anything))))
+      (code-point . ,(rx "?" (zero-or-one anything)))))
 
   (defmacro elixir-rx (&rest sexps)
     (let ((rx-constituents (append elixir-rx-constituents rx-constituents)))
@@ -366,7 +376,11 @@
 
     ;; Atoms and singleton-like words like true/false/nil.
     (,(elixir-rx (group (or atoms bool-and-nil)))
-     1 font-lock-reference-face)))
+     1 font-lock-reference-face)
+
+    ;; Code points
+    (,(elixir-rx (group code-point))
+     1 elixir-negation-face)))
 
 (defun elixir-mode-cygwin-path (expanded-file-name)
   "Elixir mode get Cygwin absolute path name.
@@ -536,8 +550,6 @@ Argument END End of the region."
   (set (make-local-variable 'comment-use-syntax) t)
   (set (make-local-variable 'tab-width) elixir-basic-offset)
   (set (make-local-variable 'imenu-generic-expression) elixir-imenu-generic-expression)
-  (if (boundp 'syntax-propertize-function)
-      (set (make-local-variable 'syntax-propertize-function) 'elixir-syntax-propertize))
   (smie-setup elixir-smie-grammar 'verbose-elixir-smie-rules ; 'elixir-smie-rules
               :forward-token 'elixir-smie-forward-token
               :backward-token 'elixir-smie-backward-token))

elixir-smie.el

@@ -34,32 +34,6 @@
     table)
   "Elixir mode syntax table.")
 
-(defun elixir-syntax-propertize (start end)
-  (save-excursion
-    (goto-char start)
-    ;; The ? character on its own is supposed to escape whatever comes
-    ;; after it (including any escaped chars. Examples: ?\# and ?".
-    (while (search-forward "?" end t)
-      (let ((start (1- (point))))
-        (unless (or (= (char-syntax (char-before (- (point) 1))) ?w)
-                    (= (char-syntax (char-before (- (point) 1))) ?_))
-          (put-text-property (1- (point))
-                             (point)
-                             'syntax-table
-                             '(?|))
-          (when (= (char-after) ?\\)
-            (forward-char)
-            (put-text-property (1- (point))
-                               (point)
-                               'syntax-table
-                               '(?\s)))
-          (forward-char)
-          (put-text-property (1- (point))
-                             (point)
-                             'syntax-table
-                             '(?|))
-          (put-text-property start (point) 'font-lock-face 'font-lock-string-face))))))
-
 (defmacro elixir-smie-debug (message &rest format-args)
   `(progn
      (when elixir-smie-verbose-p

test/elixir-mode-font-tests.el

@@ -46,3 +46,29 @@ buffer."
    (should (eq (elixir-test-face-at 41) 'font-lock-type-face))
    (should (eq (elixir-test-face-at 52) 'font-lock-type-face))
    (should (eq (elixir-test-face-at 53) 'font-lock-type-face))))
+
+(ert-deftest elixir-mode-syntax-table/fontify-regex-with-quote ()
+  "https://github.com/elixir-lang/emacs-elixir/issues/23"
+  :tags '(fontification syntax-table)
+  :expected-result :failed
+  (elixir-test-with-temp-buffer
+      "~r/\"/
+x = 15"
+    (should (eq (elixir-test-face-at 7) '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"
+  :tags '(fontification syntax-table)
+  (elixir-test-with-temp-buffer
+      "~r/^matt: (?<ct>\d+)$/mg
+x = 15"
+    (should (eq (elixir-test-face-at 4) 'font-lock-string-face))
+    (should (eq (elixir-test-face-at 25) 'font-lock-variable-name-face))))
+
+(ert-deftest elixir-mode-syntax-table/fontify-regex-with-question/2 ()
+  "https://github.com/elixir-lang/emacs-elixir/issues/29"
+  :tags '(fontification syntax-table)
+  (elixir-test-with-temp-buffer
+      "a = \"\" <> \"?\"
+x = 15"
+    (should (eq (elixir-test-face-at 15) 'font-lock-variable-name-face))))