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

Drop package facades: code cleanup in Kotlin project.

Browse Source
This commit is contained in:
Dmitry Petrov
2015-10-13 14:50:49 +03:00
parent 57869d85e8
commit 8cd624a58a
301 changed files with 1285 additions and 1362 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/light-classes/src/org/jetbrains/kotlin/asJava/JavaElementFinder.java
+3 -3
View File
@@ -34,7 +34,7 @@ import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.load.java.JvmAbi;
import org.jetbrains.kotlin.load.kotlin.PackageClassUtils;
import org.jetbrains.kotlin.name.FqName;
import org.jetbrains.kotlin.name.NamePackage;
import org.jetbrains.kotlin.name.FqNamesUtilKt;
import org.jetbrains.kotlin.psi.JetClassOrObject;
import org.jetbrains.kotlin.psi.JetEnumEntry;
import org.jetbrains.kotlin.psi.JetFile;
@@ -108,7 +108,7 @@ public class JavaElementFinder extends PsiElementFinder implements KotlinFinderM
}
private PsiClass[] doFindClasses(String qualifiedNameString, GlobalSearchScope scope) {
if (!NamePackage.isValidJavaFqName(qualifiedNameString)) {
if (!FqNamesUtilKt.isValidJavaFqName(qualifiedNameString)) {
return PsiClass.EMPTY_ARRAY;
}
@@ -184,7 +184,7 @@ public class JavaElementFinder extends PsiElementFinder implements KotlinFinderM
@Override
public PsiPackage findPackage(@NotNull String qualifiedNameString) {
if (!NamePackage.isValidJavaFqName(qualifiedNameString)) {
if (!FqNamesUtilKt.isValidJavaFqName(qualifiedNameString)) {
return null;
}
compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightParameter.java
+2 -2
View File
@@ -27,7 +27,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.idea.KotlinLanguage;
import org.jetbrains.kotlin.psi.*;
import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage;
import org.jetbrains.kotlin.psi.psiUtil.JetPsiUtilKt;
import java.util.List;
@@ -75,7 +75,7 @@ public class KotlinLightParameter extends LightParameter implements KotlinLightE
JetDeclaration declaration = method.getOrigin();
if (declaration == null) return null;
int jetIndex = PsiUtilPackage.isExtensionDeclaration(declaration) ? index - 1 : index;
int jetIndex = JetPsiUtilKt.isExtensionDeclaration(declaration) ? index - 1 : index;
if (jetIndex < 0) return null;
if (declaration instanceof JetFunction) {
compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightTypeParameter.java
+1 -1
View File
@@ -51,7 +51,7 @@ public class KotlinLightTypeParameter
@NotNull
@Override
public JetTypeParameter getOrigin() {
JetTypeParameterListOwner jetOwner = (JetTypeParameterListOwner) AsJavaPackage.getUnwrapped(owner);
JetTypeParameterListOwner jetOwner = (JetTypeParameterListOwner) LightClassUtilsKt.getUnwrapped(owner);
assert (jetOwner != null) : "Invalid type parameter owner: " + owner;
return jetOwner.getTypeParameters().get(index);
compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinWrappingLightClass.java
+2 -2
View File
@@ -35,7 +35,7 @@ import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.idea.KotlinLanguage;
import org.jetbrains.kotlin.name.FqName;
import org.jetbrains.kotlin.psi.*;
import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage;
import org.jetbrains.kotlin.psi.psiUtil.PsiUtilsKt;
import java.util.List;
@@ -124,7 +124,7 @@ public abstract class KotlinWrappingLightClass extends AbstractLightClass implem
JetDeclaration declaration = ClsWrapperStubPsiFactory.getOriginalDeclaration(field);
if (declaration instanceof JetEnumEntry) {
assert field instanceof PsiEnumConstant : "Field delegate should be an enum constant (" + field.getName() + "):\n" +
PsiUtilPackage.getElementTextWithContext(declaration);
PsiUtilsKt.getElementTextWithContext(declaration);
JetEnumEntry enumEntry = (JetEnumEntry) declaration;
PsiEnumConstant enumConstant = (PsiEnumConstant) field;
FqName enumConstantFqName = new FqName(getFqName().asString() + "." + enumEntry.getName());