Fix indentation of with-* macros

Author: axvr

clj/resources/indent-test-cases/reader-conditional/in.clj renamed to clj/resources/indent-test-cases/reader_conditionals/in.clj

@@ -0,0 +1,15 @@
+(with-open [f (io/file)]
+           (slurp f))
+
+(with-meta obj
+  {:foo 1})
+
+(with-meta
+  obj
+  {:foo 1})
+
+(with-out-str
+())
+
+(with-in-str
+      ())

clj/resources/indent-test-cases/reader-conditional/out.clj renamed to clj/resources/indent-test-cases/reader_conditionals/out.clj

@@ -0,0 +1,15 @@
+(with-open [f (io/file)]
+  (slurp f))
+
+(with-meta obj
+           {:foo 1})
+
+(with-meta
+ obj
+ {:foo 1})
+
+(with-out-str
+ ())
+
+(with-in-str
+ ())

clj/resources/indent-test-cases/with/in.clj

@@ -26,32 +26,32 @@ setlocal indentkeys=!,o,O
 
 if !exists('g:clojure_fuzzy_indent_patterns')
 	let g:clojure_fuzzy_indent_patterns = [
-	\   "\v^with-%(meta|out-str|loading-context)\@!",
-	\   "^def",
-	\   "^let"
+	\   '^with-\%(meta\|out-str\|loading-context\)\@!',
+	\   '^def',
+	\   '^let'
 	\ ]
 endif
 
 if !exists('g:clojure_indent_rules')
 	" Defaults copied from: https://github.com/clojure-emacs/clojure-mode/blob/0e62583b5198f71856e4d7b80e1099789d47f2ed/clojure-mode.el#L1800-L1875
 	let g:clojure_indent_rules = {
-	\   "ns": 1,
-	\   "fn": 1, "def": 1, "defn": 1, "bound-fn": 1,
-	\   "if": 1, "if-not": 1, "if-some": 1, "if-let": 1,
-	\   "when": 1, "when-not": 1, "when-some": 1, "when-let": 1, "when-first": 1,
-	\   "case": 1, "cond": 0, "cond->": 1, "cond->>": 1, "condp": 2,
-	\   "while": 1, "loop": 1, "for": 1, "doseq": 1, "dotimes": 1,
-	\   "do": 0, "doto": 1, "comment": 0, "as->": 2,
-	\   "delay": 0, "future": 0, "locking": 1,
-	\   "fdef": 1,
-	\   "extend": 1,
-	\   "try": 0, "catch": 2, "finally": 0,
-	\   "let": 1, "binding": 1,
-	\   "defmethod": 1,
-	\   "this-as": 1,
-	\   "deftest": 1, "testing": 1, "use-fixtures": 1, "are": 2,
-	\   "alt!": 0, "alt!!": 0, "go": 0, "go-loop": 1, "thread": 0,
-	\   "run": 1, "run*": 1, "fresh": 1
+	\   'ns': 1,
+	\   'fn': 1, 'def': 1, 'defn': 1, 'bound-fn': 1,
+	\   'if': 1, 'if-not': 1, 'if-some': 1, 'if-let': 1,
+	\   'when': 1, 'when-not': 1, 'when-some': 1, 'when-let': 1, 'when-first': 1,
+	\   'case': 1, 'cond': 0, 'cond->': 1, 'cond->>': 1, 'condp': 2,
+	\   'while': 1, 'loop': 1, 'for': 1, 'doseq': 1, 'dotimes': 1,
+	\   'do': 0, 'doto': 1, 'comment': 0, 'as->': 2,
+	\   'delay': 0, 'future': 0, 'locking': 1,
+	\   'fdef': 1,
+	\   'extend': 1,
+	\   'try': 0, 'catch': 2, 'finally': 0,
+	\   'let': 1, 'binding': 1,
+	\   'defmethod': 1,
+	\   'this-as': 1,
+	\   'deftest': 1, 'testing': 1, 'use-fixtures': 1, 'are': 2,
+	\   'alt!': 0, 'alt!!': 0, 'go': 0, 'go-loop': 1, 'thread': 0,
+	\   'run': 1, 'run*': 1, 'fresh': 1
 	\ }
 
 "   (letfn '(1 ((:defn)) nil))