4 files changed, 36 insertions, 2 deletions
diff --git a/tests/indent/dart/class.dart b/tests/indent/dart/class.dart
index 0402cc677..0ad21114f 100644
--- a/tests/indent/dart/class.dart
+++ b/tests/indent/dart/class.dart
@@ -1,4 +1,8 @@
 void main() {
 }
+
 class Test {
+  List<String> get progress => [
+        '0',
+      ];
 }
diff --git a/tests/indent/dart/class_function_argument.dart b/tests/indent/dart/class_function_argument.dart
new file mode 100644
index 000000000..30db12f96
--- /dev/null
+++ b/tests/indent/dart/class_function_argument.dart
@@ -0,0 +1,13 @@
+class Something {
+  final int number;
+  final Function(int) write;
+
+  Something(this.number, this.write);
+}
+
+void test() {
+  Something(
+    1,
+    (int number) {
+  );
+}
diff --git a/tests/indent/dart/switch.dart b/tests/indent/dart/switch.dart
new file mode 100644
index 000000000..fae070cda
--- /dev/null
+++ b/tests/indent/dart/switch.dart
@@ -0,0 +1,9 @@
+void test() {
+  final a = 69;
+  switch (a) {
+    case 69:
+      break;
+    case 420:
+    default:
+  }
+}
diff --git a/tests/indent/dart_spec.lua b/tests/indent/dart_spec.lua
index 651730cfa..143b792b2 100644
--- a/tests/indent/dart_spec.lua
+++ b/tests/indent/dart_spec.lua
@@ -12,14 +12,19 @@ describe("indent Lua:", function()
   describe("whole file:", function()
     run:whole_file(".", {
       expected_failures = {
-        "./multiple_arguments.dart", -- expected failure issue #4637
+        "./multiple_arguments.dart",
+        "./class.dart",
+        "./switch.dart",
+        "./class_function_argument.dart",
       },
     })
   end)
 end)
 
 describe("new line:", function()
-  run:new_line("class.dart", { on_line = 2, text = "var x;", indent = 0 })
+  run:new_line("class.dart", { on_line = 4, text = "int five;", indent = 2 })
+  run:new_line("class.dart", { on_line = 6, text = "'100'", indent = 8 }, "expected failure", XFAIL)
+  run:new_line("class.dart", { on_line = 7, text = "int five = 5", indent = 2 }, "expected failure", XFAIL)
   run:new_line("try.dart", { on_line = 2, text = "var x;", indent = 4 })
   run:new_line("multiple_arguments.dart", { on_line = 10, text = "var x;", indent = 4 })
   run:new_line(
@@ -28,4 +33,7 @@ describe("new line:", function()
     "expected failure issue #4637",
     XFAIL
   )
+  run:new_line("switch.dart", { on_line = 3, text = "case 7:", indent = 4 })
+  run:new_line("switch.dart", { on_line = 6, text = "break;", indent = 6 }, "expected failure", XFAIL)
+  run:new_line("class_function_argument.dart", { on_line = 11, text = "}", indent = 4 })
 end)