bug#63109: 30.0.50; [PATCH] Add bitstring indentation and navigation for elixir-ts-mode

bug#63109: 30.0.50; [PATCH] Add bitstring indentation and navigation for elixir-ts-mode

[Wilhelm Kirschbaum]

[-- Attachment #1: Type: text/plain, Size: 78 bytes --]


This patch properly handles bitstrings in Elixir when using
elixir-ts-mode.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Add bitstring indentation and navigation for elixir-ts-mode --]
[-- Type: text/x-patch, Size: 2538 bytes --]

From d84228a3b482b064aa0f0e915562d950cc45ef0d Mon Sep 17 00:00:00 2001
From: Wilhelm H Kirschbaum <wkirschbaum@gmail.com>
Date: Thu, 27 Apr 2023 11:39:39 +0200
Subject: [PATCH] Add bitstring indentation and navigation for elixir-ts-mode

* lisp/progmodes/elixir-ts-mode.el
(elixir-ts--sexp-regexp): Add bistring.
(elixir-ts--indent-rules): Handle bitstring indentation.

* test/lisp/progmodes/elixir-ts-mode-resources/indent.erts:
Add test case.
---
 lisp/progmodes/elixir-ts-mode.el                     |  4 +++-
 .../progmodes/elixir-ts-mode-resources/indent.erts   | 12 ++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/lisp/progmodes/elixir-ts-mode.el b/lisp/progmodes/elixir-ts-mode.el
index c58854c41c3..47f53043af3 100644
--- a/lisp/progmodes/elixir-ts-mode.el
+++ b/lisp/progmodes/elixir-ts-mode.el
@@ -89,7 +89,7 @@ elixir-ts--sexp-regexp
   (rx bol
       (or "call" "stab_clause" "binary_operator" "list" "tuple" "map" "pair"
           "sigil" "string" "atom" "alias" "arguments" "identifier"
-          "boolean" "quoted_content")
+          "boolean" "quoted_content" "bitstring")
       eol))
 
 (defconst elixir-ts--test-definition-keywords
@@ -231,6 +231,7 @@ elixir-ts--indent-rules
        ((node-is "^]$") ,'elixir-ts--parent-expression-start 0)
        ((node-is "^}$") ,'elixir-ts--parent-expression-start 0)
        ((node-is "^)$") ,'elixir-ts--parent-expression-start 0)
+       ((node-is "^>>$") ,'elixir-ts--parent-expression-start 0)
        ((node-is "^else_block$") grand-parent 0)
        ((node-is "^catch_block$") grand-parent 0)
        ((node-is "^rescue_block$") grand-parent 0)
@@ -250,6 +251,7 @@ elixir-ts--indent-rules
         ,'elixir-ts--argument-indent-anchor
         ,'elixir-ts--argument-indent-offset)
        ((parent-is "^pair$") parent ,offset)
+       ((parent-is "^bitstring$") parent ,offset)
        ((parent-is "^map_content$") parent-bol 0)
        ((parent-is "^map$") ,'elixir-ts--parent-expression-start ,offset)
        ((node-is "^stab_clause$") parent-bol ,offset)
diff --git a/test/lisp/progmodes/elixir-ts-mode-resources/indent.erts b/test/lisp/progmodes/elixir-ts-mode-resources/indent.erts
index 9ad604e5198..4eb6e768b96 100644
--- a/test/lisp/progmodes/elixir-ts-mode-resources/indent.erts
+++ b/test/lisp/progmodes/elixir-ts-mode-resources/indent.erts
@@ -79,6 +79,18 @@ def foo() do
 end
 =-=-=
 
+Name: Bitstring mulitline
+
+=-=
+<<12, 22,
+22, 32
+    >>
+=-=
+<<12, 22,
+  22, 32
+>>
+=-=-=
+
 Name: Block assignments
 
 =-=
-- 
2.40.1


[-- Attachment #3: Type: text/plain, Size: 9 bytes --]


Wilhelm

bug#63109: 30.0.50; [PATCH] Add bitstring indentation and navigation for elixir-ts-mode

[Eli Zaretskii]

> From: Wilhelm Kirschbaum <wkirschbaum@gmail.com>
> Date: Thu, 27 Apr 2023 11:52:28 +0200
> 
> This patch properly handles bitstrings in Elixir when using
> elixir-ts-mode.

Thanks, installed and closing the bug.