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

Temporary hack to migrate functions to package kotlin.jvm.functions

Browse Source 
Add a file in package 'kotlin.jvm.functions' to the project and replace
explicit imports of functions 'kotlin.Function{n}' to two imports 'kotlin.*'
and 'kotlin.jvm.functions.*', so that the codebase can be compiled both by the
old and by the new compiler
This commit is contained in:
Alexander Udalov
2015-04-23 22:00:04 +03:00
parent 7baa7a72e2
commit 738a84e259
123 changed files with 299 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/cfg/AbstractControlFlowTest.java
+2 -1
View File
@@ -16,7 +16,8 @@
package org.jetbrains.kotlin.cfg;
import kotlin.Function3;
import kotlin.jvm.functions.*;
import kotlin.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.cfg.pseudocode.PseudocodeImpl;
compiler/tests/org/jetbrains/kotlin/cfg/AbstractDataFlowTest.java
+2 -1
View File
@@ -18,7 +18,8 @@ package org.jetbrains.kotlin.cfg;
import com.google.common.collect.Lists;
import com.intellij.openapi.util.text.StringUtil;
import kotlin.Function3;
import kotlin.jvm.functions.*;
import kotlin.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.cfg.pseudocode.PseudocodeImpl;
import org.jetbrains.kotlin.cfg.pseudocode.instructions.Instruction;
compiler/tests/org/jetbrains/kotlin/cfg/AbstractPseudocodeTest.java
+2 -1
View File
@@ -18,7 +18,8 @@ package org.jetbrains.kotlin.cfg;
import com.google.common.collect.Sets;
import com.intellij.openapi.util.text.StringUtil;
import kotlin.Function3;
import kotlin.jvm.functions.*;
import kotlin.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.analyzer.AnalysisResult;
compiler/tests/org/jetbrains/kotlin/checkers/AbstractJetDiagnosticsTest.java
+2 -1
View File
@@ -22,7 +22,8 @@ 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.Function1;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.KotlinPackage;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
compiler/tests/org/jetbrains/kotlin/checkers/BaseDiagnosticsTest.java
+2 -1
View File
@@ -28,7 +28,8 @@ 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.Function1;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.KotlinPackage;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
compiler/tests/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java
+2 -1
View File
@@ -26,7 +26,8 @@ import com.intellij.openapi.application.PathManager;
import com.intellij.openapi.util.SystemInfo;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.text.StringUtil;
import kotlin.Function1;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.KotlinPackage;
import kotlin.text.Regex;
import kotlin.text.MatchResult;
compiler/tests/org/jetbrains/kotlin/parsing/JetCodeConformanceTest.java
+2 -1
View File
@@ -19,7 +19,8 @@ package org.jetbrains.kotlin.parsing;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.text.StringUtil;
import junit.framework.TestCase;
import kotlin.Function1;
import kotlin.jvm.functions.*;
import kotlin.*;
import org.jetbrains.annotations.NotNull;
import org.junit.Assert;
compiler/tests/org/jetbrains/kotlin/storage/StorageManagerTest.java
+4 -2
View File
@@ -17,8 +17,10 @@
package org.jetbrains.kotlin.storage;
import junit.framework.TestCase;
import kotlin.Function0;
import kotlin.Function1;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.Unit;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
compiler/tests/org/jetbrains/kotlin/test/JetTestUtils.java
+2 -1
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.Function1;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.KotlinPackage;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;