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

Fix KotlinSignature line markers in decompiled classes

Browse Source
This commit is contained in:
Pavel V. Talanov
2014-08-08 16:50:49 +04:00
parent 84c9ef5ee6
commit 8696944c86
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureUtil.java
+5 -10
View File
@@ -18,12 +18,10 @@ package org.jetbrains.jet.plugin.ktSignature;
import com.intellij.codeInsight.ExternalAnnotationsManager; import com.intellij.codeInsight.ExternalAnnotationsManager;
import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer; import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer;
import com.intellij.lang.ASTNode;
import com.intellij.openapi.project.Project; import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.*; import com.intellij.psi.*;
import com.intellij.psi.impl.compiled.ClsElementImpl; import com.intellij.psi.impl.compiled.ClsElementImpl;
import com.intellij.psi.impl.source.SourceTreeToPsiMap;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.resolve.java.resolver.PsiBasedExternalAnnotationResolver; import org.jetbrains.jet.lang.resolve.java.resolver.PsiBasedExternalAnnotationResolver;
@@ -38,16 +36,13 @@ class KotlinSignatureUtil {
@NotNull @NotNull
static PsiModifierListOwner getAnnotationOwner(@NotNull PsiElement element) { static PsiModifierListOwner getAnnotationOwner(@NotNull PsiElement element) {
PsiModifierListOwner annotationOwner = element.getOriginalElement() instanceof PsiModifierListOwner PsiModifierListOwner annotationOwner = element.getOriginalElement() instanceof PsiModifierListOwner
? (PsiModifierListOwner) element.getOriginalElement() ? (PsiModifierListOwner) element.getOriginalElement()
: (PsiModifierListOwner) element; : (PsiModifierListOwner) element;
if (!annotationOwner.isPhysical()) { if (!annotationOwner.isPhysical()) {
// this is fake PsiFile which is mirror for ClsFile without sources // this is fake PsiFile which is mirror for ClsFile without sources
ASTNode node = SourceTreeToPsiMap.psiElementToTree(element); PsiCompiledElement compiledElement = element.getUserData(ClsElementImpl.COMPILED_ELEMENT);
if (node != null) { if (compiledElement instanceof PsiModifierListOwner) {
PsiCompiledElement compiledElement = node.getUserData(ClsElementImpl.COMPILED_ELEMENT); return (PsiModifierListOwner) compiledElement;
if (compiledElement instanceof PsiModifierListOwner) {
return (PsiModifierListOwner) compiledElement;
}
} }
} }
return annotationOwner; return annotationOwner;