Skip to content

Commit 7a9eb39

Browse files
committed
Fix vector keys not working with alias-map
1 parent 35a1412 commit 7a9eb39

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

cljfmt/src/cljfmt/core.cljc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@
319319
(when-some [sym (form-symbol zloc)]
320320
(let [full-sym (fully-qualified-symbol sym context)
321321
sym-name (name sym)
322-
sym-ns (or (namespace sym) (some-> full-sym namespace))]
322+
sym-ns (or (some-> full-sym namespace) (namespace sym))]
323323
(cond
324324
(vector? key) (parts-match-vector-key? sym-ns sym-name key)
325325
(pattern? key) (re-find key sym-name)

cljfmt/test/cljfmt/core_test.cljc

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -901,7 +901,22 @@
901901
(is (reformats-to? ["(example.core/foo bar" "baz)"]
902902
["(example.core/foo bar"
903903
" baz)"]
904-
{:indents '{[example.core bar] [[:inner 0]]}}))))
904+
{:indents '{[example.core bar] [[:inner 0]]}}))
905+
(is (reformats-to? ["(ec/foo bar" "baz)"]
906+
["(ec/foo bar" " baz)"]
907+
{:indents '{[example.core #".*"] [[:inner 0]]}
908+
:alias-map '{ec example.core}}))
909+
#?(:clj
910+
(is (reformats-to?
911+
["(ns example.demo"
912+
"(:require [example.core :as ec]))"
913+
"(ec/foo bar"
914+
"baz)"]
915+
["(ns example.demo"
916+
" (:require [example.core :as ec]))"
917+
"(ec/foo bar"
918+
" baz)"]
919+
{:extra-indents '{[example.core #".*"] [[:inner 0]]}})))))
905920

906921
(deftest test-remove-multiple-non-indenting-spaces
907922
(let [opts {:remove-multiple-non-indenting-spaces? true}]

0 commit comments

Comments
 (0)