Merge pull request #162 from elixir-lang/indent-binary-sequence-inside-match-block

Indent binary sequence inside match block

Author: tonini

CHANGELOG.md

@@ -5,7 +5,8 @@
 ### Enhancements
 
   * [Indentation] Indent listing inside square brackets. (#160)
-  * [Indentation] Ident correct after a binary sequence `<<1,2,3,4>>`.
+  * [Indentation] Indent of binary sequence inside match block
+  * [Indentation] Indent 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)
 

elixir-smie.el

@@ -264,6 +264,10 @@
 
 (defun elixir-smie-rules (kind token)
   (pcase (cons kind token)
+    (`(:before . "OP")
+     (when (and (not (smie-rule-hanging-p))
+                (smie-rule-prev-p "OP"))
+       -2))
     (`(:after . "OP")
      (cond
       ((smie-rule-sibling-p) nil)

test/elixir-mode-indentation-test.el

@@ -869,7 +869,7 @@ defmodule ExampleTest do
 end")
 
 (elixir-def-indentation-test indent-binary-sequence-inside-match-block/2
-			     (:expected-result :failed :tags '(indentation))
+			     (:tags '(indentation))
 "
 case asd do
 <<c1::5, c2::5, c3::5, c4::5, c5::5, c6::5, c7::2>> ->