fix an issue with escaped test names (flutter#3082)

kenzieschmoll · Jan 15, 2019 · ed77139 · ed77139
1 parent 7207674
commit ed77139
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/io/flutter/run/test/FlutterTestLineMarkerContributor.java b/src/io/flutter/run/test/FlutterTestLineMarkerContributor.java
@@ -47,7 +47,6 @@ public Info getInfo(@NotNull PsiElement element) {
 
   @NotNull
   private static Icon getTestStateIcon(@NotNull PsiElement element, @NotNull Icon defaultIcon) {
-
     // SMTTestProxy maps test run data to a URI derived from a location hint produced by `package:test`.
     // If we can find corresponding data, we can provide state-aware icons. If not, we default to
     // a standard Run state.

diff --git a/src/io/flutter/run/test/TestConfigUtils.java b/src/io/flutter/run/test/TestConfigUtils.java
@@ -14,6 +14,7 @@
 import com.jetbrains.lang.dart.psi.DartCallExpression;
 import com.jetbrains.lang.dart.psi.DartFile;
 import com.jetbrains.lang.dart.psi.DartStringLiteralExpression;
+import groovy.json.StringEscapeUtils;
 import io.flutter.FlutterUtils;
 import io.flutter.dart.DartSyntax;
 import org.apache.commons.lang.StringUtils;
@@ -89,7 +90,10 @@ public static String findTestName(@Nullable PsiElement elt) {
     final DartStringLiteralExpression lit = DartSyntax.getArgument(call, 0, DartStringLiteralExpression.class);
     if (lit == null) return null;
 
-    return DartSyntax.unquote(lit);
+    final String name = DartSyntax.unquote(lit);
+    if (name == null) return null;
+
+    return StringEscapeUtils.unescapeJava(name);
   }
 
   enum TestType {