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-impl/src/com/intellij/codeInsight/ExternalAnnotationsLineMarkerProvider.java
+2 -1
View File
@@ -39,6 +39,7 @@ import com.intellij.openapi.ui.popup.JBPopup;
import com.intellij.openapi.ui.popup.JBPopupFactory;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.*;
import com.intellij.psi.util.PsiUtil;
import com.intellij.psi.util.PsiUtilCore;
import com.intellij.ui.awt.RelativePoint;
import com.intellij.util.Function;
@@ -138,7 +139,7 @@ public class ExternalAnnotationsLineMarkerProvider extends LineMarkerProviderDes
}
static boolean isSourceCode(PsiModifierListOwner element) {
return !(BaseExternalAnnotationsManager.preferCompiledElement(element) instanceof PsiCompiledElement);
return !(PsiUtil.preferCompiledElement(element) instanceof PsiCompiledElement);
}
private static boolean isVisibleAnnotation(@NotNull PsiAnnotation annotation) {
java/java-impl/src/com/intellij/codeInspection/dataFlow/DataFlowInspection.java
+1 -1
View File
@@ -194,4 +194,4 @@ public class DataFlowInspection extends DataFlowInspectionBase {
}
}
}
}