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

IDEA-108072 (Don't suggest to add on-demand static import for the current class)

Browse Source
This commit is contained in:
Bas Leijdekkers
2014-03-06 19:15:40 +01:00
parent 8d6f72b2ca
commit 557cca9d2d
3 changed files with 32 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
java/java-impl/src/com/intellij/codeInsight/intention/impl/AddOnDemandStaticImportAction.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
* Copyright 2000-2014 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@ package com.intellij.codeInsight.intention.impl;
import com.intellij.codeInsight.CodeInsightBundle;
import com.intellij.codeInsight.FileModificationService;
import com.intellij.codeInsight.highlighting.HighlightManager;
import com.intellij.codeInsight.intention.PsiElementBaseIntentionAction;
import com.intellij.codeInsight.intention.BaseElementAtCaretIntentionAction;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.editor.colors.EditorColors;
@@ -39,7 +39,7 @@ import java.util.List;
/**
* @author ven
*/
public class AddOnDemandStaticImportAction extends PsiElementBaseIntentionAction {
public class AddOnDemandStaticImportAction extends BaseElementAtCaretIntentionAction {
private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.intention.impl.AddOnDemandStaticImportAction");
@Override
@@ -103,13 +103,16 @@ public class AddOnDemandStaticImportAction extends PsiElementBaseIntentionAction
if (aClass == null) {
return;
}
PsiImportStaticStatement importStaticStatement =
JavaPsiFacade.getInstance(file.getProject()).getElementFactory().createImportStaticStatement(aClass, "*");
PsiImportList importList = ((PsiJavaFile)file).getImportList();
if (importList == null) {
return;
final PsiClass containingClass = PsiUtil.getTopLevelClass(refExpr);
if (aClass != containingClass) {
PsiImportStaticStatement importStaticStatement =
JavaPsiFacade.getInstance(file.getProject()).getElementFactory().createImportStaticStatement(aClass, "*");
PsiImportList importList = ((PsiJavaFile)file).getImportList();
if (importList == null) {
return;
}
importList.add(importStaticStatement);
}
importList.add(importStaticStatement);
List<PsiFile> roots = file.getViewProvider().getAllFiles();
for (final PsiFile root : roots) {

10
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addOnDemandStaticImport/afterOwnMember.java Normal file
View File

@@ -0,0 +1,10 @@
// "Add on demand static import for 'test.Foo'" "true"
package test;
class Foo {
public static void m() {}
public static void main(String[] args) {
m();
}
}

10
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addOnDemandStaticImport/beforeOwnMember.java Normal file
View File

@@ -0,0 +1,10 @@
// "Add on demand static import for 'test.Foo'" "true"
package test;
class Foo {
public static void m() {}
public static void main(String[] args) {
Foo<caret>.m();
}
}