mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
disable add static import intention for classes in default package (->IDEA-26971 )
This commit is contained in:
+3
@@ -24,6 +24,8 @@ import com.intellij.openapi.editor.Editor;
|
||||
import com.intellij.openapi.editor.colors.EditorColors;
|
||||
import com.intellij.openapi.editor.colors.EditorColorsManager;
|
||||
import com.intellij.openapi.project.Project;
|
||||
import com.intellij.openapi.util.Comparing;
|
||||
import com.intellij.openapi.util.text.StringUtil;
|
||||
import com.intellij.psi.*;
|
||||
import com.intellij.psi.util.PsiTreeUtil;
|
||||
import com.intellij.psi.util.PsiUtil;
|
||||
@@ -65,6 +67,7 @@ public class AddOnDemandStaticImportAction extends PsiElementBaseIntentionAction
|
||||
return null;
|
||||
}
|
||||
PsiClass psiClass = (PsiClass)resolved;
|
||||
if (Comparing.strEqual(psiClass.getName(), psiClass.getQualifiedName())) return null;
|
||||
PsiFile file = refExpr.getContainingFile();
|
||||
if (!(file instanceof PsiJavaFile)) return null;
|
||||
PsiImportList importList = ((PsiJavaFile)file).getImportList();
|
||||
|
||||
+3
-1
@@ -25,7 +25,9 @@ import com.intellij.codeInsight.intention.PsiElementBaseIntentionAction;
|
||||
import com.intellij.openapi.diagnostic.Logger;
|
||||
import com.intellij.openapi.editor.Editor;
|
||||
import com.intellij.openapi.project.Project;
|
||||
import com.intellij.openapi.util.Comparing;
|
||||
import com.intellij.openapi.util.Key;
|
||||
import com.intellij.openapi.util.text.StringUtil;
|
||||
import com.intellij.psi.*;
|
||||
import com.intellij.psi.util.PsiTreeUtil;
|
||||
import com.intellij.psi.util.PsiUtil;
|
||||
@@ -63,7 +65,7 @@ public class AddSingleMemberStaticImportAction extends PsiElementBaseIntentionAc
|
||||
PsiClass aClass = ((PsiMember)resolved).getContainingClass();
|
||||
if (aClass != null && !PsiTreeUtil.isAncestor(aClass, element, true)) {
|
||||
String qName = aClass.getQualifiedName();
|
||||
if (qName != null) {
|
||||
if (qName != null && !Comparing.strEqual(qName, aClass.getName())) {
|
||||
qName = qName + "." +refExpr.getReferenceName();
|
||||
if (file instanceof PsiJavaFile) {
|
||||
PsiImportList importList = ((PsiJavaFile)file).getImportList();
|
||||
|
||||
Reference in New Issue
Block a user