This commit is contained in:
Valentin Kipyatkov
2015-08-15 01:06:03 +03:00
parent 275299f5e2
commit 947db74b62
4 changed files with 5 additions and 5 deletions
@@ -3,7 +3,7 @@ fun main(args: Array<String>) {
}
// INVOCATION_COUNT: 2
// WITH_ORDER: true
// WITH_ORDER
// EXIST: { lookupString:"Array", tailText:"<T> (kotlin)" }
// EXIST_JAVA_ONLY: { lookupString:"Array", tailText:" (java.sql)" }
// EXIST: { lookupString:"ArrayList", tailText:"<E> (java.util)" }
@@ -2,7 +2,7 @@ fun some(a: Double<caret>) {
}
// INVOCATION_COUNT: 2
// WITH_ORDER: true
// WITH_ORDER
// EXIST: { lookupString:"Double", tailText:" (kotlin)" }
// EXIST_JAVA_ONLY: { lookupString:"Double", tailText:" (java.lang)" }
// EXIST: { lookupString:"DoubleArray", tailText:" (kotlin)" }
+1 -1
View File
@@ -3,7 +3,7 @@ fun foo(): Boolean {
}
// INVOCATION_COUNT: 1
// WITH_ORDER: true
// WITH_ORDER
// EXIST: { lookupString: "return", itemText: "return", tailText: null, attributes: "bold" }
// EXIST: { lookupString: "return false", itemText: "return false", tailText: null, attributes: "bold" }
// EXIST: { lookupString: "return true", itemText: "return true", tailText: null, attributes: "bold" }
@@ -128,7 +128,7 @@ public class ExpectedCompletionUtils {
private static final String NOTHING_ELSE_PREFIX = "NOTHING_ELSE";
private static final String INVOCATION_COUNT_PREFIX = "INVOCATION_COUNT:";
private static final String WITH_ORDER_PREFIX = "WITH_ORDER:";
private static final String WITH_ORDER_PREFIX = "WITH_ORDER";
private static final String AUTOCOMPLETE_SETTING_PREFIX = "AUTOCOMPLETE_SETTING:";
public static final String RUNTIME_TYPE = "RUNTIME_TYPE:";
@@ -234,7 +234,7 @@ public class ExpectedCompletionUtils {
}
public static boolean isWithOrder(String fileText) {
return Boolean.TRUE.equals(InTextDirectivesUtils.getPrefixedBoolean(fileText, WITH_ORDER_PREFIX));
return !InTextDirectivesUtils.findLinesWithPrefixesRemoved(fileText, WITH_ORDER_PREFIX).isEmpty();
}
public static void assertDirectivesValid(String fileText) {