Merge pull request #189 from elixir-lang/add-test-case-180

Modify indentation rules for one-line functions ending with bitstrings.

Author: tonini

elixir-smie.el

@@ -272,6 +272,13 @@
      (cond
       ((smie-rule-sibling-p) nil)
       ((smie-rule-hanging-p) (smie-rule-parent elixir-smie-indent-basic))
+      ((and (not (smie-rule-sibling-p))
+            (not (smie-rule-hanging-p))
+            (smie-rule-parent-p "do:"))
+       ;; Dedent the line after an OP if it's after a "do:" token, which implies
+       ;; a one-line function.
+       (smie-rule-parent
+        (- (+ elixir-smie-indent-basic elixir-smie-indent-basic))))
       (t (smie-rule-parent))))
     (`(:before . "MATCH-STATEMENT-DELIMITER")
      (cond

test/elixir-mode-indentation-test.el

@@ -965,6 +965,22 @@ def foo(test) do
   run(test_case)
 end")
 
+;; Will pass when #180 is resolved.
+(elixir-def-indentation-test indent-after-bitstring/1
+                             (:tags '(indentation))
+"
+defmodule X do
+  def a, do: <<1 :: size(8)>>
+      def b, do: <<2 :: size(8)>>
+          def c, do: <<3 :: size(8)>>
+end"
+"
+defmodule X do
+  def a, do: <<1 :: size(8)>>
+  def b, do: <<2 :: size(8)>>
+  def c, do: <<3 :: size(8)>>
+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