MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 06:05:01 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'db/javac-ast'

Browse Source 
# Conflicts:
#	platform/util/resources/misc/registry.properties
This commit is contained in:
Dmitry Batkovich
2016-10-17 19:05:41 +03:00
parent 33a22cef22 c0453adfe8
commit 1bc12672eb
126 changed files with 4753 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-impl/src/com/intellij/codeInsight/BaseExternalAnnotationsManager.java
+2 -7
View File
@@ -28,6 +28,7 @@ import com.intellij.pom.java.LanguageLevel;
import com.intellij.psi.*;
import com.intellij.psi.impl.source.*;
import com.intellij.psi.util.PsiFormatUtil;
import com.intellij.psi.util.PsiUtil;
import com.intellij.testFramework.LightVirtualFile;
import com.intellij.util.Function;
import com.intellij.util.IncorrectOperationException;
@@ -78,12 +79,6 @@ public abstract class BaseExternalAnnotationsManager extends ExternalAnnotations
return PsiFormatUtil.getExternalName(listOwner, showParamName, Integer.MAX_VALUE);
}
@NotNull
static PsiModifierListOwner preferCompiledElement(@NotNull PsiModifierListOwner element) {
PsiElement original = element.getOriginalElement();
return original instanceof PsiModifierListOwner ? (PsiModifierListOwner)original : element;
}
protected abstract boolean hasAnyAnnotationsRoots();
@Override
@@ -226,7 +221,7 @@ public abstract class BaseExternalAnnotationsManager extends ExternalAnnotations
@Override
@Nullable
public List<PsiFile> findExternalAnnotationsFiles(@NotNull PsiModifierListOwner listOwner) {
final PsiFile containingFile = preferCompiledElement(listOwner).getContainingFile();
final PsiFile containingFile = PsiUtil.preferCompiledElement(listOwner).getContainingFile();
if (!(containingFile instanceof PsiJavaFile)) return null;
final VirtualFile virtualFile = containingFile.getVirtualFile();