Skip to content

Commit 78ecad5

committed

Indent with- macros and functions like cljfmt default

1 parent 161ea5f commit 78ecad5Copy full SHA for 78ecad5

File tree

3 files changed

+8

-10

lines changed

clj/resources/indent-test-cases/with
- in.clj
- out.clj
indent
- clojure.vim

3 files changed

+8

-10

lines changed

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

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,10 +2,10 @@`
`2`	`2`	`(slurp f))`
`3`	`3`
`4`	`4`	`(with-meta obj`
`5`		`- {:foo 1})`
	`5`	`+ {:foo 1})`
`6`	`6`
`7`	`7`	`(with-meta`
`8`		`- obj`
	`8`	`+ obj`
`9`	`9`	`{:foo 1})`
`10`	`10`
`11`	`11`	`(with-out-str`

`‎clj/resources/indent-test-cases/with/out.clj‎`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,14 +2,14 @@`
`2`	`2`	`(slurp f))`
`3`	`3`
`4`	`4`	`(with-meta obj`
`5`		`- {:foo 1})`
	`5`	`+ {:foo 1})`
`6`	`6`
`7`	`7`	`(with-meta`
`8`		`- obj`
`9`		`- {:foo 1})`
	`8`	`+ obj`
	`9`	`+ {:foo 1})`
`10`	`10`
`11`	`11`	`(with-out-str`
`12`		`- ())`
	`12`	`+ ())`
`13`	`13`
`14`	`14`	`(with-in-str`
`15`		`- ())`
	`15`	`+ ())`

`‎indent/clojure.vim‎`

Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -35,9 +35,7 @@ endfunction`
`35`	`35`
`36`	`36`	`call s:SConf('clojure_indent_style', 'standard')`
`37`	`37`	`call s:SConf('clojure_indent_multiline_strings', 'standard')`
`38`		`-call s:SConf('clojure_fuzzy_indent_patterns', [`
`39`		`-\ '\m^def', '\m^let', '\m^with-\%(meta\\|in-str\\|out-str\\|loading-context\)\@!'`
`40`		`-\ ])`
	`38`	`+call s:SConf('clojure_fuzzy_indent_patterns', ['\m^def', '\m^let', '\m^with-'])`
`41`	`39`
`42`	`40`	`" FIXME: reader conditional indentation?`
`43`	`41`

0 commit comments

Comments

(0)