azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support a larger set of symbols as module name in "MODULE" directive

Browse Source
This commit is contained in:
Zalim Bashorov
2017-01-26 15:18:28 +03:00
parent 66fd566df0
commit 4a72404ac2
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common/org/jetbrains/kotlin/test/KotlinTestUtils.java
+7 -10
View File
@@ -42,6 +42,7 @@ import junit.framework.TestCase;
import kotlin.collections.CollectionsKt; import kotlin.collections.CollectionsKt;
import kotlin.collections.SetsKt; import kotlin.collections.SetsKt;
import kotlin.jvm.functions.Function1; import kotlin.jvm.functions.Function1;
import kotlin.text.StringsKt;
import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
@@ -111,10 +112,12 @@ public class KotlinTestUtils {
* *
* Several files may follow one module * Several files may follow one module
*/ */
public static final Pattern FILE_OR_MODULE_PATTERN = Pattern.compile( private static final String MODULE_DELIMITER = ",\\s*";
"(?://\\s*MODULE:\\s*([\\w\\d_\\-]+)(\\([\\w\\d_\\-]+(?:,\\s*[\\w\\d_\\-]+)*\\))?\\s*)?" +
private static final Pattern FILE_OR_MODULE_PATTERN = Pattern.compile(
"(?://\\s*MODULE:\\s*([^()\\n]+)(?:\\(([^()]+(?:" + MODULE_DELIMITER + "[^()]+)*)\\))?\\s*)?" +
"//\\s*FILE:\\s*(.*)$", Pattern.MULTILINE); "//\\s*FILE:\\s*(.*)$", Pattern.MULTILINE);
public static final Pattern DIRECTIVE_PATTERN = Pattern.compile("^//\\s*!([\\w_]+)(:\\s*(.*)$)?", Pattern.MULTILINE); private static final Pattern DIRECTIVE_PATTERN = Pattern.compile("^//\\s*!([\\w_]+)(:\\s*(.*)$)?", Pattern.MULTILINE);
public static final BindingTrace DUMMY_TRACE = new BindingTrace() { public static final BindingTrace DUMMY_TRACE = new BindingTrace() {
@NotNull @NotNull
@@ -680,13 +683,7 @@ public class KotlinTestUtils {
private static List<String> parseDependencies(@Nullable String dependencies) { private static List<String> parseDependencies(@Nullable String dependencies) {
if (dependencies == null) return Collections.emptyList(); if (dependencies == null) return Collections.emptyList();
return StringsKt.split(dependencies, Pattern.compile(MODULE_DELIMITER), 0);
Matcher matcher = Pattern.compile("[\\w\\d_\\-]+").matcher(dependencies);
List<String> result = new ArrayList<String>();
while (matcher.find()) {
result.add(matcher.group());
}
return result;
} }
@NotNull @NotNull