From d594b32ca2002823b09bb8d84e0b6937e6fe6846 Mon Sep 17 00:00:00 2001 From: Syohei YOSHIDA Date: Wed, 6 Apr 2016 23:09:32 +0900 Subject: [PATCH 1/2] Add test of '::' in binaries --- test/elixir-mode-font-test.el | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/test/elixir-mode-font-test.el b/test/elixir-mode-font-test.el index d2624468..f70254ce 100644 --- a/test/elixir-mode-font-test.el +++ b/test/elixir-mode-font-test.el @@ -222,7 +222,12 @@ true_false_nil (should (eq (elixir-test-face-at 3) 'elixir-atom-face)) (should (eq (elixir-test-face-at 4) 'elixir-atom-face)) (should (eq (elixir-test-face-at 9) 'elixir-atom-face)) - (should (eq (elixir-test-face-at 10) 'elixir-atom-face)))) + (should (eq (elixir-test-face-at 10) 'elixir-atom-face))) + + ;; https://github.com/elixir-lang/emacs-elixir/issues/320 + (elixir-test-with-temp-buffer + "<>" + (should-not (eq (elixir-test-face-at 3) 'elixir-atom-face)))) (ert-deftest elixir-mode-syntax-table/fontify-interpolation () :tags '(fontification interpolation syntax-table) From 498bebec14d7a4d13f2aeac16d865a2f6ca191a7 Mon Sep 17 00:00:00 2001 From: Syohei YOSHIDA Date: Wed, 6 Apr 2016 23:10:18 +0900 Subject: [PATCH 2/2] Fix invalid highlighting '::' in binaries Append space to map key regex because keyword argument must be followed by space. --- elixir-mode.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/elixir-mode.el b/elixir-mode.el index d51a4d01..641561ea 100644 --- a/elixir-mode.el +++ b/elixir-mode.el @@ -424,7 +424,7 @@ is used to limit the scan." 1 elixir-ignored-var-face) ;; Map keys - (,(elixir-rx (group (and (one-or-more identifiers) ":"))) + (,(elixir-rx (group (and (one-or-more identifiers) ":")) space) 1 elixir-atom-face) ;; Pseudovariables