From 5311692c39e035f329dbae3f51f6430780d9e6ac Mon Sep 17 00:00:00 2001
From: Sergey Ignatov <sergey.ignatov@jetbrains.com>
Date: Wed, 30 Oct 2019 00:26:18 +0100
Subject: [PATCH] more dynamic eps

GitOrigin-RevId: 5ec50711da5bc5e4ebe1b8fc3dcc154343ed8d83
---
 .../codeInsight/daemon/ProblemHighlightFilter.java     |  8 ++------
 .../src/META-INF/LangExtensionPoints.xml               | 10 +++++-----
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/platform/analysis-api/src/com/intellij/codeInsight/daemon/ProblemHighlightFilter.java b/platform/analysis-api/src/com/intellij/codeInsight/daemon/ProblemHighlightFilter.java
index fdcecb919f35..40f04c613591 100644
--- a/platform/analysis-api/src/com/intellij/codeInsight/daemon/ProblemHighlightFilter.java
+++ b/platform/analysis-api/src/com/intellij/codeInsight/daemon/ProblemHighlightFilter.java
@@ -50,11 +50,7 @@ public abstract class ProblemHighlightFilter {
   private static boolean shouldProcess(PsiFile psiFile, boolean onTheFly) {
     if (psiFile == null) return true;
 
-    final ProblemHighlightFilter[] filters = EP_NAME.getExtensions();
-    for (ProblemHighlightFilter filter : filters) {
-      if (onTheFly ? !filter.shouldHighlight(psiFile) : !filter.shouldProcessInBatch(psiFile)) return false;
-    }
-
-    return true;
+    return EP_NAME.getExtensionList().stream()
+      .noneMatch(filter -> onTheFly ? !filter.shouldHighlight(psiFile) : !filter.shouldProcessInBatch(psiFile));
   }
 }
diff --git a/platform/platform-resources/src/META-INF/LangExtensionPoints.xml b/platform/platform-resources/src/META-INF/LangExtensionPoints.xml
index 1f85fa126709..8d74286bb3e7 100644
--- a/platform/platform-resources/src/META-INF/LangExtensionPoints.xml
+++ b/platform/platform-resources/src/META-INF/LangExtensionPoints.xml
@@ -918,7 +918,7 @@
 
     <extensionPoint name="problemFileHighlightFilter" interface="com.intellij.openapi.util.Condition" area="IDEA_PROJECT" dynamic="true"/>
 
-    <extensionPoint name="problemHighlightFilter" interface="com.intellij.codeInsight.daemon.ProblemHighlightFilter"/>
+    <extensionPoint name="problemHighlightFilter" interface="com.intellij.codeInsight.daemon.ProblemHighlightFilter" dynamic="true"/>
 
     <extensionPoint name="uiDebuggerExtension" interface="com.intellij.ui.debugger.UiDebuggerExtension"/>
 
@@ -926,16 +926,16 @@
 
     <extensionPoint name="projectViewPaneSelectionHelper" interface="com.intellij.ide.projectView.impl.ProjectViewPaneSelectionHelper"/>
 
-    <extensionPoint name="inlineActionHandler" interface="com.intellij.lang.refactoring.InlineActionHandler"/>
+    <extensionPoint name="inlineActionHandler" interface="com.intellij.lang.refactoring.InlineActionHandler" dynamic="true"/>
 
     <extensionPoint name="projectViewNodeDecorator" interface="com.intellij.ide.projectView.ProjectViewNodeDecorator" area="IDEA_PROJECT"/>
 
-    <extensionPoint name="elementPreviewProvider" interface="com.intellij.codeInsight.preview.ElementPreviewProvider"/>
-    <extensionPoint name="previewHintProvider" interface="com.intellij.codeInsight.preview.PreviewHintProvider"/>
+    <extensionPoint name="elementPreviewProvider" interface="com.intellij.codeInsight.preview.ElementPreviewProvider" dynamic="true"/>
+    <extensionPoint name="previewHintProvider" interface="com.intellij.codeInsight.preview.PreviewHintProvider" dynamic="true"/>
 
     <extensionPoint name="testActionProvider" interface="com.intellij.execution.testframework.ToggleModelActionProvider"/>
 
-    <extensionPoint name="controlFlowProvider" interface="com.intellij.codeInsight.controlflow.ControlFlowProvider"/>
+    <extensionPoint name="controlFlowProvider" interface="com.intellij.codeInsight.controlflow.ControlFlowProvider" dynamic="true"/>
 
     <extensionPoint name="psiViewerExtension" interface="com.intellij.internal.psiView.PsiViewerExtension"/>