Merge pull request #156 from elixir-lang/indent-after-binary-sequence

Indent correct after binary sequence

Author: tonini

CHANGELOG.md

@@ -4,7 +4,8 @@
 
 ### Enhancements
 
-  * [Indentation] indent correct after oneline `def ... do:` function
+  * [Indentation] Ident correct after a binary sequence `<<1,2,3,4>>`.
+  * [Indentation] Indent correct after oneline `def ... do:` function
   * [Indentation] Correct behavior after last line in buffer. (#145)
 
 ## v2.1.1 - 2014/12/24

elixir-smie.el

@@ -144,6 +144,9 @@
   (rx (or "<<<" ">>>" "^^^" "~~~" "&&&" "|||" "===" "!==" "==" "!=" "<="
 	  "=" ">=" "<" ">" "&&" "||" "<>" "++" "--" "//" "/>" "=~" "|>")))
 
+(defvar elixir-smie--binary-sequence-regexp
+  (rx (or "<<" ">>")))
+
 (defvar elixir-smie--block-operator-regexp
   (rx "->" (0+ nonl)))
 
@@ -241,6 +244,9 @@
      ((looking-back elixir-smie--block-operator-regexp (- (point) 3) t)
       (goto-char (match-beginning 0))
       "->")
+     ((looking-back elixir-smie--binary-sequence-regexp (- (point) 3) t)
+      (goto-char (match-beginning 0))
+      "OP")
      ((looking-back elixir-smie--operator-regexp (- (point) 3) t)
       (goto-char (match-beginning 0))
       "OP")

test/elixir-mode-indentation-test.el

@@ -850,6 +850,71 @@ defmodule Greeter do
   end
 end")
 
+(elixir-def-indentation-test indent-binary-sequence
+			     (:tags '(indentation))
+"
+defmodule ExampleTest do
+     test \"the truth\" do
+       assert <<1,2>> == <<1,2>>
+assert 1 + 1 == 2
+  end
+end"
+
+"
+defmodule ExampleTest do
+  test \"the truth\" do
+    assert <<1,2>> == <<1,2>>
+    assert 1 + 1 == 2
+  end
+end")
+
+(elixir-def-indentation-test indent-binary-sequence-inside-match-block/2
+			     (:expected-result :failed :tags '(indentation))
+"
+case asd do
+<<c1::5, c2::5, c3::5, c4::5, c5::5, c6::5, c7::2>> ->
+<<main::binary,
+enc.(c1)::8, enc.(c2)::8, enc.(c3)::8, enc.(c4)::8,
+enc.(c5)::8, enc.(c6)::8, enc.(bsl(c7, 3))::8, ?=>>
+<<c1::5, c2::5, c3::5, c4::5, c5::4>> ->
+<<main::binary,
+enc.(c1)::8, enc.(c2)::8, enc.(c3)::8, enc.(c4)::8,
+enc.(bsl(c5, 1))::8, ?=,  ?=, ?=>>
+<<c1::5, c2::5, c3::5, c4::1>> ->
+<<main::binary,
+enc.(c1)::8, enc.(c2)::8,  enc.(c3)::8, enc.(bsl(c4, 4))::8,
+?=, ?=,  ?=, ?=>>
+<<c1::5, c2::3>> ->
+<<main::binary,
+enc.(c1)::8, enc.(bsl(c2, 2))::8, ?=, ?=,
+?=, ?=, ?=, ?=>>
+<<>> ->
+main
+end"
+
+"
+case asd do
+  <<c1::5, c2::5, c3::5, c4::5, c5::5, c6::5, c7::2>> ->
+    <<main::binary,
+    enc.(c1)::8, enc.(c2)::8, enc.(c3)::8, enc.(c4)::8,
+    enc.(c5)::8, enc.(c6)::8, enc.(bsl(c7, 3))::8, ?=>>
+  <<c1::5, c2::5, c3::5, c4::5, c5::4>> ->
+    <<main::binary,
+    enc.(c1)::8, enc.(c2)::8, enc.(c3)::8, enc.(c4)::8,
+    enc.(bsl(c5, 1))::8, ?=,  ?=, ?=>>
+  <<c1::5, c2::5, c3::5, c4::1>> ->
+    <<main::binary,
+    enc.(c1)::8, enc.(c2)::8,  enc.(c3)::8, enc.(bsl(c4, 4))::8,
+    ?=, ?=,  ?=, ?=>>
+  <<c1::5, c2::3>> ->
+    <<main::binary,
+    enc.(c1)::8, enc.(bsl(c2, 2))::8, ?=, ?=,
+    ?=, ?=, ?=, ?=>>
+  <<>> ->
+    main
+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