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

Replace KotlinPackage legacy facade with corresponding package parts.

Browse Source
This commit is contained in:
Ilya Gorbunov
2015-10-01 22:31:17 +03:00
parent 80e4ba8712
commit 90e5ee8a7e
64 changed files with 214 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/checkers/AbstractJetDiagnosticsTest.java
+5 -5
View File
@@ -22,7 +22,7 @@ import com.google.common.collect.Sets;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.PsiElement;
import kotlin.KotlinPackage;
import kotlin.CollectionsKt;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -77,7 +77,7 @@ public abstract class AbstractJetDiagnosticsTest extends BaseDiagnosticsTest {
@Override
protected void analyzeAndCheck(File testDataFile, List<TestFile> testFiles) {
Map<TestModule, List<TestFile>> groupedByModule = KotlinPackage.groupByTo(
Map<TestModule, List<TestFile>> groupedByModule = CollectionsKt.groupByTo(
testFiles,
new LinkedHashMap<TestModule, List<TestFile>>(),
new Function1<TestFile, TestModule>() {
@@ -88,7 +88,7 @@ public abstract class AbstractJetDiagnosticsTest extends BaseDiagnosticsTest {
}
);
boolean checkLazyResolveLog = KotlinPackage.any(testFiles, new Function1<TestFile, Boolean>() {
boolean checkLazyResolveLog = CollectionsKt.any(testFiles, new Function1<TestFile, Boolean>() {
@Override
public Boolean invoke(TestFile file) {
return file.checkLazyLog;
@@ -255,7 +255,7 @@ public abstract class AbstractJetDiagnosticsTest extends BaseDiagnosticsTest {
List<TestFile> testFiles,
Map<TestModule, ModuleDescriptorImpl> modules
) {
if (KotlinPackage.any(testFiles, new Function1<TestFile, Boolean>() {
if (CollectionsKt.any(testFiles, new Function1<TestFile, Boolean>() {
@Override
public Boolean invoke(TestFile file) {
return InTextDirectivesUtils.isDirectiveDefined(file.expectedText, "// SKIP_TXT");
@@ -270,7 +270,7 @@ public abstract class AbstractJetDiagnosticsTest extends BaseDiagnosticsTest {
boolean isMultiModuleTest = modules.size() != 1;
StringBuilder rootPackageText = new StringBuilder();
for (TestModule module : KotlinPackage.sort(modules.keySet())) {
for (TestModule module : CollectionsKt.sorted(modules.keySet())) {
ModuleDescriptorImpl moduleDescriptor = modules.get(module);
PackageViewDescriptor aPackage = moduleDescriptor.getPackage(FqName.ROOT);
assertFalse(aPackage.isEmpty());
compiler/tests/org/jetbrains/kotlin/checkers/BaseDiagnosticsTest.java
+3 -3
View File
@@ -28,7 +28,7 @@ import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.util.Function;
import com.intellij.util.containers.ContainerUtil;
import kotlin.KotlinPackage;
import kotlin.CollectionsKt;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -96,7 +96,7 @@ public abstract class BaseDiagnosticsTest extends
@Override
protected void doMultiFileTest(File file, final Map<String, ModuleAndDependencies> modules, List<TestFile> testFiles) {
for (final ModuleAndDependencies moduleAndDependencies : modules.values()) {
List<TestModule> dependencies = KotlinPackage.map(
List<TestModule> dependencies = CollectionsKt.map(
moduleAndDependencies.dependencies,
new Function1<String, TestModule>() {
@Override
@@ -347,7 +347,7 @@ public abstract class BaseDiagnosticsTest extends
final boolean[] ok = { true };
List<Diagnostic> diagnostics = ContainerUtil.filter(
KotlinPackage.plus(CheckerTestUtil.getDiagnosticsIncludingSyntaxErrors(bindingContext, jetFile, markDynamicCalls, dynamicCallDescriptors),
CollectionsKt.plus(CheckerTestUtil.getDiagnosticsIncludingSyntaxErrors(bindingContext, jetFile, markDynamicCalls, dynamicCallDescriptors),
jvmSignatureDiagnostics),
whatDiagnosticsToConsider
);
compiler/tests/org/jetbrains/kotlin/codegen/AbstractTopLevelMembersInvocationTest.java
+2 -2
View File
@@ -16,7 +16,7 @@
package org.jetbrains.kotlin.codegen;
import kotlin.KotlinPackage;
import kotlin.CollectionsKt;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.util.ArrayUtil;
import com.intellij.util.Processor;
@@ -69,7 +69,7 @@ public abstract class AbstractTopLevelMembersInvocationTest extends AbstractByte
myEnvironment = KotlinCoreEnvironment.createForTests(
getTestRootDisposable(),
JetTestUtils.compilerConfigurationForTests(ConfigurationKind.JDK_ONLY, TestJdkKind.MOCK_JDK,
KotlinPackage.plus(classPath, JetTestUtils.getAnnotationsJar()), classPath),
CollectionsKt.plus(classPath, JetTestUtils.getAnnotationsJar()), classPath),
EnvironmentConfigFiles.JVM_CONFIG_FILES);
loadFiles(ArrayUtil.toStringArray(sourceFiles));
compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestUtil.java
+2 -2
View File
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.codegen;
import com.google.common.base.Function;
import com.google.common.collect.Lists;
import kotlin.KotlinPackage;
import kotlin.StringsKt;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.analyzer.AnalysisResult;
@@ -128,7 +128,7 @@ public class CodegenTestUtil {
classpath.addAll(additionalClasspath);
List<String> options = new ArrayList<String>(Arrays.asList(
"-classpath", KotlinPackage.join(classpath, File.pathSeparator, "", "", -1, ""),
"-classpath", StringsKt.join(classpath, File.pathSeparator, "", "", -1, ""),
"-d", javaClassesTempDirectory.getPath()
));
options.addAll(additionalOptions);
compiler/tests/org/jetbrains/kotlin/serialization/builtins/LoadBuiltinsTest.java
+2 -2
View File
@@ -18,6 +18,7 @@ package org.jetbrains.kotlin.serialization.builtins;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.util.containers.ContainerUtil;
import kotlin.CollectionsKt;
import kotlin.Unit;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
@@ -51,7 +52,6 @@ import java.io.InputStream;
import java.util.List;
import java.util.regex.Pattern;
import static kotlin.KotlinPackage.single;
import static org.jetbrains.kotlin.builtins.BuiltInsPackageFragmentProviderKt.createBuiltInPackageFragmentProvider;
import static org.jetbrains.kotlin.builtins.KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME;
import static org.jetbrains.kotlin.builtins.KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAMES;
@@ -122,7 +122,7 @@ public class LoadBuiltinsTest extends KotlinTestWithEnvironment {
builtInsModule.initialize(packageFragmentProvider);
builtInsModule.setDependencies(builtInsModule);
return single(packageFragmentProvider.getPackageFragments(BUILT_INS_PACKAGE_FQ_NAME));
return CollectionsKt.single(packageFragmentProvider.getPackageFragments(BUILT_INS_PACKAGE_FQ_NAME));
}
@NotNull
compiler/tests/org/jetbrains/kotlin/test/JetTestUtils.java
+4 -3
View File
@@ -38,7 +38,8 @@ import com.intellij.util.Function;
import com.intellij.util.Processor;
import com.intellij.util.containers.ContainerUtil;
import junit.framework.TestCase;
import kotlin.KotlinPackage;
import kotlin.CollectionsKt;
import kotlin.SetsKt;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
@@ -719,7 +720,7 @@ public class JetTestUtils {
@NotNull
public static String getLastCommentInFile(@NotNull JetFile file) {
return KotlinPackage.first(getLastCommentsInFile(file, CommentType.ALL, true));
return CollectionsKt.first(getLastCommentsInFile(file, CommentType.ALL, true));
}
@NotNull
@@ -821,7 +822,7 @@ public class JetTestUtils {
File rootFile = new File(rootPath);
Set<String> filePaths = collectPathsMetadata(testCaseClass);
Set<String> exclude = KotlinPackage.setOf(excludeDirs);
Set<String> exclude = SetsKt.setOf(excludeDirs);
File[] files = testDataDir.listFiles();
if (files != null) {