Merge pull request #108 from sviridov/comment-start-skip

Author: mattdeboard

elixir-mode.el

@@ -641,6 +641,7 @@ Argument END End of the region."
        '(elixir-font-lock-keywords))
   (set (make-local-variable 'comment-start) "# ")
   (set (make-local-variable 'comment-end) "")
+  (set (make-local-variable 'comment-start-skip) "#+ *")
   (set (make-local-variable 'comment-use-syntax) t)
   (set (make-local-variable 'tab-width) elixir-basic-offset)
   (set (make-local-variable 'syntax-propertize-function)

elixir-smie.el

@@ -245,6 +245,7 @@
   nil nil nil nil
   (set (make-local-variable 'comment-start) "# ")
   (set (make-local-variable 'comment-end) "")
+  (set (make-local-variable 'comment-start-skip) "#+ *")
   (smie-setup elixir-smie-grammar 'elixir-smie-rules
               :forward-token 'elixir-smie-forward-token
               :backward-token 'elixir-smie-backward-token))

test/elixir-mode-indentation-tests.el

@@ -233,6 +233,18 @@ has_something(x) &&
   has_something(z)
 ")
 
+(elixir-def-indentation-test indent-continuation-lines-with-comments/3 ()
+  "
+def str(s, sub, start_pos, end_pos) when is_binary(s) and is_binary(sub) do # and start_pos <= end_pos do
+                                                                             len = end_pos-start_pos
+end
+"
+  "
+def str(s, sub, start_pos, end_pos) when is_binary(s) and is_binary(sub) do # and start_pos <= end_pos do
+  len = end_pos-start_pos
+end
+")
+
 (elixir-def-indentation-test indent-last-commented-line
     ()
   "