Skip to content

Better handling of namespaced maps + bugfixes for clojure-ts-align #94

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 12, 2025
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
- [#91](https://github.com/clojure-emacs/clojure-ts-mode/pull/91): Introduce `clojure-ts-cycle-keyword-string`.
- [#92](https://github.com/clojure-emacs/clojure-ts-mode/pull/92): Add commands to convert between collections types.
- [#93](https://github.com/clojure-emacs/clojure-ts-mode/pull/93): Introduce `clojure-ts-add-arity`.
- Fix an issue where `clojure-ts-align` would hang when called within an
expression containing ignored forms.

## 0.3.0 (2025-04-15)

Expand Down
3 changes: 2 additions & 1 deletion clojure-ts-mode.el
Original file line number Diff line number Diff line change
Expand Up @@ -1505,7 +1505,8 @@ function literal."
"var_quoting_lit" "sym_val_lit" "evaling_lit"
"tagged_or_ctor_lit" "splicing_read_cond_lit"
"derefing_lit" "quoting_lit" "syn_quoting_lit"
"unquote_splicing_lit" "unquoting_lit")
"unquote_splicing_lit" "unquoting_lit"
"dis_expr")
"A regular expression that matches nodes that can be treated as s-expressions.")

(defconst clojure-ts--list-nodes
Expand Down
10 changes: 9 additions & 1 deletion test/clojure-ts-mode-indentation-test.el
Original file line number Diff line number Diff line change
Expand Up @@ -596,4 +596,12 @@ b |20])"
:a (let [a 1
aa (+ a 1)]
aa); comment
:aa 2)"))
:aa 2)")

(when-aligning-it "should work correctly when there are ignored forms"
"{:map \"with\"
:some #_\"ignored\" \"form\"}"

"{:map \"with\"
:multiple \"ignored\"
#_#_:forms \"foo\"}"))
7 changes: 7 additions & 0 deletions test/samples/align.clj
Original file line number Diff line number Diff line change
Expand Up @@ -55,3 +55,10 @@
aa (+ a 1)]
aa); comment
:aa 2)

{:map "with"
:some #_"ignored" "form"}

{:map "with"
:multiple "ignored"
#_#_:forms "foo"}