Merge pull request #99 from elixir-lang/tokenize-whitespace-eol

Tokenize trailing whitespace properly. Fixes #97

Author: mattdeboard

elixir-smie.el

@@ -80,6 +80,10 @@
                 ">=" "<" ">" "&&" "||" "<>" "++" "--" "//"
                 "/>" "=~" "|>" "->")))
 
+(defvar elixir-smie--spaces-til-eol-regexp
+  (rx (and (1+ space) eol))
+  "Regex representing one or more whitespace characters concluding with eol.")
+
 (defvar elixir-smie-indent-basic 2)
 
 (defmacro elixir-smie-debug (message &rest format-args)
@@ -94,6 +98,11 @@
 
 (defun elixir-smie-forward-token ()
   (cond
+   ;; If there is nothing but whitespace between the last token and eol, emit
+   ;; a semicolon.
+   ((looking-at elixir-smie--spaces-til-eol-regexp)
+    (goto-char (match-end 0))
+    ";")
    ((and (looking-at "[\n#]") (elixir-smie--implicit-semi-p))
     (if (eolp) (forward-char 1) (forward-comment 1))
     ";")

test/elixir-mode-indentation-tests.el

@@ -514,3 +514,33 @@ end"
 def foo do #comment
   :bar
 end")
+
+(elixir-def-indentation-test indent-after-require-Record
+    ()
+  ;; Mind the significant whitespace after `Record' in each case. There should
+  ;; be two spaces after `Record', otherwise this test is meaningless.
+  "
+defmodule RSS do
+require Record  
+
+def zip(list1, list2) when length(list1) == length(list2) do
+x = 1
+end
+end"
+  "
+defmodule RSS do
+  require Record  
+
+  def zip(list1, list2) when length(list1) == length(list2) do
+    x = 1
+  end
+end")
+
+;; We don't want automatic whitespace cleanup here because of the significant
+;; whitespace after `Record' above. By setting `whitespace-action' to nil,
+;; `whitespace-mode' won't automatically clean up trailing whitespace (in my
+;; config, anyway).
+
+;;; Local Variables:
+;;; whitespace-action: nil
+;;; End: