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

Rename "import jet" to "import kotlin" in Java sources

Browse Source
This commit is contained in:
Alexander Udalov
2014-03-02 21:33:22 +04:00
parent 6eae950812
commit d04ee09636
43 changed files with 101 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/codeInsight/upDownMover/JetExpressionMover.java
+2 -2
View File
@@ -9,7 +9,7 @@ import com.intellij.openapi.util.Pair;
import com.intellij.openapi.util.TextRange;
import com.intellij.psi.*;
import com.intellij.psi.util.PsiTreeUtil;
import jet.Function1;
import kotlin.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.psi.*;
@@ -550,4 +550,4 @@ public class JetExpressionMover extends AbstractJetUpDownMover {
PsiDocumentManager.getInstance(editor.getProject()).doPostponedOperationsAndUnblockDocument(editor.getDocument());
}
}
}
}
idea/src/org/jetbrains/jet/plugin/hierarchy/HierarchyUtils.java
+2 -2
View File
@@ -7,7 +7,7 @@ import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.project.Project;
import com.intellij.psi.*;
import com.intellij.util.ArrayUtil;
import jet.Function1;
import kotlin.Function1;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.psi.*;
import org.jetbrains.jet.lang.psi.psiUtil.PsiUtilPackage;
@@ -59,4 +59,4 @@ public class HierarchyUtils {
//noinspection unchecked
return PsiUtilPackage.getParentByTypesAndPredicate(element, false, ArrayUtil.EMPTY_CLASS_ARRAY, IS_OVERRIDE_HIERARCHY_ELEMENT);
}
}
}
idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallTreeStructure.java
+2 -2
View File
@@ -10,7 +10,7 @@ import com.intellij.psi.PsiMethod;
import com.intellij.psi.PsiReference;
import com.intellij.util.ArrayUtil;
import com.intellij.util.containers.HashMap;
import jet.Function1;
import kotlin.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.asJava.LightClassUtil;
@@ -145,4 +145,4 @@ public abstract class KotlinCallTreeStructure extends HierarchyTreeStructure {
public boolean isAlwaysShowPlus() {
return true;
}
}
}
idea/src/org/jetbrains/jet/plugin/intentions/declarations/JetDeclarationJoinLinesHandler.java
+2 -2
View File
@@ -5,7 +5,7 @@ import com.intellij.openapi.editor.Document;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.intellij.util.ArrayUtil;
import jet.Function1;
import kotlin.Function1;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.psi.JetPsiUtil;
import org.jetbrains.jet.lang.psi.psiUtil.PsiUtilPackage;
@@ -33,4 +33,4 @@ public class JetDeclarationJoinLinesHandler implements JoinRawLinesHandlerDelega
public int tryJoinLines(Document document, PsiFile file, int start, int end) {
return -1;
}
}
}
idea/src/org/jetbrains/jet/plugin/project/ResolveElementCache.java
+2 -2
View File
@@ -23,7 +23,7 @@ import com.intellij.openapi.project.Project;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.intellij.psi.util.*;
import jet.Function1;
import kotlin.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.di.InjectorForBodyResolve;
@@ -503,4 +503,4 @@ public class ResolveElementCache {
return true;
}
}
}
}
idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractOverrideImplementTest.java
+2 -2
View File
@@ -28,7 +28,7 @@ import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.testFramework.LightProjectDescriptor;
import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase;
import com.intellij.util.SmartList;
import jet.Function1;
import kotlin.Function1;
import junit.framework.Assert;
import kotlin.KotlinPackage;
import org.jetbrains.annotations.NotNull;
@@ -214,4 +214,4 @@ public abstract class AbstractOverrideImplementTest extends LightCodeInsightFixt
}
});
}
}
}
idea/tests/org/jetbrains/jet/plugin/compilerMessages/IDECompilerMessagingTest.java
+2 -2
View File
@@ -25,7 +25,7 @@ import com.intellij.openapi.roots.ModuleRootManager;
import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.testFramework.PlatformTestCase;
import jet.Function1;
import kotlin.Function1;
import junit.framework.Assert;
import org.jetbrains.annotations.NotNull;
@@ -104,4 +104,4 @@ public abstract class IDECompilerMessagingTest extends PlatformTestCase {
assert compilers.length == 1;
return compilers[0];
}
}
}
idea/tests/org/jetbrains/jet/plugin/compilerMessages/JetCompilerMessagingTest.java
+2 -2
View File
@@ -16,7 +16,7 @@
package org.jetbrains.jet.plugin.compilerMessages;
import jet.Function1;
import kotlin.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.plugin.PluginTestCaseBase;
import org.jetbrains.jet.plugin.compiler.K2JvmTranslatingCompiler;
@@ -86,4 +86,4 @@ public final class JetCompilerMessagingTest extends IDECompilerMessagingTest {
checker.expect(Message.stats().textStartsWith("Using Kotlin home directory"));
checker.expect(Message.stats().text("Configuring the compilation environment"));
}
}
}
idea/tests/org/jetbrains/jet/plugin/compilerMessages/K2JSCompilerMessagingTest.java
+2 -2
View File
@@ -20,7 +20,7 @@ import com.intellij.openapi.roots.OrderRootType;
import com.intellij.openapi.roots.ui.configuration.libraryEditor.NewLibraryEditor;
import com.intellij.openapi.vfs.VfsUtil;
import com.intellij.util.PathUtil;
import jet.Function1;
import kotlin.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.plugin.PluginTestCaseBase;
import org.jetbrains.jet.plugin.compiler.K2JsTranslatingCompiler;
@@ -105,4 +105,4 @@ public final class K2JSCompilerMessagingTest extends IDECompilerMessagingTest {
checker.expect(info().textStartsWith("Kotlin Compiler version"));
checker.expect(stats().textMatchesRegexp("Compiling source files: .*/src/test.kt"));
}
}
}