Merge remote-tracking branch 'johnisom/deindent-closing-braces'

40 files changed, 484 insertions, 0 deletions

diff --git a/test/indent/c-family/deindent-function-closing-brace/cmd b/test/indent/c-family/deindent-function-closing-brace/cmd
new file mode 100644
index 00000000..e3036a40
--- /dev/null
+++ b/test/indent/c-family/deindent-function-closing-brace/cmd
@@ -0,0 +1 @@
+c<ret>
diff --git a/test/indent/c-family/deindent-function-closing-brace/in b/test/indent/c-family/deindent-function-closing-brace/in
new file mode 100644
index 00000000..732f00da
--- /dev/null
+++ b/test/indent/c-family/deindent-function-closing-brace/in
@@ -0,0 +1,15 @@
+void foo(void) {%( )}
+
+void foo(void) {%( )
+}
+
+void foo(void) {%( )bar()}
+
+void foo(void) {%( )bar()
+}
+
+void foo(void) {
+    bar()%( )}
+
+    void foo(void) {
+                 bar()%( )}
diff --git a/test/indent/c-family/deindent-function-closing-brace/out b/test/indent/c-family/deindent-function-closing-brace/out
new file mode 100644
index 00000000..b507fbee
--- /dev/null
+++ b/test/indent/c-family/deindent-function-closing-brace/out
@@ -0,0 +1,21 @@
+void foo(void) {
+}
+
+void foo(void) {
+    
+}
+
+void foo(void) {
+    bar()}
+
+void foo(void) {
+    bar()
+}
+
+void foo(void) {
+    bar()
+}
+
+    void foo(void) {
+                 bar()
+    }
diff --git a/test/indent/c-family/deindent-function-closing-brace/rc b/test/indent/c-family/deindent-function-closing-brace/rc
new file mode 100644
index 00000000..2c2a7247
--- /dev/null
+++ b/test/indent/c-family/deindent-function-closing-brace/rc
@@ -0,0 +1,3 @@
+source "%val{runtime}/colors/default.kak"
+source "%val{runtime}/rc/filetype/c-family.kak"
+set buffer filetype cpp
diff --git a/test/indent/c-family/deindent-generic-closing-brace/cmd b/test/indent/c-family/deindent-generic-closing-brace/cmd
new file mode 100644
index 00000000..e3036a40
--- /dev/null
+++ b/test/indent/c-family/deindent-generic-closing-brace/cmd
@@ -0,0 +1 @@
+c<ret>
diff --git a/test/indent/c-family/deindent-generic-closing-brace/in b/test/indent/c-family/deindent-generic-closing-brace/in
new file mode 100644
index 00000000..d7e7a23d
--- /dev/null
+++ b/test/indent/c-family/deindent-generic-closing-brace/in
@@ -0,0 +1,31 @@
+{%( )}
+
+{%( )
+}
+
+{%( )bar()}
+
+{%( )bar()
+}
+
+{
+    bar()%( )}
+
+{(%( ))}
+
+{(%( )
+)}
+
+{(%( )foo())}
+
+{(%( )foo()
+)}
+
+{(
+    bar()%( ))}
+
+    {
+                   bar()%( )}
+
+    {(
+                   bar()%( ))}
diff --git a/test/indent/c-family/deindent-generic-closing-brace/out b/test/indent/c-family/deindent-generic-closing-brace/out
new file mode 100644
index 00000000..d00507c9
--- /dev/null
+++ b/test/indent/c-family/deindent-generic-closing-brace/out
@@ -0,0 +1,43 @@
+{
+}
+
+{
+    
+}
+
+{
+    bar()}
+
+{
+    bar()
+}
+
+{
+    bar()
+}
+
+{(
+)}
+
+{(
+    
+)}
+
+{(
+    foo())}
+
+{(
+    foo()
+)}
+
+{(
+    bar()
+)}
+
+    {
+                   bar()
+    }
+
+    {(
+                   bar()
+    )}
diff --git a/test/indent/c-family/deindent-generic-closing-brace/rc b/test/indent/c-family/deindent-generic-closing-brace/rc
new file mode 100644
index 00000000..2c2a7247
--- /dev/null
+++ b/test/indent/c-family/deindent-generic-closing-brace/rc
@@ -0,0 +1,3 @@
+source "%val{runtime}/colors/default.kak"
+source "%val{runtime}/rc/filetype/c-family.kak"
+set buffer filetype cpp
diff --git a/test/indent/c-family/deindent-if-closing-brace/cmd b/test/indent/c-family/deindent-if-closing-brace/cmd
new file mode 100644
index 00000000..e3036a40
--- /dev/null
+++ b/test/indent/c-family/deindent-if-closing-brace/cmd
@@ -0,0 +1 @@
+c<ret>
diff --git a/test/indent/c-family/deindent-if-closing-brace/in b/test/indent/c-family/deindent-if-closing-brace/in
new file mode 100644
index 00000000..5ac38a34
--- /dev/null
+++ b/test/indent/c-family/deindent-if-closing-brace/in
@@ -0,0 +1,15 @@
+if (1) {%( )}
+
+if (1) {%( )
+}
+
+if (1) {%( )bar()}
+
+if (1) {%( )bar()
+}
+
+if (1) {
+    bar()%( )}
+
+  if (1) {
+         bar()%( )}
diff --git a/test/indent/c-family/deindent-if-closing-brace/out b/test/indent/c-family/deindent-if-closing-brace/out
new file mode 100644
index 00000000..d46b84cf
--- /dev/null
+++ b/test/indent/c-family/deindent-if-closing-brace/out
@@ -0,0 +1,21 @@
+if (1) {
+}
+
+if (1) {
+    
+}
+
+if (1) {
+    bar()}
+
+if (1) {
+    bar()
+}
+
+if (1) {
+    bar()
+}
+
+  if (1) {
+         bar()
+  }
diff --git a/test/indent/c-family/deindent-if-closing-brace/rc b/test/indent/c-family/deindent-if-closing-brace/rc
new file mode 100644
index 00000000..2c2a7247
--- /dev/null
+++ b/test/indent/c-family/deindent-if-closing-brace/rc
@@ -0,0 +1,3 @@
+source "%val{runtime}/colors/default.kak"
+source "%val{runtime}/rc/filetype/c-family.kak"
+set buffer filetype cpp
diff --git a/test/indent/go/deindent-function-closing-brace/cmd b/test/indent/go/deindent-function-closing-brace/cmd
new file mode 100644
index 00000000..e3036a40
--- /dev/null
+++ b/test/indent/go/deindent-function-closing-brace/cmd
@@ -0,0 +1 @@
+c<ret>
diff --git a/test/indent/go/deindent-function-closing-brace/in b/test/indent/go/deindent-function-closing-brace/in
new file mode 100644
index 00000000..a30bf4c4
--- /dev/null
+++ b/test/indent/go/deindent-function-closing-brace/in
@@ -0,0 +1,15 @@
+func foo(x int) int {%( )}
+
+func foo(x int) int {%( )
+}
+
+func foo(x int) int {%( )bar()}
+
+func foo(x int) int {%( )bar()
+}
+
+func foo(x int) int {
+    bar()%( )}
+
+  func foo(x int) int {
+          bar()%( )}
diff --git a/test/indent/go/deindent-function-closing-brace/out b/test/indent/go/deindent-function-closing-brace/out
new file mode 100644
index 00000000..3a5e4869
--- /dev/null
+++ b/test/indent/go/deindent-function-closing-brace/out
@@ -0,0 +1,21 @@
+func foo(x int) int {
+}
+
+func foo(x int) int {
+    
+}
+
+func foo(x int) int {
+    bar()}
+
+func foo(x int) int {
+    bar()
+}
+
+func foo(x int) int {
+    bar()
+}
+
+  func foo(x int) int {
+          bar()
+  }
diff --git a/test/indent/go/deindent-function-closing-brace/rc b/test/indent/go/deindent-function-closing-brace/rc
new file mode 100644
index 00000000..1b0b0035
--- /dev/null
+++ b/test/indent/go/deindent-function-closing-brace/rc
@@ -0,0 +1,3 @@
+source "%val{runtime}/colors/default.kak"
+source "%val{runtime}/rc/filetype/go.kak"
+set buffer filetype go
diff --git a/test/indent/go/deindent-generic-closing-brace/cmd b/test/indent/go/deindent-generic-closing-brace/cmd
new file mode 100644
index 00000000..e3036a40
--- /dev/null
+++ b/test/indent/go/deindent-generic-closing-brace/cmd
@@ -0,0 +1 @@
+c<ret>
diff --git a/test/indent/go/deindent-generic-closing-brace/in b/test/indent/go/deindent-generic-closing-brace/in
new file mode 100644
index 00000000..5a31c18f
--- /dev/null
+++ b/test/indent/go/deindent-generic-closing-brace/in
@@ -0,0 +1,31 @@
+{%( )}
+
+{%( )
+}
+
+{%( )bar()}
+
+{%( )bar()
+}
+
+{
+    bar()%( )}
+
+  {
+          bar()%( )}
+
+{(%( ))}
+
+{(%( )
+)}
+
+{(%( )foo())}
+
+{(%( )foo()
+)}
+
+{(
+    bar()%( ))}
+
+      {(
+  bar()%( ))}
diff --git a/test/indent/go/deindent-generic-closing-brace/out b/test/indent/go/deindent-generic-closing-brace/out
new file mode 100644
index 00000000..cfd6db40
--- /dev/null
+++ b/test/indent/go/deindent-generic-closing-brace/out
@@ -0,0 +1,43 @@
+{
+}
+
+{
+    
+}
+
+{
+    bar()}
+
+{
+    bar()
+}
+
+{
+    bar()
+}
+
+  {
+          bar()
+  }
+
+{(
+)}
+
+{(
+    
+)}
+
+{(
+    foo())}
+
+{(
+    foo()
+)}
+
+{(
+    bar()
+)}
+
+      {(
+  bar()
+      )}
diff --git a/test/indent/go/deindent-generic-closing-brace/rc b/test/indent/go/deindent-generic-closing-brace/rc
new file mode 100644
index 00000000..1b0b0035
--- /dev/null
+++ b/test/indent/go/deindent-generic-closing-brace/rc
@@ -0,0 +1,3 @@
+source "%val{runtime}/colors/default.kak"
+source "%val{runtime}/rc/filetype/go.kak"
+set buffer filetype go
diff --git a/test/indent/go/deindent-if-closing-brace/cmd b/test/indent/go/deindent-if-closing-brace/cmd
new file mode 100644
index 00000000..e3036a40
--- /dev/null
+++ b/test/indent/go/deindent-if-closing-brace/cmd
@@ -0,0 +1 @@
+c<ret>
diff --git a/test/indent/go/deindent-if-closing-brace/in b/test/indent/go/deindent-if-closing-brace/in
new file mode 100644
index 00000000..d5f59de0
--- /dev/null
+++ b/test/indent/go/deindent-if-closing-brace/in
@@ -0,0 +1,12 @@
+if true {%( )}
+
+if true {%( )
+}
+
+if true {%( )bar()}
+
+if true {%( )bar()
+}
+
+if true {
+    bar()%( )}
diff --git a/test/indent/go/deindent-if-closing-brace/out b/test/indent/go/deindent-if-closing-brace/out
new file mode 100644
index 00000000..2c63bd1c
--- /dev/null
+++ b/test/indent/go/deindent-if-closing-brace/out
@@ -0,0 +1,17 @@
+if true {
+}
+
+if true {
+    
+}
+
+if true {
+    bar()}
+
+if true {
+    bar()
+}
+
+if true {
+    bar()
+}
diff --git a/test/indent/go/deindent-if-closing-brace/rc b/test/indent/go/deindent-if-closing-brace/rc
new file mode 100644
index 00000000..1b0b0035
--- /dev/null
+++ b/test/indent/go/deindent-if-closing-brace/rc
@@ -0,0 +1,3 @@
+source "%val{runtime}/colors/default.kak"
+source "%val{runtime}/rc/filetype/go.kak"
+set buffer filetype go
diff --git a/test/indent/javascript/deindent-complex-brace-structure/cmd b/test/indent/javascript/deindent-complex-brace-structure/cmd
new file mode 100644
index 00000000..f9bfe77d
--- /dev/null
+++ b/test/indent/javascript/deindent-complex-brace-structure/cmd
@@ -0,0 +1 @@
+c<ret><esc>Oif (true) {}<esc>hi<ret><esc>Oconsole.log();<esc>hhi<ret><esc>O{},<ret>{},<esc>hh<a-C>i<ret><esc>1<space>Ofoo: { bar: 1 },<esc>jjobaz: { bam: 2 },<esc>
diff --git a/test/indent/javascript/deindent-complex-brace-structure/in b/test/indent/javascript/deindent-complex-brace-structure/in
new file mode 100644
index 00000000..0f89c5b3
--- /dev/null
+++ b/test/indent/javascript/deindent-complex-brace-structure/in
@@ -0,0 +1 @@
+for (let i = 1; i < 5; ++i) {%(  )}
diff --git a/test/indent/javascript/deindent-complex-brace-structure/out b/test/indent/javascript/deindent-complex-brace-structure/out
new file mode 100644
index 00000000..1d675934
--- /dev/null
+++ b/test/indent/javascript/deindent-complex-brace-structure/out
@@ -0,0 +1,12 @@
+for (let i = 1; i < 5; ++i) {
+    if (true) {
+        console.log(
+            {
+                foo: { bar: 1 },
+            },
+            {
+                baz: { bam: 2 },
+            },
+        );
+    }
+}
diff --git a/test/indent/javascript/deindent-complex-brace-structure/rc b/test/indent/javascript/deindent-complex-brace-structure/rc
new file mode 100644
index 00000000..c975d253
--- /dev/null
+++ b/test/indent/javascript/deindent-complex-brace-structure/rc
@@ -0,0 +1,3 @@
+source "%val{runtime}/colors/default.kak"
+source "%val{runtime}/rc/filetype/javascript.kak"
+set buffer filetype javascript
diff --git a/test/indent/rust/deindent-function-closing-brace/cmd b/test/indent/rust/deindent-function-closing-brace/cmd
new file mode 100644
index 00000000..e3036a40
--- /dev/null
+++ b/test/indent/rust/deindent-function-closing-brace/cmd
@@ -0,0 +1 @@
+c<ret>
diff --git a/test/indent/rust/deindent-function-closing-brace/in b/test/indent/rust/deindent-function-closing-brace/in
new file mode 100644
index 00000000..ab5cc032
--- /dev/null
+++ b/test/indent/rust/deindent-function-closing-brace/in
@@ -0,0 +1,15 @@
+fn foo() -> i32 {%( )}
+
+fn foo() -> i32 {%( )
+}
+
+fn foo() -> i32 {%( )bar()}
+
+fn foo() -> i32 {%( )bar()
+}
+
+fn foo() -> i32 {
+    bar()%( )}
+
+  fn foo() -> i32 {
+           bar()%( )}
diff --git a/test/indent/rust/deindent-function-closing-brace/out b/test/indent/rust/deindent-function-closing-brace/out
new file mode 100644
index 00000000..2c58c554
--- /dev/null
+++ b/test/indent/rust/deindent-function-closing-brace/out
@@ -0,0 +1,21 @@
+fn foo() -> i32 {
+}
+
+fn foo() -> i32 {
+    
+}
+
+fn foo() -> i32 {
+    bar()}
+
+fn foo() -> i32 {
+    bar()
+}
+
+fn foo() -> i32 {
+    bar()
+}
+
+  fn foo() -> i32 {
+           bar()
+  }
diff --git a/test/indent/rust/deindent-function-closing-brace/rc b/test/indent/rust/deindent-function-closing-brace/rc
new file mode 100644
index 00000000..64064c25
--- /dev/null
+++ b/test/indent/rust/deindent-function-closing-brace/rc
@@ -0,0 +1,3 @@
+source "%val{runtime}/colors/default.kak"
+source "%val{runtime}/rc/filetype/rust.kak"
+set buffer filetype rust
diff --git a/test/indent/rust/deindent-generic-closing-brace/cmd b/test/indent/rust/deindent-generic-closing-brace/cmd
new file mode 100644
index 00000000..e3036a40
--- /dev/null
+++ b/test/indent/rust/deindent-generic-closing-brace/cmd
@@ -0,0 +1 @@
+c<ret>
diff --git a/test/indent/rust/deindent-generic-closing-brace/in b/test/indent/rust/deindent-generic-closing-brace/in
new file mode 100644
index 00000000..21109831
--- /dev/null
+++ b/test/indent/rust/deindent-generic-closing-brace/in
@@ -0,0 +1,31 @@
+{%( )}
+
+{%( )
+}
+
+{%( )bar()}
+
+{%( )bar()
+}
+
+{
+    bar()%( )}
+
+      {
+   bar()%( )}
+
+{(%( ))}
+
+{(%( )
+)}
+
+{(%( )foo())}
+
+{(%( )foo()
+)}
+
+{(
+    bar()%( ))}
+
+   {(
+                        bar()%( ))}
diff --git a/test/indent/rust/deindent-generic-closing-brace/out b/test/indent/rust/deindent-generic-closing-brace/out
new file mode 100644
index 00000000..c8615372
--- /dev/null
+++ b/test/indent/rust/deindent-generic-closing-brace/out
@@ -0,0 +1,43 @@
+{
+}
+
+{
+    
+}
+
+{
+    bar()}
+
+{
+    bar()
+}
+
+{
+    bar()
+}
+
+      {
+   bar()
+      }
+
+{(
+)}
+
+{(
+    
+)}
+
+{(
+    foo())}
+
+{(
+    foo()
+)}
+
+{(
+    bar()
+)}
+
+   {(
+                        bar()
+   )}
diff --git a/test/indent/rust/deindent-generic-closing-brace/rc b/test/indent/rust/deindent-generic-closing-brace/rc
new file mode 100644
index 00000000..64064c25
--- /dev/null
+++ b/test/indent/rust/deindent-generic-closing-brace/rc
@@ -0,0 +1,3 @@
+source "%val{runtime}/colors/default.kak"
+source "%val{runtime}/rc/filetype/rust.kak"
+set buffer filetype rust
diff --git a/test/indent/rust/deindent-if-closing-brace/cmd b/test/indent/rust/deindent-if-closing-brace/cmd
new file mode 100644
index 00000000..e3036a40
--- /dev/null
+++ b/test/indent/rust/deindent-if-closing-brace/cmd
@@ -0,0 +1 @@
+c<ret>
diff --git a/test/indent/rust/deindent-if-closing-brace/in b/test/indent/rust/deindent-if-closing-brace/in
new file mode 100644
index 00000000..f26c5e62
--- /dev/null
+++ b/test/indent/rust/deindent-if-closing-brace/in
@@ -0,0 +1,15 @@
+if true {%( )}
+
+if true {%( )
+}
+
+if true {%( )bar()}
+
+if true {%( )bar()
+}
+
+if true {
+    bar()%( )}
+
+  if true {
+            bar()%( )}
diff --git a/test/indent/rust/deindent-if-closing-brace/out b/test/indent/rust/deindent-if-closing-brace/out
new file mode 100644
index 00000000..1276abbe
--- /dev/null
+++ b/test/indent/rust/deindent-if-closing-brace/out
@@ -0,0 +1,21 @@
+if true {
+}
+
+if true {
+    
+}
+
+if true {
+    bar()}
+
+if true {
+    bar()
+}
+
+if true {
+    bar()
+}
+
+  if true {
+            bar()
+  }
diff --git a/test/indent/rust/deindent-if-closing-brace/rc b/test/indent/rust/deindent-if-closing-brace/rc
new file mode 100644
index 00000000..64064c25
--- /dev/null
+++ b/test/indent/rust/deindent-if-closing-brace/rc
@@ -0,0 +1,3 @@
+source "%val{runtime}/colors/default.kak"
+source "%val{runtime}/rc/filetype/rust.kak"
+set buffer filetype rust