diff --git a/platform/lang-impl/src/com/intellij/codeInsight/AutoPopupController.java b/platform/lang-impl/src/com/intellij/codeInsight/AutoPopupController.java index f3211738f6ef..89413c5899b0 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/AutoPopupController.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/AutoPopupController.java @@ -153,6 +153,7 @@ public class AutoPopupController implements Disposable { public void autoPopupParameterInfo(final Editor editor, @Nullable final PsiElement highlightedMethod){ if (ApplicationManager.getApplication().isUnitTestMode()) return; if (DumbService.isDumb(myProject)) return; + if (PowerSaveMode.isEnabled()) return; ApplicationManager.getApplication().assertIsDispatchThread(); final CodeInsightSettings settings = CodeInsightSettings.getInstance(); diff --git a/platform/lang-impl/src/com/intellij/ui/DeferredIconImpl.java b/platform/lang-impl/src/com/intellij/ui/DeferredIconImpl.java index a5d469b601e8..403a17f9a2d4 100644 --- a/platform/lang-impl/src/com/intellij/ui/DeferredIconImpl.java +++ b/platform/lang-impl/src/com/intellij/ui/DeferredIconImpl.java @@ -21,6 +21,7 @@ package com.intellij.ui; import com.intellij.concurrency.Job; import com.intellij.concurrency.JobLauncher; +import com.intellij.ide.PowerSaveMode; import com.intellij.openapi.application.ex.ApplicationManagerEx; import com.intellij.openapi.progress.ProcessCanceledException; import com.intellij.openapi.project.IndexNotReadyException; @@ -82,7 +83,7 @@ public class DeferredIconImpl implements DeferredIcon { myDelegateIcon.paintIcon(c, g, x, y); //SOE protection } - if (myIsScheduled || isDone()) { + if (myIsScheduled || isDone() || PowerSaveMode.isEnabled()) { return; } myIsScheduled = true;