Fix to pass additional args from the Flutter test template (#7261) (#8836)

Fix to pass additional args from the Flutter test template
(#7261)

---

- [x] I’ve reviewed the contributor guide and applied the relevant
portions to this PR.

<details>
  <summary>Contribution guidelines:</summary><br>

- See our [contributor
guide]([https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md](https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md)
for general expectations for PRs.
- Larger or significant changes should be discussed in an issue before
creating a PR.
- Dart contributions to our repos should follow the [Dart style
guide](https://dart.dev/guides/language/effective-dart) and use `dart
format`.
- Java and Kotlin contributions should strive to follow Java and Kotlin
best practices
([discussion](#8098)).
</details>

Author: dkandalov

AUTHORS

@@ -25,3 +25,4 @@ Eli Albert <crasowas@gmail.com>
 Mohamed El Sayed <devblooming@tutanota.com>
 Edwin Ludik <edwin.ludik@gmail.com>
 Japnit Singh <truejswalia@gmail.com>
+Dmitry Kandalov <dmitry.kandalov@gmail.com>

src/io/flutter/run/test/FlutterTestConfigProducer.java

@@ -64,23 +64,21 @@ protected boolean setupConfigurationFromContext(@NotNull TestConfig config,
     return setupForDartFile(config, context, file);
   }
 
-  private boolean setupForSingleTest(TestConfig config, ConfigurationContext context, DartFile file, String testName, boolean hasVariant) {
+  private boolean setupForSingleTest(@NotNull TestConfig config, ConfigurationContext context, DartFile file, String testName, boolean hasVariant) {
     final VirtualFile testFile = verifyFlutterTestFile(config, context, file);
     if (testFile == null) return false;
 
-    config.setFields(TestFields.forTestName(testName, testFile.getPath()).useRegexp(hasVariant));
+    setTestFields(config, TestFields.forTestName(testName, testFile.getPath()).useRegexp(hasVariant));
     config.setGeneratedName();
-
     return true;
   }
 
-  private boolean setupForDartFile(TestConfig config, ConfigurationContext context, DartFile file) {
+  private boolean setupForDartFile(@NotNull TestConfig config, ConfigurationContext context, DartFile file) {
     final VirtualFile testFile = verifyFlutterTestFile(config, context, file);
     if (testFile == null) return false;
 
-    config.setFields(TestFields.forFile(testFile.getPath()));
+    setTestFields(config, TestFields.forFile(testFile.getPath()));
     config.setGeneratedName();
-
     return true;
   }
 
@@ -91,17 +89,22 @@ private VirtualFile verifyFlutterTestFile(TestConfig config, ConfigurationContex
     return FlutterUtils.isInTestDir(file) ? candidate : null;
   }
 
-  private boolean setupForDirectory(TestConfig config, PsiDirectory dir) {
+  private boolean setupForDirectory(@NotNull TestConfig config, PsiDirectory dir) {
     final PubRoot root = PubRoot.forDescendant(dir.getVirtualFile(), dir.getProject());
     if (root == null) return false;
 
     if (!root.hasTests(dir.getVirtualFile())) return false;
 
-    config.setFields(TestFields.forDir(dir.getVirtualFile().getPath()));
+    setTestFields(config, TestFields.forDir(dir.getVirtualFile().getPath()));
     config.setGeneratedName();
     return true;
   }
 
+  private static void setTestFields(@NotNull TestConfig config, @NotNull TestFields fields) {
+    fields.setAdditionalArgs(config.getFields().getAdditionalArgs());
+    config.setFields(fields);
+  }
+
   /**
    * Returns true if a run config was already created for this file. If so we will reuse it.
    */