From 4a5cc8889cddc1e18933c1fd1408d5e2f767c12e Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Sun, 24 Mar 2024 21:07:09 +0100
Subject: [PATCH] IJPL-846 cleanup

GitOrigin-RevId: 60fb90581126c1cf18848eeb5520384a786cc9c6
---
 .../fileEditor/impl/EditorTabbedContainer.kt  | 56 ++++++++-----------
 .../fileEditor/impl/text/AsyncEditorLoader.kt |  3 +-
 2 files changed, 24 insertions(+), 35 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorTabbedContainer.kt b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorTabbedContainer.kt
index dd35080e06c5..cdc58886aefc 100644
--- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorTabbedContainer.kt
+++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorTabbedContainer.kt
@@ -30,7 +30,6 @@ import com.intellij.openapi.fileEditor.impl.tabActions.CloseTab
 import com.intellij.openapi.fileEditor.impl.text.AsyncEditorLoader
 import com.intellij.openapi.fileEditor.impl.text.FileDropHandler
 import com.intellij.openapi.options.advanced.AdvancedSettings
-import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.*
 import com.intellij.openapi.util.registry.Registry
 import com.intellij.openapi.vfs.VfsUtil
@@ -492,37 +491,28 @@ class EditorTabbedContainer internal constructor(
     }
   }
 
-  class DockableEditor(val img: Image?,
-                       val file: VirtualFile,
-                       private val presentation: Presentation,
-                       private val preferredSize: Dimension,
-                       val isPinned: Boolean,
-                       val isNorthPanelAvailable: Boolean) : DockableContent<VirtualFile?> {
-
-    @Suppress("UNUSED_PARAMETER")
-    @Deprecated("project is not required.")
-    constructor(project: Project?,
-                img: Image,
-                file: VirtualFile,
-                presentation: Presentation,
-                preferredSize: Dimension,
-                isFilePinned: Boolean) : this(img = img,
-                                              file = file,
-                                              presentation = presentation,
-                                              preferredSize = preferredSize,
-                                              isPinned = isFilePinned,
-                                              isNorthPanelAvailable = isNorthPanelVisible(UISettings.getInstance()))
-
-    constructor(img: Image,
-                file: VirtualFile,
-                presentation: Presentation,
-                preferredSize: Dimension,
-                isFilePinned: Boolean) : this(img = img,
-                                              file = file,
-                                              presentation = presentation,
-                                              preferredSize = preferredSize,
-                                              isPinned = isFilePinned,
-                                              isNorthPanelAvailable = isNorthPanelVisible(UISettings.getInstance()))
+  class DockableEditor(
+    val img: Image?,
+    val file: VirtualFile,
+    private val presentation: Presentation,
+    private val preferredSize: Dimension,
+    val isPinned: Boolean,
+    val isNorthPanelAvailable: Boolean,
+  ) : DockableContent<VirtualFile?> {
+    constructor(
+      img: Image,
+      file: VirtualFile,
+      presentation: Presentation,
+      preferredSize: Dimension,
+      isFilePinned: Boolean,
+    ) : this(
+      img = img,
+      file = file,
+      presentation = presentation,
+      preferredSize = preferredSize,
+      isPinned = isFilePinned,
+      isNorthPanelAvailable = isNorthPanelVisible(UISettings.getInstance()),
+    )
 
     override fun getKey(): VirtualFile = file
 
@@ -716,7 +706,7 @@ private class EditorTabLabel(info: TabInfo, tabs: JBTabsImpl) : TabLabel(tabs, i
     return height - layoutInsets.top - layoutInsets.bottom
   }
 
-  override fun isShowTabActions(): Boolean = UISettings.getInstance().showCloseButton || isPinned
+  override fun isShowTabActions(): Boolean = isPinned || UISettings.getInstance().showCloseButton
 
   override fun isTabActionsOnTheRight(): Boolean = UISettings.getInstance().closeTabButtonOnTheRight
 
diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/AsyncEditorLoader.kt b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/AsyncEditorLoader.kt
index e0a6e18719a0..ad7f1cd1ff94 100644
--- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/AsyncEditorLoader.kt
+++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/text/AsyncEditorLoader.kt
@@ -60,8 +60,7 @@ class AsyncEditorLoader internal constructor(
     @JvmField
     internal val FIRST_IN_BULK: Key<Boolean> = Key.create("EditorSplitters.first.in.bulk")
 
-    @Internal
-    fun isFirstInBulk(file: VirtualFile): Boolean = file.getUserData(FIRST_IN_BULK) != null
+    internal fun isFirstInBulk(file: VirtualFile): Boolean = file.getUserData(FIRST_IN_BULK) != null
 
     @JvmStatic
     @RequiresEdt