From 066b45461c2872d74f2ab44f3cd286fc9c027980 Mon Sep 17 00:00:00 2001 From: Nikolay Mikhaylov Date: Thu, 19 May 2016 11:14:19 +0300 Subject: [PATCH 1/6] fix: IDEA-154111 Create Test dialog: for not found Arquillian library the suggested Fix is incorrect --- .../library/RepositoryAddLibraryAction.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/library/RepositoryAddLibraryAction.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/library/RepositoryAddLibraryAction.java index 456d976ca87d..58cbc221ffe5 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/library/RepositoryAddLibraryAction.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/library/RepositoryAddLibraryAction.java @@ -37,12 +37,16 @@ public class RepositoryAddLibraryAction extends IntentionAndQuickFixAction { @Override public void applyFix(@NotNull Project project, PsiFile file, @Nullable Editor editor) { + addLibraryToModule(libraryDescription, module); + } + + public static void addLibraryToModule(RepositoryLibraryDescription libraryDescription, Module module) { RepositoryLibraryPropertiesModel model = new RepositoryLibraryPropertiesModel( RepositoryUtils.DefaultVersionId, false, false); RepositoryLibraryPropertiesDialog dialog = new RepositoryLibraryPropertiesDialog( - project, + module.getProject(), model, libraryDescription, false); @@ -51,14 +55,12 @@ public class RepositoryAddLibraryAction extends IntentionAndQuickFixAction { } IdeaModifiableModelsProvider modifiableModelsProvider = new IdeaModifiableModelsProvider(); final ModifiableRootModel modifiableModel = modifiableModelsProvider.getModuleModifiableModel(module); - RepositoryLibrarySupport librarySupport = new RepositoryLibrarySupport(project, libraryDescription, model); + RepositoryLibrarySupport librarySupport = new RepositoryLibrarySupport(module.getProject(), libraryDescription, model); assert modifiableModel != null; librarySupport.addSupport( - module, - modifiableModel, - modifiableModelsProvider); - ApplicationManager.getApplication().runWriteAction(() -> { - modifiableModel.commit(); - }); + module, + modifiableModel, + modifiableModelsProvider); + ApplicationManager.getApplication().runWriteAction(modifiableModel::commit); } } From f1c0605e71f96106a9fc4a36131e16ca973feecc Mon Sep 17 00:00:00 2001 From: nik Date: Thu, 19 May 2016 11:39:29 +0300 Subject: [PATCH 2/6] devkit: added missing apostrophe to inspection message --- plugins/devkit/src/inspections/PluginXmlDomInspection.java | 2 +- .../testData/codeInsight/pluginWithBranchNumberInUntilBuild.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/devkit/src/inspections/PluginXmlDomInspection.java b/plugins/devkit/src/inspections/PluginXmlDomInspection.java index 04b2402a47eb..3622a6a74f07 100644 --- a/plugins/devkit/src/inspections/PluginXmlDomInspection.java +++ b/plugins/devkit/src/inspections/PluginXmlDomInspection.java @@ -163,7 +163,7 @@ public class PluginXmlDomInspection extends BasicDomElementsInspection test - 145"/> + 145"/> From 1d157152c12f0b28bf729a241eaa74dc8cebf2cf Mon Sep 17 00:00:00 2001 From: peter Date: Thu, 19 May 2016 09:47:33 +0200 Subject: [PATCH 3/6] IDEA-156259 idea.log spammed by "PerformanceWatcher - High memory usage" --- .../com/intellij/diagnostic/PerformanceWatcher.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/platform/core-impl/src/com/intellij/diagnostic/PerformanceWatcher.java b/platform/core-impl/src/com/intellij/diagnostic/PerformanceWatcher.java index e516d80eff30..306682229cbf 100644 --- a/platform/core-impl/src/com/intellij/diagnostic/PerformanceWatcher.java +++ b/platform/core-impl/src/com/intellij/diagnostic/PerformanceWatcher.java @@ -292,12 +292,13 @@ public class PerformanceWatcher implements ApplicationComponent { } private static void checkMemoryUsage(File file) { - final Runtime rt = Runtime.getRuntime(); - final long allocatedMem = rt.maxMemory(); - final long unusedMem = rt.freeMemory(); - if (unusedMem < allocatedMem / 5) { - LOG.info("High memory usage (free " + unusedMem / 1024 / 1024 + - " of " + allocatedMem / 1024 / 1024 + + Runtime rt = Runtime.getRuntime(); + long maxMemory = rt.maxMemory(); + long usedMemory = rt.totalMemory() - rt.freeMemory(); + long freeMemory = maxMemory - usedMemory; + if (freeMemory < maxMemory / 5) { + LOG.info("High memory usage (free " + freeMemory / 1024 / 1024 + + " of " + maxMemory / 1024 / 1024 + " MB) while dumping threads to " + file); } } From 7d2e7801e2fdc6939a168f04ef8da8765fd44822 Mon Sep 17 00:00:00 2001 From: peter Date: Thu, 19 May 2016 10:32:06 +0200 Subject: [PATCH 4/6] avoid NPE in FileManagerImpl.markInvalidated --- .../com/intellij/psi/impl/file/impl/FileManagerImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/platform/core-impl/src/com/intellij/psi/impl/file/impl/FileManagerImpl.java b/platform/core-impl/src/com/intellij/psi/impl/file/impl/FileManagerImpl.java index 66288e3c2cb0..1b2589f7a714 100644 --- a/platform/core-impl/src/com/intellij/psi/impl/file/impl/FileManagerImpl.java +++ b/platform/core-impl/src/com/intellij/psi/impl/file/impl/FileManagerImpl.java @@ -465,7 +465,9 @@ public class FileManagerImpl implements FileManager { } else { FileViewProvider viewProvider = myVFileToViewProviderMap.remove(file); - markInvalidated(viewProvider); + if (viewProvider != null) { + markInvalidated(viewProvider); + } } return true; } @@ -476,7 +478,7 @@ public class FileManagerImpl implements FileManager { } } - private void markInvalidated(FileViewProvider viewProvider) { + private void markInvalidated(@NotNull FileViewProvider viewProvider) { if (viewProvider instanceof SingleRootFileViewProvider) { ((SingleRootFileViewProvider)viewProvider).markInvalidated(); } From 3039f8117b67b22719efb3bbcaf134bb53ba2f9b Mon Sep 17 00:00:00 2001 From: peter Date: Thu, 19 May 2016 10:37:37 +0200 Subject: [PATCH 5/6] support external @Deprecated annotation for cls class & field (IDEA-CR-10878) --- .../src/com/intellij/psi/impl/compiled/ClsClassImpl.java | 2 +- .../src/com/intellij/psi/impl/compiled/ClsFieldImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsClassImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsClassImpl.java index b92575878c25..1b18fede5e3e 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsClassImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsClassImpl.java @@ -273,7 +273,7 @@ public class ClsClassImpl extends ClsMemberImpl> implements PsiE @Override public boolean isDeprecated() { - return getStub().isDeprecated(); + return getStub().isDeprecated() || PsiImplUtil.isDeprecatedByAnnotation(this); } public String getSourceFileName() { diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsFieldImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsFieldImpl.java index 758ffe1fa33f..e775d281b5f3 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsFieldImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsFieldImpl.java @@ -143,7 +143,7 @@ public class ClsFieldImpl extends ClsMemberImpl implements PsiFiel @Override public boolean isDeprecated() { - return getStub().isDeprecated(); + return getStub().isDeprecated() || PsiImplUtil.isDeprecatedByAnnotation(this); } @Override From 3bea588f19f634c80e220b44023cd3abe3ea5fcf Mon Sep 17 00:00:00 2001 From: peter Date: Thu, 19 May 2016 10:43:32 +0200 Subject: [PATCH 6/6] reuse PsiClassListCellRenderer instance --- .../com/intellij/codeInsight/daemon/impl/MarkerType.java | 2 +- .../daemon/impl/quickfix/CreateFromUsageBaseFix.java | 2 +- .../impl/quickfix/CreateInnerClassFromUsageFix.java | 2 +- .../daemon/impl/quickfix/PullAsAbstractUpFix.java | 2 +- .../highlighting/ChooseClassAndDoHighlightRunnable.java | 2 +- .../codeInsight/hint/actions/ShowSiblingsAction.java | 3 +-- .../intention/impl/ImplementAbstractMethodHandler.java | 9 ++------- .../navigation/JavaGotoTargetRendererProvider.java | 2 +- .../src/com/intellij/ide/util/MethodCellRenderer.java | 5 ++--- .../util/MethodOrFunctionalExpressionCellRenderer.java | 4 ++-- .../com/intellij/ide/util/PsiClassListCellRenderer.java | 2 ++ .../extractMethod/ExtractMethodProcessor.java | 2 +- .../introduceField/BaseExpressionToFieldHandler.java | 2 +- .../refactoring/introduceField/LocalToFieldHandler.java | 2 +- .../introduceParameter/IntroduceParameterHandler.java | 2 +- .../createTest/GenerateMissedTestsAction.java | 2 +- .../annotator/intentions/GrCreateFromUsageBaseFix.java | 2 +- .../introduce/GrIntroduceFieldHandlerBase.java | 2 +- 18 files changed, 22 insertions(+), 27 deletions(-) diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/MarkerType.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/MarkerType.java index c8747fdc82fa..f1d440c11b2a 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/MarkerType.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/MarkerType.java @@ -333,7 +333,7 @@ public class MarkerType { return null; } - Comparator comparator = new PsiClassListCellRenderer().getComparator(); + Comparator comparator = PsiClassListCellRenderer.INSTANCE.getComparator(); Arrays.sort(subclasses, comparator); String start = aClass.isInterface() diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFromUsageBaseFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFromUsageBaseFix.java index 5531d26b1999..ced50080700f 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFromUsageBaseFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFromUsageBaseFix.java @@ -120,7 +120,7 @@ public abstract class CreateFromUsageBaseFix extends BaseIntentionAction { final Project project = firstClass.getProject(); final JList list = new JBList(classes); - PsiElementListCellRenderer renderer = new PsiClassListCellRenderer(); + PsiElementListCellRenderer renderer = PsiClassListCellRenderer.INSTANCE; list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); list.setCellRenderer(renderer); final PopupChooserBuilder builder = new PopupChooserBuilder(list); diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateInnerClassFromUsageFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateInnerClassFromUsageFix.java index 7373756a2fad..3de712103c66 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateInnerClassFromUsageFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateInnerClassFromUsageFix.java @@ -103,7 +103,7 @@ public class CreateInnerClassFromUsageFix extends CreateClassFromUsageBaseFix { final Project project = classes[0].getProject(); final JList list = new JBList(classes); - PsiElementListCellRenderer renderer = new PsiClassListCellRenderer(); + PsiElementListCellRenderer renderer = PsiClassListCellRenderer.INSTANCE; list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); list.setCellRenderer(renderer); final PopupChooserBuilder builder = new PopupChooserBuilder(list); diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/PullAsAbstractUpFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/PullAsAbstractUpFix.java index f079ffa1dc2d..8630e94a1f41 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/PullAsAbstractUpFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/PullAsAbstractUpFix.java @@ -99,7 +99,7 @@ public class PullAsAbstractUpFix extends LocalQuickFixAndIntentionActionOnPsiEle pullUp(method, containingClass, classesToPullUp.iterator().next()); } else if (editor != null) { - NavigationUtil.getPsiElementPopup(classesToPullUp.toArray(new PsiClass[classesToPullUp.size()]), new PsiClassListCellRenderer(), + NavigationUtil.getPsiElementPopup(classesToPullUp.toArray(new PsiClass[classesToPullUp.size()]), PsiClassListCellRenderer.INSTANCE, "Choose super class", new PsiElementProcessor() { @Override diff --git a/java/java-impl/src/com/intellij/codeInsight/highlighting/ChooseClassAndDoHighlightRunnable.java b/java/java-impl/src/com/intellij/codeInsight/highlighting/ChooseClassAndDoHighlightRunnable.java index fbf34384abde..fd70c98dd457 100644 --- a/java/java-impl/src/com/intellij/codeInsight/highlighting/ChooseClassAndDoHighlightRunnable.java +++ b/java/java-impl/src/com/intellij/codeInsight/highlighting/ChooseClassAndDoHighlightRunnable.java @@ -44,6 +44,6 @@ public abstract class ChooseClassAndDoHighlightRunnable extends ChooseOneOrAllRu @Override protected PsiElementListCellRenderer createRenderer() { - return new PsiClassListCellRenderer(); + return PsiClassListCellRenderer.INSTANCE; } } diff --git a/java/java-impl/src/com/intellij/codeInsight/hint/actions/ShowSiblingsAction.java b/java/java-impl/src/com/intellij/codeInsight/hint/actions/ShowSiblingsAction.java index 2993d34ed5a6..937a27572eeb 100644 --- a/java/java-impl/src/com/intellij/codeInsight/hint/actions/ShowSiblingsAction.java +++ b/java/java-impl/src/com/intellij/codeInsight/hint/actions/ShowSiblingsAction.java @@ -28,7 +28,6 @@ import com.intellij.psi.*; import com.intellij.psi.impl.FindSuperElementsHelper; import com.intellij.psi.presentation.java.SymbolPresentationUtil; import com.intellij.psi.util.PsiTreeUtil; -import com.intellij.util.Consumer; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; @@ -63,7 +62,7 @@ public class ShowSiblingsAction extends ShowImplementationsAction { final boolean isMethod = superElements[0] instanceof PsiMethod; NavigatablePsiElement[] navigatablePsiElements = ContainerUtil.findAllAsArray(superElements, NavigatablePsiElement.class); final JBPopup popup = PsiElementListNavigator.navigateOrCreatePopup(navigatablePsiElements, "Choose super " + (isMethod ? "method" : "class or interface"), "Super " + (isMethod ? "methods" : "classes/interfaces"), - isMethod ? new MethodCellRenderer(false) : new PsiClassListCellRenderer(), null, + isMethod ? new MethodCellRenderer(false) : PsiClassListCellRenderer.INSTANCE, null, objects -> showSiblings(invokedByShortcut, project, editor, file, editor != null, (PsiElement)objects[0])); if (popup != null) { if (editor != null) { diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/ImplementAbstractMethodHandler.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/ImplementAbstractMethodHandler.java index 0086d270d826..8ca355eed586 100644 --- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/ImplementAbstractMethodHandler.java +++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/ImplementAbstractMethodHandler.java @@ -178,14 +178,9 @@ public class ImplementAbstractMethodHandler { } private static class MyPsiElementListCellRenderer extends PsiElementListCellRenderer { - private final PsiClassListCellRenderer myRenderer; - - public MyPsiElementListCellRenderer() { - myRenderer = new PsiClassListCellRenderer(); - } void sort(PsiElement[] result) { - final Comparator comparator = myRenderer.getComparator(); + final Comparator comparator = PsiClassListCellRenderer.INSTANCE.getComparator(); Arrays.sort(result, (o1, o2) -> { if (o1 instanceof PsiEnumConstant && o2 instanceof PsiEnumConstant) { return ((PsiEnumConstant)o1).getName().compareTo(((PsiEnumConstant)o2).getName()); @@ -198,7 +193,7 @@ public class ImplementAbstractMethodHandler { @Override public String getElementText(PsiElement element) { - return element instanceof PsiClass ? myRenderer.getElementText((PsiClass)element) + return element instanceof PsiClass ? PsiClassListCellRenderer.INSTANCE.getElementText((PsiClass)element) : ((PsiEnumConstant)element).getName(); } diff --git a/java/java-impl/src/com/intellij/codeInsight/navigation/JavaGotoTargetRendererProvider.java b/java/java-impl/src/com/intellij/codeInsight/navigation/JavaGotoTargetRendererProvider.java index d8c3edac662d..8c963ffcd71e 100644 --- a/java/java-impl/src/com/intellij/codeInsight/navigation/JavaGotoTargetRendererProvider.java +++ b/java/java-impl/src/com/intellij/codeInsight/navigation/JavaGotoTargetRendererProvider.java @@ -33,7 +33,7 @@ public class JavaGotoTargetRendererProvider implements GotoTargetRendererProvide return new MethodCellRenderer(gotoData.hasDifferentNames()); } else if (element instanceof PsiClass) { - return new PsiClassListCellRenderer(); + return PsiClassListCellRenderer.INSTANCE; } return null; } diff --git a/java/java-impl/src/com/intellij/ide/util/MethodCellRenderer.java b/java/java-impl/src/com/intellij/ide/util/MethodCellRenderer.java index 72fcbda6979c..10a140bec5a4 100644 --- a/java/java-impl/src/com/intellij/ide/util/MethodCellRenderer.java +++ b/java/java-impl/src/com/intellij/ide/util/MethodCellRenderer.java @@ -23,7 +23,6 @@ import javax.swing.*; public class MethodCellRenderer extends PsiElementListCellRenderer{ private final boolean myShowMethodNames; - private final PsiClassListCellRenderer myClassListCellRenderer = new PsiClassListCellRenderer(); @PsiFormatUtil.FormatMethodOptions private final int myOptions; @@ -37,7 +36,7 @@ public class MethodCellRenderer extends PsiElementListCellRenderer{ public String getElementText(PsiMethod element) { final PsiNamedElement container = fetchContainer(element); - String text = container instanceof PsiClass ? myClassListCellRenderer.getElementText((PsiClass)container) : container.getName(); + String text = container instanceof PsiClass ? PsiClassListCellRenderer.INSTANCE.getElementText((PsiClass)container) : container.getName(); if (myShowMethodNames) { text += "."+PsiFormatUtil.formatMethod(element, PsiSubstitutor.EMPTY, myOptions, PsiFormatUtilBase.SHOW_TYPE); } @@ -58,6 +57,6 @@ public class MethodCellRenderer extends PsiElementListCellRenderer{ } public int getIconFlags() { - return myClassListCellRenderer.getIconFlags(); + return PsiClassListCellRenderer.INSTANCE.getIconFlags(); } } diff --git a/java/java-impl/src/com/intellij/ide/util/MethodOrFunctionalExpressionCellRenderer.java b/java/java-impl/src/com/intellij/ide/util/MethodOrFunctionalExpressionCellRenderer.java index 9d682af37f6a..2a4bb5aaea92 100644 --- a/java/java-impl/src/com/intellij/ide/util/MethodOrFunctionalExpressionCellRenderer.java +++ b/java/java-impl/src/com/intellij/ide/util/MethodOrFunctionalExpressionCellRenderer.java @@ -23,7 +23,7 @@ import com.intellij.psi.util.PsiFormatUtilBase; import javax.swing.*; public class MethodOrFunctionalExpressionCellRenderer extends PsiElementListCellRenderer { - private final PsiClassListCellRenderer myClassListCellRenderer = new PsiClassListCellRenderer(); + private final PsiClassListCellRenderer myClassListCellRenderer = PsiClassListCellRenderer.INSTANCE; private final MethodCellRenderer myMethodCellRenderer; public MethodOrFunctionalExpressionCellRenderer(boolean showMethodNames) { @@ -48,6 +48,6 @@ public class MethodOrFunctionalExpressionCellRenderer extends PsiElementListCell } public int getIconFlags() { - return myClassListCellRenderer.getIconFlags(); + return PsiClassListCellRenderer.INSTANCE.getIconFlags(); } } diff --git a/java/java-impl/src/com/intellij/ide/util/PsiClassListCellRenderer.java b/java/java-impl/src/com/intellij/ide/util/PsiClassListCellRenderer.java index 53e239fd91b2..76260aefe4f6 100644 --- a/java/java-impl/src/com/intellij/ide/util/PsiClassListCellRenderer.java +++ b/java/java-impl/src/com/intellij/ide/util/PsiClassListCellRenderer.java @@ -20,6 +20,8 @@ import com.intellij.psi.presentation.java.ClassPresentationUtil; import org.jetbrains.annotations.Nullable; public class PsiClassListCellRenderer extends PsiElementListCellRenderer { + public static final PsiClassListCellRenderer INSTANCE = new PsiClassListCellRenderer(); + @Override public String getElementText(PsiClass element) { return ClassPresentationUtil.getNameForClass(element, false); diff --git a/java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodProcessor.java b/java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodProcessor.java index b595c3e67d34..93f319d43a81 100644 --- a/java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodProcessor.java +++ b/java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodProcessor.java @@ -1519,7 +1519,7 @@ public class ExtractMethodProcessor implements MatchProvider { if (classes.size() > 1) { final PsiClass[] psiClasses = classes.keySet().toArray(new PsiClass[classes.size()]); final PsiClass preselection = AnonymousTargetClassPreselectionUtil.getPreselection(classes.keySet(), psiClasses[0]); - NavigationUtil.getPsiElementPopup(psiClasses, new PsiClassListCellRenderer(), "Choose Destination Class", processor, preselection) + NavigationUtil.getPsiElementPopup(psiClasses, PsiClassListCellRenderer.INSTANCE, "Choose Destination Class", processor, preselection) .showInBestPositionFor(myEditor); return true; } diff --git a/java/java-impl/src/com/intellij/refactoring/introduceField/BaseExpressionToFieldHandler.java b/java/java-impl/src/com/intellij/refactoring/introduceField/BaseExpressionToFieldHandler.java index 018e61ae48c6..00f5bf79ee4d 100644 --- a/java/java-impl/src/com/intellij/refactoring/introduceField/BaseExpressionToFieldHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/introduceField/BaseExpressionToFieldHandler.java @@ -134,7 +134,7 @@ public abstract class BaseExpressionToFieldHandler extends IntroduceHandlerBase } else { PsiClass selection = AnonymousTargetClassPreselectionUtil.getPreselection(classes, myParentClass); - NavigationUtil.getPsiElementPopup(classes.toArray(new PsiClass[classes.size()]), new PsiClassListCellRenderer(), + NavigationUtil.getPsiElementPopup(classes.toArray(new PsiClass[classes.size()]), PsiClassListCellRenderer.INSTANCE, "Choose class to introduce " + (myIsConstant ? "constant" : "field"), new PsiElementProcessor() { @Override diff --git a/java/java-impl/src/com/intellij/refactoring/introduceField/LocalToFieldHandler.java b/java/java-impl/src/com/intellij/refactoring/introduceField/LocalToFieldHandler.java index b8884ecdf437..5d5f0f012f18 100644 --- a/java/java-impl/src/com/intellij/refactoring/introduceField/LocalToFieldHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/introduceField/LocalToFieldHandler.java @@ -94,7 +94,7 @@ public abstract class LocalToFieldHandler { final boolean isStatic = tempIsStatic; final PsiClass firstClass = classes.get(0); final PsiClass preselection = AnonymousTargetClassPreselectionUtil.getPreselection(classes, firstClass); - NavigationUtil.getPsiElementPopup(classes.toArray(new PsiClass[classes.size()]), new PsiClassListCellRenderer(), "Choose class to introduce " + (myIsConstant ? "constant" : "field"), new PsiElementProcessor() { + NavigationUtil.getPsiElementPopup(classes.toArray(new PsiClass[classes.size()]), PsiClassListCellRenderer.INSTANCE, "Choose class to introduce " + (myIsConstant ? "constant" : "field"), new PsiElementProcessor() { @Override public boolean execute(@NotNull PsiClass aClass) { AnonymousTargetClassPreselectionUtil.rememberSelection(aClass, aClass); diff --git a/java/java-impl/src/com/intellij/refactoring/introduceParameter/IntroduceParameterHandler.java b/java/java-impl/src/com/intellij/refactoring/introduceParameter/IntroduceParameterHandler.java index fb3da83bb7be..139369de5c65 100644 --- a/java/java-impl/src/com/intellij/refactoring/introduceParameter/IntroduceParameterHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/introduceParameter/IntroduceParameterHandler.java @@ -580,7 +580,7 @@ public class IntroduceParameterHandler extends IntroduceHandlerBase { final PsiType returnType = emptyMethod.getReturnType(); LOG.assertTrue(returnType != null); final String title = "Choose Applicable Functional Interface: " + methodSignature + " -> " + returnType.getPresentableText(); - NavigationUtil.getPsiElementPopup(psiClasses, new PsiClassListCellRenderer(), title, + NavigationUtil.getPsiElementPopup(psiClasses, PsiClassListCellRenderer.INSTANCE, title, new PsiElementProcessor() { @Override public boolean execute(@NotNull PsiClass psiClass) { diff --git a/java/java-impl/src/com/intellij/testIntegration/createTest/GenerateMissedTestsAction.java b/java/java-impl/src/com/intellij/testIntegration/createTest/GenerateMissedTestsAction.java index d64b6ec8c3a8..4b73db746123 100644 --- a/java/java-impl/src/com/intellij/testIntegration/createTest/GenerateMissedTestsAction.java +++ b/java/java-impl/src/com/intellij/testIntegration/createTest/GenerateMissedTestsAction.java @@ -85,7 +85,7 @@ public class GenerateMissedTestsAction extends PsiElementBaseIntentionAction { } final JBList list = new JBList(testClasses); - list.setCellRenderer(new PsiClassListCellRenderer()); + list.setCellRenderer(PsiClassListCellRenderer.INSTANCE); JBPopupFactory.getInstance().createListPopupBuilder(list) .setItemChoosenCallback(() -> generateMissedTests((PsiClass)list.getSelectedValue(), srcClass, editor)) .setTitle("Choose Test") diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/GrCreateFromUsageBaseFix.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/GrCreateFromUsageBaseFix.java index a85e20e61491..97cd0cca2ecf 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/GrCreateFromUsageBaseFix.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/GrCreateFromUsageBaseFix.java @@ -102,7 +102,7 @@ public abstract class GrCreateFromUsageBaseFix extends Intention { final Project project = classes.get(0).getProject(); final JList list = new JBList(classes); - PsiElementListCellRenderer renderer = new PsiClassListCellRenderer(); + PsiElementListCellRenderer renderer = PsiClassListCellRenderer.INSTANCE; list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); list.setCellRenderer(renderer); final PopupChooserBuilder builder = new PopupChooserBuilder(list); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/GrIntroduceFieldHandlerBase.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/GrIntroduceFieldHandlerBase.java index 4ecd9e053649..f7d8a0447cf6 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/GrIntroduceFieldHandlerBase.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/GrIntroduceFieldHandlerBase.java @@ -67,7 +67,7 @@ public abstract class GrIntroduceFieldHandlerBase