diff --git a/platform/core-impl/src/com/intellij/openapi/editor/impl/IntervalTree.java b/platform/core-impl/src/com/intellij/openapi/editor/impl/IntervalTree.java index 607fda15e055..8139fdd677c8 100644 --- a/platform/core-impl/src/com/intellij/openapi/editor/impl/IntervalTree.java +++ b/platform/core-impl/src/com/intellij/openapi/editor/impl/IntervalTree.java @@ -19,7 +19,7 @@ import com.intellij.util.Processor; import org.jetbrains.annotations.NotNull; interface IntervalTree { - boolean process(@NotNull Processor processor); + boolean processAll(@NotNull Processor processor); boolean processOverlappingWith(int start, int end, @NotNull Processor processor); boolean processContaining(int offset, @NotNull Processor processor); diff --git a/platform/core-impl/src/com/intellij/openapi/editor/impl/IntervalTreeImpl.java b/platform/core-impl/src/com/intellij/openapi/editor/impl/IntervalTreeImpl.java index f8aea5c1fd2a..a532b36d2ab2 100644 --- a/platform/core-impl/src/com/intellij/openapi/editor/impl/IntervalTreeImpl.java +++ b/platform/core-impl/src/com/intellij/openapi/editor/impl/IntervalTreeImpl.java @@ -419,7 +419,7 @@ abstract class IntervalTreeImpl extends RedBlackTree implements IntervalTr } @Override - public boolean process(@NotNull Processor processor) { + public boolean processAll(@NotNull Processor processor) { try { l.readLock().lock(); checkMax(true); @@ -1269,7 +1269,7 @@ abstract class IntervalTreeImpl extends RedBlackTree implements IntervalTr @Override public void clear() { l.writeLock().lock(); - process(t -> { + processAll(t -> { beforeRemove(t, "Clear all"); return true; }); diff --git a/platform/editor-ui-ex/src/com/intellij/openapi/editor/impl/MarkupModelImpl.java b/platform/editor-ui-ex/src/com/intellij/openapi/editor/impl/MarkupModelImpl.java index c883c16e47c6..8d8e70f69f21 100644 --- a/platform/editor-ui-ex/src/com/intellij/openapi/editor/impl/MarkupModelImpl.java +++ b/platform/editor-ui-ex/src/com/intellij/openapi/editor/impl/MarkupModelImpl.java @@ -95,8 +95,8 @@ public class MarkupModelImpl extends UserDataHolderBase implements MarkupModelEx if (size == 0) return RangeHighlighter.EMPTY_ARRAY; List list = new ArrayList<>(size); CommonProcessors.CollectProcessor collectProcessor = new CommonProcessors.CollectProcessor<>(list); - myHighlighterTree.process(collectProcessor); - myHighlighterTreeForLines.process(collectProcessor); + myHighlighterTree.processAll(collectProcessor); + myHighlighterTreeForLines.processAll(collectProcessor); myCachedHighlighters = list.toArray(new RangeHighlighter[list.size()]); } return myCachedHighlighters; diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/InlayModelImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/InlayModelImpl.java index 0ec3326aeaab..76b132d2487c 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/InlayModelImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/InlayModelImpl.java @@ -97,7 +97,7 @@ public class InlayModelImpl implements InlayModel, Disposable { } void reinitSettings() { - myInlayTree.process(inlay -> { + myInlayTree.processAll(inlay -> { inlay.updateSize(); return true; }); diff --git a/platform/platform-impl/src/com/intellij/ui/EditorTextFieldCellRenderer.java b/platform/platform-impl/src/com/intellij/ui/EditorTextFieldCellRenderer.java index 18373f28a2d9..f2433dae3701 100644 --- a/platform/platform-impl/src/com/intellij/ui/EditorTextFieldCellRenderer.java +++ b/platform/platform-impl/src/com/intellij/ui/EditorTextFieldCellRenderer.java @@ -403,7 +403,7 @@ public abstract class EditorTextFieldCellRenderer implements TableCellRenderer, } @Override - public boolean processRangeMarkers(@NotNull Processor processor) { return myRangeMarkers.process(processor); } + public boolean processRangeMarkers(@NotNull Processor processor) { return myRangeMarkers.processAll(processor); } @Override public boolean processRangeMarkersOverlappingWith(int start,