From 8696944c863c1ddc6f5d23e003da2c031e56d910 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Fri, 8 Aug 2014 16:50:49 +0400 Subject: [PATCH] Fix KotlinSignature line markers in decompiled classes --- .../plugin/ktSignature/KotlinSignatureUtil.java | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureUtil.java b/idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureUtil.java index 361beb77572..a2028e9a71e 100644 --- a/idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureUtil.java +++ b/idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureUtil.java @@ -18,12 +18,10 @@ package org.jetbrains.jet.plugin.ktSignature; import com.intellij.codeInsight.ExternalAnnotationsManager; import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer; -import com.intellij.lang.ASTNode; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.*; import com.intellij.psi.impl.compiled.ClsElementImpl; -import com.intellij.psi.impl.source.SourceTreeToPsiMap; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.resolve.java.resolver.PsiBasedExternalAnnotationResolver; @@ -38,16 +36,13 @@ class KotlinSignatureUtil { @NotNull static PsiModifierListOwner getAnnotationOwner(@NotNull PsiElement element) { PsiModifierListOwner annotationOwner = element.getOriginalElement() instanceof PsiModifierListOwner - ? (PsiModifierListOwner) element.getOriginalElement() - : (PsiModifierListOwner) element; + ? (PsiModifierListOwner) element.getOriginalElement() + : (PsiModifierListOwner) element; if (!annotationOwner.isPhysical()) { // this is fake PsiFile which is mirror for ClsFile without sources - ASTNode node = SourceTreeToPsiMap.psiElementToTree(element); - if (node != null) { - PsiCompiledElement compiledElement = node.getUserData(ClsElementImpl.COMPILED_ELEMENT); - if (compiledElement instanceof PsiModifierListOwner) { - return (PsiModifierListOwner) compiledElement; - } + PsiCompiledElement compiledElement = element.getUserData(ClsElementImpl.COMPILED_ELEMENT); + if (compiledElement instanceof PsiModifierListOwner) { + return (PsiModifierListOwner) compiledElement; } } return annotationOwner;