tests/indent: improve Rust tests

16 files changed, 217 insertions, 13 deletions

diff --git a/lua/tests/indent/rust/array.rs b/lua/tests/indent/rust/array.rs
new file mode 100644
index 000000000..68344e0ee
--- /dev/null
+++ b/lua/tests/indent/rust/array.rs
@@ -0,0 +1,11 @@
+const X: [i32; 2] = [
+    1,
+    2,
+];
+
+fn foo() {
+    let _x = [
+        1,
+        2,
+    ];
+}
diff --git a/lua/tests/indent/rust/basic.rs b/lua/tests/indent/rust/basic.rs
deleted file mode 100644
index 54d38cf68..000000000
--- a/lua/tests/indent/rust/basic.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-fn foo(x: i32) {
-    if (x > 10) {
-        return 10;
-    } else {
-        return x;
-    }
-}
diff --git a/lua/tests/indent/rust/comment.rs b/lua/tests/indent/rust/comment.rs
new file mode 100644
index 000000000..334793dfa
--- /dev/null
+++ b/lua/tests/indent/rust/comment.rs
@@ -0,0 +1,7 @@
+/// Function foo
+///
+/// Description of
+/// function foo.
+fn foo(x: i32, y: i32) -> i32 {
+    x + y
+}
diff --git a/lua/tests/indent/rust/cond.rs b/lua/tests/indent/rust/cond.rs
new file mode 100644
index 000000000..eb96a48f7
--- /dev/null
+++ b/lua/tests/indent/rust/cond.rs
@@ -0,0 +1,17 @@
+fn foo(mut x: i32) -> i32 {
+    if x > 10 {
+        return 10;
+    } else if x == 10 {
+        return 9;
+    } else {
+        x += 10;
+    }
+
+    if x < 0 {
+        if x == -1 {
+            return 0;
+        }
+    }
+
+    0
+}
diff --git a/lua/tests/indent/rust/enum.rs b/lua/tests/indent/rust/enum.rs
new file mode 100644
index 000000000..996f07d21
--- /dev/null
+++ b/lua/tests/indent/rust/enum.rs
@@ -0,0 +1,11 @@
+enum Foo {
+    X,
+    Y(
+        char,
+        char,
+    ),
+    Z {
+        x: u32,
+        y: u32,
+    },
+}
diff --git a/lua/tests/indent/rust/func.rs b/lua/tests/indent/rust/func.rs
new file mode 100644
index 000000000..4c9d40b26
--- /dev/null
+++ b/lua/tests/indent/rust/func.rs
@@ -0,0 +1,10 @@
+fn foo() -> i32 {
+    1
+}
+
+fn foo(
+    x: i32,
+    y: i32
+) -> i32 {
+    x + y
+}
diff --git a/lua/tests/indent/rust/impl.rs b/lua/tests/indent/rust/impl.rs
new file mode 100644
index 000000000..2525c2e5b
--- /dev/null
+++ b/lua/tests/indent/rust/impl.rs
@@ -0,0 +1,7 @@
+struct Foo;
+
+impl Foo {
+    fn foo() -> i32 {
+        1
+    }
+}
diff --git a/lua/tests/indent/rust/loop.rs b/lua/tests/indent/rust/loop.rs
new file mode 100644
index 000000000..eb845bc0f
--- /dev/null
+++ b/lua/tests/indent/rust/loop.rs
@@ -0,0 +1,19 @@
+fn foo(mut x: i32) {
+    while x > 0 {
+        x -= 1;
+    }
+
+    for i in 0..3 {
+        x += 1;
+    }
+
+    loop {
+        x += 1;
+
+        if x < 100 {
+            continue;
+        }
+
+        break;
+    }
+}
diff --git a/lua/tests/indent/rust/macro.rs b/lua/tests/indent/rust/macro.rs
new file mode 100644
index 000000000..608e157fc
--- /dev/null
+++ b/lua/tests/indent/rust/macro.rs
@@ -0,0 +1,13 @@
+macro_rules! foo {
+    ($a:ident, $b:ident, $c:ident) => {
+        struct $a;
+        struct $b;
+    },
+    ($a:ident) => {
+        struct $a;
+    },
+}
+
+foo! {
+    A
+}
diff --git a/lua/tests/indent/rust/match.rs b/lua/tests/indent/rust/match.rs
new file mode 100644
index 000000000..438ba6d5f
--- /dev/null
+++ b/lua/tests/indent/rust/match.rs
@@ -0,0 +1,11 @@
+fn foo(x: i32) -> i32 {
+    match x {
+        0 => 1,
+        1 => {
+            2
+        },
+        2 | 3 => {
+            4
+        }
+    }
+}
diff --git a/lua/tests/indent/rust/mod.rs b/lua/tests/indent/rust/mod.rs
new file mode 100644
index 000000000..cc7f2c8e6
--- /dev/null
+++ b/lua/tests/indent/rust/mod.rs
@@ -0,0 +1,8 @@
+mod foo {
+    const X: i32 = 1;
+
+    mod bar {
+
+        const Y: i32 = 1;
+    }
+}
diff --git a/lua/tests/indent/rust/string.rs b/lua/tests/indent/rust/string.rs
new file mode 100644
index 000000000..4d60663dd
--- /dev/null
+++ b/lua/tests/indent/rust/string.rs
@@ -0,0 +1,12 @@
+fn foo() {
+    let a = "hello
+world";
+
+    let b = "hello\
+        world";
+
+    let c = r#"
+        hello
+        world
+    "#;
+}
diff --git a/lua/tests/indent/rust/struct.rs b/lua/tests/indent/rust/struct.rs
new file mode 100644
index 000000000..f3828977f
--- /dev/null
+++ b/lua/tests/indent/rust/struct.rs
@@ -0,0 +1,4 @@
+struct Foo {
+    x: u32,
+    y: u32,
+}
diff --git a/lua/tests/indent/rust/trait.rs b/lua/tests/indent/rust/trait.rs
new file mode 100644
index 000000000..fb5fc7ea8
--- /dev/null
+++ b/lua/tests/indent/rust/trait.rs
@@ -0,0 +1,11 @@
+struct Foo;
+
+trait Bar {
+    fn bar();
+}
+
+impl Bar for Foo {
+    fn bar() {
+
+    }
+}
diff --git a/lua/tests/indent/rust/where.rs b/lua/tests/indent/rust/where.rs
new file mode 100644
index 000000000..08c1b196d
--- /dev/null
+++ b/lua/tests/indent/rust/where.rs
@@ -0,0 +1,21 @@
+fn foo<T>(t: T) -> i32
+where
+    T: Debug,
+{
+    1
+}
+
+fn foo<T>(t: T) -> i32 where
+    T: Debug,
+{
+    1
+}
+
+struct Foo<T>(T);
+
+impl<T> Write for Foo<T>
+where
+    T: Debug,
+{
+
+}
diff --git a/lua/tests/indent/rust_spec.lua b/lua/tests/indent/rust_spec.lua
index ad9e948c4..120b6771b 100644
--- a/lua/tests/indent/rust_spec.lua
+++ b/lua/tests/indent/rust_spec.lua
@@ -1,18 +1,67 @@
 local whole_file = require('nvim-treesitter.test_utils').indent_whole_file
+local new_line = require('nvim-treesitter.test_utils').indent_new_line
 local scan_dir = require('plenary.scandir').scan_dir
 
+local opts = {
+  tabstop = 4,
+  shiftwidth = 4,
+  softtabstop = 0,
+  expandtab = true,
+}
+
 describe('indent Rust:', function()
   describe('whole file:', function()
     local files = scan_dir('lua/tests/indent/rust');
     for _, file in ipairs(files) do
       it(vim.fn.fnamemodify(file, ':t'), function()
-        whole_file(file, {
-          tabstop = 4,
-          shiftwidth = 4,
-          softtabstop = 0,
-          expandtab = true,
-        })
+        whole_file(file, opts)
+      end)
+    end
+  end)
+
+  describe('new line:', function()
+    local run = function(file, spec, title)
+      title = title and title or tostring(spec.on_line)
+      it(string.format('%s[%s]', file, title), function()
+        new_line('lua/tests/indent/rust/' .. file, spec, opts)
       end)
     end
+
+    run('array.rs', { on_line = 2, text = '0,', indent = 4 })
+    run('array.rs', { on_line = 8, text = '0,', indent = 8 })
+    run('comment.rs', { on_line = 3, text = 'a', indent = '/// ' })
+    run('cond.rs', { on_line = 11, text = 'x += 1;', indent = 12 })
+    run('cond.rs', { on_line = 2, text = 'x += 1;', indent = 8 })
+    run('cond.rs', { on_line = 4, text = 'x += 1;', indent = 8 })
+    run('cond.rs', { on_line = 6, text = 'x += 1;', indent = 8 })
+    run('enum.rs', { on_line = 2, text = 'Q,', indent = 4 })
+    run('enum.rs', { on_line = 4, text = 'i32,', indent = 8 })
+    run('enum.rs', { on_line = 8, text = 'z: u32,', indent = 8 })
+    run('func.rs', { on_line = 1, text = 'let _x = 1;', indent = 4 })
+    run('func.rs', { on_line = 6, text = 'z: i32,', indent = 4 })
+    run('impl.rs', { on_line = 3, text = 'const FOO: u32 = 1;', indent = 4 })
+    run('impl.rs', { on_line = 4, text = 'let _x = 1;', indent = 8 })
+    run('loop.rs', { on_line = 10, text = 'x += 1;', indent = 8 })
+    run('loop.rs', { on_line = 2, text = 'x += 1;', indent = 8 })
+    run('loop.rs', { on_line = 6, text = 'x += 1;', indent = 8 })
+    run('macro.rs', { on_line = 1, text = '() => {},', indent = 4 })
+    run('macro.rs', { on_line = 12, text = 'B C', indent = 4 })
+    run('macro.rs', { on_line = 2, text = 'struct $c;', indent = 8 })
+    run('match.rs', { on_line = 2, text = '-1 => -1,', indent = 8 })
+    run('match.rs', { on_line = 7, text = 'let y = 1;', indent = 12 })
+    run('mod.rs', { on_line = 1, text = 'const Z: i32 = 1;', indent = 4 })
+    run('mod.rs', { on_line = 2, text = 'const Z: i32 = 1;', indent = 4 })
+    run('mod.rs', { on_line = 6, text = 'const Z: i32 = 1;', indent = 8 })
+    run('string.rs', { on_line = 2, text = 'brave new', indent = 0 })
+    run('string.rs', { on_line = 5, text = 'brave new \\', indent = 8 })
+    run('string.rs', { on_line = 9, text = 'brave new \\', indent = 8 })
+    run('struct.rs', { on_line = 1, text = 'z: i32,', indent = 4 })
+    run('struct.rs', { on_line = 2, text = 'z: i32,', indent = 4 })
+    run('trait.rs', { on_line = 4, text = 'fn baz();', indent = 4 })
+    run('trait.rs', { on_line = 7, text = 'fn baz();', indent = 4 })
+    run('trait.rs', { on_line = 8, text = '()', indent = 8 })
+    run('where.rs', { on_line = 17, text = 'T: Debug,', indent = 4 })
+    run('where.rs', { on_line = 2, text = 'T: Debug,', indent = 4 })
+    run('where.rs', { on_line = 9, text = 'T: Debug,', indent = 4 })
   end)
 end)