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

Use light element origin instead of getNavigationElement()

Browse Source
This commit is contained in:
Alexey Sedunov
2014-01-22 20:12:41 +04:00
parent 9eac148555
commit bb04c5fd95
8 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/psi/psiUtil/jetPsiUtil.kt
-3
View File
@@ -179,9 +179,6 @@ fun JetDeclaration.isOverridable(): Boolean {
hasModifier(JetTokens.ABSTRACT_KEYWORD) || hasModifier(JetTokens.OPEN_KEYWORD) || hasModifier(JetTokens.OVERRIDE_KEYWORD)
}
val PsiElement.namedNavigationElement: PsiNamedElement?
get() = getNavigationElement()?.getParentByType(javaClass<PsiNamedElement>())
fun PsiElement.isExtensionDeclaration(): Boolean {
val callable: JetCallableDeclaration? = when (this) {
is JetNamedFunction, is JetProperty -> this as JetCallableDeclaration
compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightTypeParameter.java
+4 -2
View File
@@ -21,7 +21,6 @@ import com.intellij.psi.impl.light.AbstractLightClass;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.psi.JetTypeParameter;
import org.jetbrains.jet.lang.psi.JetClass;
import org.jetbrains.jet.lang.psi.JetTypeParameterListOwner;
import org.jetbrains.jet.lang.resolve.java.jetAsJava.KotlinLightElement;
import org.jetbrains.jet.lang.resolve.java.jetAsJava.KotlinLightMethod;
@@ -52,7 +51,10 @@ public class KotlinLightTypeParameter
@NotNull
@Override
public JetTypeParameter getOrigin() {
return ((JetTypeParameterListOwner) owner.getNavigationElement()).getTypeParameters().get(index);
JetTypeParameterListOwner jetOwner = (JetTypeParameterListOwner) AsJavaPackage.getUnwrapped(owner);
assert (jetOwner != null) : "Invalid type parameter owner: " + owner;
return jetOwner.getTypeParameters().get(index);
}
@NotNull
compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/lightClassUtils.kt
+10 -1
View File
@@ -34,6 +34,8 @@ import com.intellij.psi.PsiTypeParameter
import java.util.ArrayList
import org.jetbrains.jet.lang.psi.JetTypeParameterList
import com.intellij.psi.PsiTypeParameterListOwner
import org.jetbrains.jet.lang.resolve.java.jetAsJava.KotlinLightElement
import com.intellij.psi.PsiNamedElement
import com.intellij.psi.PsiNamedElement
import org.jetbrains.jet.lang.psi.JetCallableDeclaration
import org.jetbrains.jet.lang.psi.psiUtil.isExtensionDeclaration
@@ -104,4 +106,11 @@ fun JetTypeParameter.toPsiTypeParameters(): List<PsiTypeParameter> {
return lightOwners?.map { lightOwner -> (lightOwner as PsiTypeParameterListOwner).getTypeParameters()[paramIndex] }
?: Collections.emptyList()
}
}
// Returns original declaration if given PsiElement is a Kotlin light element, and element itself otherwise
val PsiElement.unwrapped: PsiElement?
get() = if (this is KotlinLightElement<*, *>) origin else this
val PsiElement.namedUnwrappedElement: PsiNamedElement?
get() = unwrapped?.getParentByType(javaClass<PsiNamedElement>())
idea/src/org/jetbrains/jet/plugin/findUsages/JetElementDescriptionProvider.kt
+2 -1
View File
@@ -26,12 +26,13 @@ import org.jetbrains.jet.lang.psi.*
import org.jetbrains.jet.lang.resolve.java.jetAsJava.KotlinLightMethod
import org.jetbrains.jet.asJava.KotlinLightClass
import org.jetbrains.jet.lang.psi.psiUtil.getParentByType
import org.jetbrains.jet.asJava.unwrapped
import org.jetbrains.jet.plugin.search.usagesSearch.descriptor
import org.jetbrains.jet.lang.resolve.DescriptorUtils
public class JetElementDescriptionProvider : ElementDescriptionProvider {
public override fun getElementDescription(element: PsiElement, location: ElementDescriptionLocation): String? {
val targetElement = element.getNavigationElement()
val targetElement = element.unwrapped
fun elementKind() = when (targetElement) {
is JetClass -> if (targetElement.isTrait()) "trait" else "class"
idea/src/org/jetbrains/jet/plugin/hierarchy/overrides/KotlinOverrideHierarchyBrowser.kt
+2 -1
View File
@@ -30,6 +30,7 @@ import java.text.MessageFormat
import com.intellij.psi.ElementDescriptionUtil
import com.intellij.refactoring.util.RefactoringDescriptionLocation
import org.jetbrains.jet.lang.psi.JetDeclaration
import org.jetbrains.jet.asJava.unwrapped
class KotlinOverrideHierarchyBrowser(
project: Project, baseElement: PsiElement
@@ -56,7 +57,7 @@ class KotlinOverrideHierarchyBrowser(
}
override fun getContentDisplayName(typeName: String, element: PsiElement): String? {
val targetElement = element.getNavigationElement()
val targetElement = element.unwrapped
if (targetElement is JetDeclaration) {
return ElementDescriptionUtil.getElementDescription(targetElement, RefactoringDescriptionLocation.WITHOUT_PARENT)
}
idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinSafeDeleteProcessor.java
+3 -1
View File
@@ -239,7 +239,9 @@ public class KotlinSafeDeleteProcessor extends JavaSafeDeleteProcessor {
PsiElement usageElement = javaDeleteUsageInfo.getElement();
JetImportDirective importDirective = PsiTreeUtil.getParentOfType(usageElement, JetImportDirective.class, false);
if (importDirective != null) {
usageInfo = new SafeDeleteImportDirectiveUsageInfo(importDirective, (JetDeclaration) element.getNavigationElement());
usageInfo = new SafeDeleteImportDirectiveUsageInfo(
importDirective, (JetDeclaration) AsJavaPackage.getUnwrapped(element)
);
}
}
if (usageInfo != null) {
idea/src/org/jetbrains/jet/plugin/references/JetPsiReference.java
+3 -4
View File
@@ -25,11 +25,10 @@ import com.intellij.util.IncorrectOperationException;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.asJava.AsJavaPackage;
import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor;
import org.jetbrains.jet.lang.psi.JetNamedDeclaration;
import org.jetbrains.jet.lang.psi.JetReferenceExpression;
import org.jetbrains.jet.lang.psi.psiUtil.PsiUtilPackage;
import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.resolve.BindingContextUtils;
import org.jetbrains.jet.plugin.project.AnalyzerFacadeWithCache;
@@ -94,8 +93,8 @@ public abstract class JetPsiReference implements PsiPolyVariantReference {
PsiElement resolvedElement = resolve();
if (resolvedElement == null) return false;
PsiNamedElement namedDeclaration = PsiUtilPackage.getNamedNavigationElement(element);
PsiNamedElement namedResolvedDeclaration = PsiUtilPackage.getNamedNavigationElement(resolvedElement);
PsiNamedElement namedDeclaration = AsJavaPackage.getNamedUnwrappedElement(element);
PsiNamedElement namedResolvedDeclaration = AsJavaPackage.getNamedUnwrappedElement(resolvedElement);
return namedDeclaration != null && namedDeclaration.equals(namedResolvedDeclaration);
}
idea/src/org/jetbrains/jet/plugin/search/usagesSearch/utils.kt
+5 -4
View File
@@ -44,12 +44,13 @@ import org.jetbrains.jet.lang.resolve.java.JvmAbi
import org.jetbrains.jet.codegen.PropertyCodegen
import org.jetbrains.jet.lang.descriptors.PropertyDescriptor
import org.jetbrains.jet.lang.resolve.java.jetAsJava.KotlinLightMethod
import org.jetbrains.jet.asJava.unwrapped
// Navigation element of the resolved reference
// For property accessor return enclosing property
val PsiReference.navigationTarget: PsiElement?
val PsiReference.unwrappedTarget: PsiElement?
get() {
val target = resolve()?.getNavigationElement()
val target = resolve()?.unwrapped
return if (target is JetPropertyAccessor) target.getParentByType(javaClass<JetProperty>()) else target
}
@@ -60,7 +61,7 @@ val JetParameter.propertyDescriptor: PropertyDescriptor?
get() = AnalyzerFacadeWithCache.getContextForElement(this).get(BindingContext.PRIMARY_CONSTRUCTOR_PARAMETER, this)
fun PsiReference.isTargetUsage(target: PsiElement): Boolean {
return target.getNavigationElement() == navigationTarget
return target.unwrapped == unwrappedTarget
}
fun PsiReference.checkUsageVsOriginalDescriptor(
@@ -68,7 +69,7 @@ fun PsiReference.checkUsageVsOriginalDescriptor(
declarationToDescriptor: (JetDeclaration) -> DeclarationDescriptor? = {it.descriptor},
checker: (usageDescriptor: DeclarationDescriptor, targetDescriptor: DeclarationDescriptor) -> Boolean
): Boolean {
val refTarget = navigationTarget
val refTarget = unwrappedTarget
if (refTarget !is JetDeclaration) return false
val usageDescriptor = declarationToDescriptor(refTarget)