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

Refactoring: Unify getClassOrObject() and getContainingClassOrObject() functions in constructor PSI

Browse Source
This commit is contained in:
Alexey Sedunov
2015-06-09 16:39:39 +03:00
parent 1ab90c7814
commit bbc644f4c8
11 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/psi/JetConstructor.kt
+2 -2
View File
@@ -30,7 +30,7 @@ public abstract class JetConstructor<T : JetConstructor<T>> : JetDeclarationStub
protected constructor(node: ASTNode) : super(node)
protected constructor(stub: KotlinPlaceHolderStub<T>, nodeType: JetPlaceHolderStubElementType<T>) : super(stub, nodeType)
public abstract fun getClassOrObject(): JetClassOrObject
public abstract fun getContainingClassOrObject(): JetClassOrObject
override fun isLocal() = false
@@ -65,7 +65,7 @@ public abstract class JetConstructor<T : JetConstructor<T>> : JetDeclarationStub
override fun getTypeParameters() = emptyList<JetTypeParameter>()
override fun getName(): String = getClassOrObject().getName()!!
override fun getName(): String = getContainingClassOrObject().getName()!!
override fun getNameAsSafeName() = Name.identifier(getName())
compiler/frontend/src/org/jetbrains/kotlin/psi/JetPrimaryConstructor.kt
+1 -3
View File
@@ -29,9 +29,7 @@ public class JetPrimaryConstructor : JetConstructor<JetPrimaryConstructor> {
override fun <R, D> accept(visitor: JetVisitor<R, D>, data: D) = visitor.visitPrimaryConstructor(this, data)
public fun getContainingClassOrObject(): JetClassOrObject = getParent() as JetClassOrObject
override fun getClassOrObject() = getContainingClassOrObject()
override fun getContainingClassOrObject() = getParent() as JetClassOrObject
override fun addModifier(modifier: JetModifierKeywordToken) {
val modifierList = getModifierList()
compiler/frontend/src/org/jetbrains/kotlin/psi/JetSecondaryConstructor.kt
+1 -1
View File
@@ -27,7 +27,7 @@ public class JetSecondaryConstructor : JetConstructor<JetSecondaryConstructor> {
override fun <R, D> accept(visitor: JetVisitor<R, D>, data: D) = visitor.visitSecondaryConstructor(this, data)
override fun getClassOrObject() = getParent().getParent() as JetClassOrObject
override fun getContainingClassOrObject() = getParent().getParent() as JetClassOrObject
override fun getBodyExpression() = findChildByClass(javaClass<JetBlockExpression>())
compiler/frontend/src/org/jetbrains/kotlin/resolve/OverloadResolver.java
+1 -1
View File
@@ -203,7 +203,7 @@ public class OverloadResolver {
}
else {
String containingClassName = jetDeclaration instanceof JetSecondaryConstructor ?
((JetSecondaryConstructor) jetDeclaration).getClassOrObject().getName() : null;
((JetSecondaryConstructor) jetDeclaration).getContainingClassOrObject().getName() : null;
trace.report(Errors.CONFLICTING_OVERLOADS.on(
jetDeclaration, memberDescriptor,
compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassUtil.java
+1 -1
View File
@@ -248,7 +248,7 @@ public class LightClassUtil {
}
if (declaration instanceof JetConstructor) {
return getPsiClass(((JetConstructor) declaration).getClassOrObject());
return getPsiClass(((JetConstructor) declaration).getContainingClassOrObject());
}
//noinspection unchecked
idea/idea-analysis/src/org/jetbrains/kotlin/idea/kdoc/KDocFinder.kt
+1 -1
View File
@@ -31,7 +31,7 @@ object KDocFinder {
var psiDeclaration = (declaration.getSource() as? PsiSourceElement)?.psi?.getNavigationElement()
// KDoc for primary constructor is located inside of its class KDoc
if (psiDeclaration is JetPrimaryConstructor) {
psiDeclaration = psiDeclaration.getClassOrObject()
psiDeclaration = psiDeclaration.getContainingClassOrObject()
}
if (psiDeclaration is JetDeclaration) {
idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/referenceUtil.kt
+1 -1
View File
@@ -104,7 +104,7 @@ private fun PsiElement.isConstructorOf(unwrappedCandidate: PsiElement) =
// call to Java constructor
(this is PsiMethod && isConstructor() && getContainingClass() == unwrappedCandidate) ||
// call to Kotlin constructor
(this is JetConstructor<*> && getClassOrObject() == unwrappedCandidate)
(this is JetConstructor<*> && getContainingClassOrObject() == unwrappedCandidate)
fun AbstractJetReference<out JetExpression>.renameImplicitConventionalCall(newName: String?): JetExpression {
if (newName == null) return expression
idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/utils.kt
+2 -2
View File
@@ -88,7 +88,7 @@ fun PsiReference.isConstructorUsage(jetClassOrObject: JetClassOrObject): Boolean
if (descriptor !is ConstructorDescriptor) return false
val declaration = DescriptorToSourceUtils.descriptorToDeclaration(descriptor.getContainingDeclaration())
return declaration == jetClassOrObject || (declaration is JetConstructor<*> && declaration.getClassOrObject() == jetClassOrObject)
return declaration == jetClassOrObject || (declaration is JetConstructor<*> && declaration.getContainingClassOrObject() == jetClassOrObject)
}
checkJavaUsage() || checkKotlinUsage()
@@ -120,7 +120,7 @@ public fun PsiElement.processDelegationCallConstructorUsages(scope: SearchScope,
private fun PsiElement.processDelegationCallKotlinConstructorUsages(scope: SearchScope, process: (JetConstructorDelegationCall) -> Unit) {
val element = unwrapped
val klass = when (element) {
is JetConstructor<*> -> element.getClassOrObject()
is JetConstructor<*> -> element.getContainingClassOrObject()
is JetClass -> element
else -> return
}
idea/src/org/jetbrains/kotlin/idea/presentation/JetFunctionPresenter.java
+1 -1
View File
@@ -61,7 +61,7 @@ public class JetFunctionPresenter implements ItemPresentationProvider<JetFunctio
@Override
public String getLocationString() {
if (function instanceof JetConstructor) {
FqName name = ((JetConstructor) function).getClassOrObject().getFqName();
FqName name = ((JetConstructor) function).getContainingClassOrObject().getFqName();
return name != null ? String.format("(in %s)", name) : "";
}
idea/src/org/jetbrains/kotlin/idea/quickfix/AddOpenModifierToClassDeclarationFix.java
+1 -1
View File
@@ -54,7 +54,7 @@ public class AddOpenModifierToClassDeclarationFix extends JetIntentionAction<Jet
if (reference != null) {
PsiElement target = reference.resolve();
if (target instanceof JetSecondaryConstructor) {
target = ((JetSecondaryConstructor) target).getClassOrObject();
target = ((JetSecondaryConstructor) target).getContainingClassOrObject();
}
if (target instanceof JetClass && QuickFixUtil.canModifyElement(target)) {
classDeclaration = (JetClass) target;
idea/src/org/jetbrains/kotlin/idea/quickfix/InsertDelegationCallQuickfix.kt
+2 -2
View File
@@ -62,7 +62,7 @@ public class InsertDelegationCallQuickfix(val isThis: Boolean, element: JetSecon
object InsertThisDelegationCallFactory : JetSingleIntentionActionFactory() {
override fun createAction(diagnostic: Diagnostic) = diagnostic.createIntentionForFirstParentOfType<JetSecondaryConstructor> {
secondaryConstructor ->
if (secondaryConstructor.getClassOrObject().getConstructorsCount() <= 1 ||
if (secondaryConstructor.getContainingClassOrObject().getConstructorsCount() <= 1 ||
!secondaryConstructor.hasImplicitDelegationCall()) return null
return InsertDelegationCallQuickfix(isThis = true, element = secondaryConstructor)
@@ -75,7 +75,7 @@ public class InsertDelegationCallQuickfix(val isThis: Boolean, element: JetSecon
override fun createAction(diagnostic: Diagnostic): IntentionAction? {
val secondaryConstructor = diagnostic.getPsiElement().getNonStrictParentOfType<JetSecondaryConstructor>() ?: return null
if (!secondaryConstructor.hasImplicitDelegationCall()) return null
val klass = secondaryConstructor.getClassOrObject() as? JetClass ?: return null
val klass = secondaryConstructor.getContainingClassOrObject() as? JetClass ?: return null
if (klass.hasPrimaryConstructor()) return null
return InsertDelegationCallQuickfix(isThis = false, element = secondaryConstructor)