From 3d04daabc9c9df2fadc968d1129635f9faddd0cd Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Tue, 13 Jan 2026 12:22:12 +0100 Subject: [PATCH] (part of IJPL-222955) cleanup: avoid negative named methods GitOrigin-RevId: 302f2b836b4a4452702d2904cb07516b3deeab80 --- .../folding/impl/CodeFoldingManagerImpl.java | 18 +++++++++++++----- .../folding/impl/DocumentFoldingInfo.java | 8 ++++++-- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/platform/foldings/src/com/intellij/codeInsight/folding/impl/CodeFoldingManagerImpl.java b/platform/foldings/src/com/intellij/codeInsight/folding/impl/CodeFoldingManagerImpl.java index c7cb41ff7ec5..a684088f53e5 100644 --- a/platform/foldings/src/com/intellij/codeInsight/folding/impl/CodeFoldingManagerImpl.java +++ b/platform/foldings/src/com/intellij/codeInsight/folding/impl/CodeFoldingManagerImpl.java @@ -53,7 +53,7 @@ public final class CodeFoldingManagerImpl extends CodeFoldingManager implements private static final Key> ASYNC_FOLDING_CACHE_KEY = Key.create("ASYNC_FOLDING_CACHE"); private static final Key AUTO_CREATED_KEY = Key.create("AUTO_CREATED"); private static final Key FRONTEND_CREATED_KEY = Key.create("FRONTEND_CREATED"); - private static final Key NOT_PERSISTENT = Key.create("NOT_PERSISTENT"); + private static final Key TRANSIENT_KEY = Key.create("TRANSIENT"); private final Project myProject; private final Collection myDocumentsWithFoldingInfo = new WeakList<>(); @@ -229,12 +229,20 @@ public final class CodeFoldingManagerImpl extends CodeFoldingManager implements } /// Do not store the folding region in user config - public static void markAsNotPersistent(@NotNull FoldRegion region) { - NOT_PERSISTENT.set(region, true); + public static void markTransient(@NotNull FoldRegion region) { + TRANSIENT_KEY.set(region, true); } - static boolean isNotPersistent(@Nullable FoldRegion region) { - return NOT_PERSISTENT.isIn(region); + /** + * @deprecated use {@link #markTransient(FoldRegion)} + */ + @Deprecated + public static void markAsNotPersistent(@NotNull FoldRegion region) { + markTransient(region); + } + + static boolean isTransient(@Nullable FoldRegion region) { + return TRANSIENT_KEY.isIn(region); } public static Map getAsyncExpandStatusMap(@Nullable Editor editor) { diff --git a/platform/foldings/src/com/intellij/codeInsight/folding/impl/DocumentFoldingInfo.java b/platform/foldings/src/com/intellij/codeInsight/folding/impl/DocumentFoldingInfo.java index f5525b5b40e6..25c4f8ff5fc6 100644 --- a/platform/foldings/src/com/intellij/codeInsight/folding/impl/DocumentFoldingInfo.java +++ b/platform/foldings/src/com/intellij/codeInsight/folding/impl/DocumentFoldingInfo.java @@ -68,10 +68,14 @@ final class DocumentFoldingInfo implements CodeFoldingState { FoldRegion[] foldRegions = editor.getFoldingModel().getAllFoldRegions(); for (FoldRegion region : foldRegions) { - if (!region.isValid() || region.shouldNeverExpand() || CodeFoldingManagerImpl.isNotPersistent(region)) continue; + if (!region.isValid() || region.shouldNeverExpand() || CodeFoldingManagerImpl.isTransient(region)) { + continue; + } boolean expanded = region.isExpanded(); String signature = region.getUserData(UpdateFoldRegionsOperation.SIGNATURE); - if (Strings.areSameInstance(signature, UpdateFoldRegionsOperation.NO_SIGNATURE)) continue; + if (Strings.areSameInstance(signature, UpdateFoldRegionsOperation.NO_SIGNATURE)) { + continue; + } Boolean storedCollapseByDefault = CodeFoldingManagerImpl.getCollapsedByDef(region); boolean collapseByDefault = storedCollapseByDefault != null && storedCollapseByDefault && !FoldingUtil.caretInsideRange(editor, region.getTextRange());