Refactor: rename KtLightClassForExplicitDeclaration -> KtLightClassForSourceDeclaration
This commit is contained in:
+2
-2
@@ -34,7 +34,7 @@ import com.intellij.xdebugger.breakpoints.XLineBreakpoint
|
||||
import com.intellij.xdebugger.breakpoints.XLineBreakpointType
|
||||
import com.intellij.xdebugger.breakpoints.ui.XBreakpointCustomPropertiesPanel
|
||||
import org.jetbrains.kotlin.asJava.classes.KtLightClass
|
||||
import org.jetbrains.kotlin.asJava.classes.KtLightClassForExplicitDeclaration
|
||||
import org.jetbrains.kotlin.asJava.classes.KtLightClassForSourceDeclaration
|
||||
import org.jetbrains.kotlin.asJava.classes.KtLightClassForFacade
|
||||
import org.jetbrains.kotlin.idea.KotlinBundle
|
||||
import org.jetbrains.kotlin.idea.debugger.breakpoints.dialog.AddFieldBreakpointDialog
|
||||
@@ -88,7 +88,7 @@ class KotlinFieldBreakpointType : JavaBreakpointType<KotlinPropertyBreakpointPro
|
||||
is KtLightClassForFacade -> {
|
||||
psiClass.files.asSequence().mapNotNull { createBreakpointIfPropertyExists(it, it, className, fieldName) }.firstOrNull()
|
||||
}
|
||||
is KtLightClassForExplicitDeclaration -> {
|
||||
is KtLightClassForSourceDeclaration -> {
|
||||
val jetClass = psiClass.kotlinOrigin
|
||||
createBreakpointIfPropertyExists(jetClass, jetClass.getContainingKtFile(), className, fieldName)
|
||||
}
|
||||
|
||||
+7
-7
@@ -40,7 +40,7 @@ import kotlin.jvm.functions.Function1;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
import org.jetbrains.kotlin.asJava.LightClassUtilsKt;
|
||||
import org.jetbrains.kotlin.asJava.classes.KtLightClassForExplicitDeclaration;
|
||||
import org.jetbrains.kotlin.asJava.classes.KtLightClassForSourceDeclaration;
|
||||
import org.jetbrains.kotlin.idea.projectView.KtClassOrObjectTreeNode;
|
||||
import org.jetbrains.kotlin.idea.refactoring.memberInfo.KotlinMemberInfo;
|
||||
import org.jetbrains.kotlin.idea.refactoring.memberInfo.KotlinMemberSelectionPanel;
|
||||
@@ -114,8 +114,8 @@ public class MoveKotlinNestedClassesDialog extends RefactoringDialog {
|
||||
new ClassFilter() {
|
||||
@Override
|
||||
public boolean isAccepted(PsiClass aClass) {
|
||||
if (!(aClass instanceof KtLightClassForExplicitDeclaration)) return false;
|
||||
KtClassOrObject classOrObject = ((KtLightClassForExplicitDeclaration) aClass).getKotlinOrigin();
|
||||
if (!(aClass instanceof KtLightClassForSourceDeclaration)) return false;
|
||||
KtClassOrObject classOrObject = ((KtLightClassForSourceDeclaration) aClass).getKotlinOrigin();
|
||||
|
||||
if (classOrObject instanceof KtObjectDeclaration) {
|
||||
return !((KtObjectDeclaration) classOrObject).isObjectLiteral();
|
||||
@@ -148,8 +148,8 @@ public class MoveKotlinNestedClassesDialog extends RefactoringDialog {
|
||||
chooser.showDialog();
|
||||
|
||||
PsiClass aClass = chooser.getSelected();
|
||||
if (aClass instanceof KtLightClassForExplicitDeclaration) {
|
||||
targetClass = ((KtLightClassForExplicitDeclaration) aClass).getKotlinOrigin();
|
||||
if (aClass instanceof KtLightClassForSourceDeclaration) {
|
||||
targetClass = ((KtLightClassForSourceDeclaration) aClass).getKotlinOrigin();
|
||||
targetClassChooser.setText(aClass.getQualifiedName());
|
||||
}
|
||||
}
|
||||
@@ -166,8 +166,8 @@ public class MoveKotlinNestedClassesDialog extends RefactoringDialog {
|
||||
PsiClass aClass = JavaPsiFacade
|
||||
.getInstance(myProject)
|
||||
.findClass(targetClassChooser.getText(), GlobalSearchScope.projectScope(myProject));
|
||||
targetClass = aClass instanceof KtLightClassForExplicitDeclaration
|
||||
? ((KtLightClassForExplicitDeclaration) aClass).getKotlinOrigin()
|
||||
targetClass = aClass instanceof KtLightClassForSourceDeclaration
|
||||
? ((KtLightClassForSourceDeclaration) aClass).getKotlinOrigin()
|
||||
: null;
|
||||
validateButtons();
|
||||
}
|
||||
|
||||
+2
-2
@@ -21,7 +21,7 @@ import com.intellij.psi.PsiElement
|
||||
import com.intellij.refactoring.rename.naming.AutomaticRenamer
|
||||
import com.intellij.refactoring.rename.naming.AutomaticTestRenamerFactory
|
||||
import com.intellij.usageView.UsageInfo
|
||||
import org.jetbrains.kotlin.asJava.classes.KtLightClassForExplicitDeclaration
|
||||
import org.jetbrains.kotlin.asJava.classes.KtLightClassForSourceDeclaration
|
||||
import org.jetbrains.kotlin.asJava.classes.KtLightClassForFacade
|
||||
import org.jetbrains.kotlin.asJava.findFacadeClass
|
||||
import org.jetbrains.kotlin.asJava.toLightClass
|
||||
@@ -32,7 +32,7 @@ import org.jetbrains.kotlin.psi.KtFile
|
||||
class KotlinAutomaticTestRenamerFactory : AutomaticTestRenamerFactory() {
|
||||
private fun getPsiClass(element: PsiElement): PsiClass? {
|
||||
return when (element) {
|
||||
is KtLightClassForExplicitDeclaration -> element
|
||||
is KtLightClassForSourceDeclaration -> element
|
||||
is KtClassOrObject -> element.toLightClass()
|
||||
is KtFile -> element.findFacadeClass()
|
||||
else -> null
|
||||
|
||||
@@ -24,7 +24,7 @@ import com.intellij.refactoring.listeners.RefactoringElementListener
|
||||
import com.intellij.refactoring.rename.RenamePsiElementProcessor
|
||||
import com.intellij.usageView.UsageInfo
|
||||
import org.jetbrains.kotlin.asJava.classes.KtLightClass
|
||||
import org.jetbrains.kotlin.asJava.classes.KtLightClassForExplicitDeclaration
|
||||
import org.jetbrains.kotlin.asJava.classes.KtLightClassForSourceDeclaration
|
||||
import org.jetbrains.kotlin.asJava.classes.KtLightClassForFacade
|
||||
import org.jetbrains.kotlin.asJava.namedUnwrappedElement
|
||||
import org.jetbrains.kotlin.descriptors.ClassDescriptor
|
||||
@@ -112,7 +112,7 @@ class RenameKotlinClassProcessor : RenameKotlinPsiProcessor() {
|
||||
private fun getClassOrObject(element: PsiElement?): PsiElement? = when (element) {
|
||||
is KtLightClass ->
|
||||
when (element) {
|
||||
is KtLightClassForExplicitDeclaration -> element.kotlinOrigin
|
||||
is KtLightClassForSourceDeclaration -> element.kotlinOrigin
|
||||
is KtLightClassForFacade -> element
|
||||
else -> throw AssertionError("Should not be suggested to rename element of type " + element.javaClass + " " + element)
|
||||
}
|
||||
|
||||
@@ -48,7 +48,7 @@ import kotlin.jvm.functions.Function1;
|
||||
import org.jdom.Element;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
import org.jetbrains.kotlin.asJava.classes.KtLightClassForExplicitDeclaration;
|
||||
import org.jetbrains.kotlin.asJava.classes.KtLightClassForSourceDeclaration;
|
||||
import org.jetbrains.kotlin.asJava.elements.KtLightMethod;
|
||||
import org.jetbrains.kotlin.idea.MainFunctionDetector;
|
||||
import org.jetbrains.kotlin.idea.caches.resolve.ResolutionUtils;
|
||||
@@ -389,7 +389,7 @@ public class JetRunConfiguration extends ModuleBasedConfiguration<RunConfigurati
|
||||
private String noFunctionFoundMessage(@NotNull PsiClass psiClass) {
|
||||
//noinspection ConstantConditions
|
||||
FqName classFqName = new FqName(psiClass.getQualifiedName());
|
||||
if (psiClass instanceof KtLightClassForExplicitDeclaration) {
|
||||
if (psiClass instanceof KtLightClassForSourceDeclaration) {
|
||||
return String.format("Function 'main' not found in class '%s'", classFqName);
|
||||
}
|
||||
return String.format("Top-level function 'main' not found in package '%s'", classFqName.parent());
|
||||
|
||||
@@ -27,7 +27,7 @@ import com.intellij.testIntegration.JavaTestFinder
|
||||
import com.intellij.testIntegration.TestFinderHelper
|
||||
import com.intellij.util.CommonProcessors
|
||||
import com.intellij.util.containers.HashSet
|
||||
import org.jetbrains.kotlin.asJava.classes.KtLightClassForExplicitDeclaration
|
||||
import org.jetbrains.kotlin.asJava.classes.KtLightClassForSourceDeclaration
|
||||
import org.jetbrains.kotlin.asJava.classes.KtLightClassForFacade
|
||||
import org.jetbrains.kotlin.asJava.findFacadeClass
|
||||
import org.jetbrains.kotlin.asJava.toLightClass
|
||||
@@ -72,7 +72,7 @@ class KotlinTestFinder : JavaTestFinder() {
|
||||
if (eachClass is KtLightClassForFacade) {
|
||||
eachClass.files.mapTo(classesWithWeights) { Pair.create(it, candidateNameWithWeight.second) }
|
||||
}
|
||||
else if (eachClass.isPhysical || eachClass is KtLightClassForExplicitDeclaration) {
|
||||
else if (eachClass.isPhysical || eachClass is KtLightClassForSourceDeclaration) {
|
||||
classesWithWeights.add(Pair.create(eachClass, candidateNameWithWeight.second))
|
||||
}
|
||||
}
|
||||
@@ -101,7 +101,7 @@ class KotlinTestFinder : JavaTestFinder() {
|
||||
if (!pattern.matcher(candidateName).matches()) continue
|
||||
for (candidateClass in cache.getClassesByName(candidateName, scope)) {
|
||||
if (!(frameworks.isTestClass(candidateClass) || frameworks.isPotentialTestClass(candidateClass))) continue
|
||||
if (!candidateClass.isPhysical && candidateClass !is KtLightClassForExplicitDeclaration) continue
|
||||
if (!candidateClass.isPhysical && candidateClass !is KtLightClassForSourceDeclaration) continue
|
||||
processor.process(Pair.create(candidateClass, TestFinderHelper.calcTestNameProximity(klassName, candidateName)))
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user