MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-18 09:34:34 +07:00
Code Issues Packages Projects Releases Wiki Activity

[ByteCodeViewer] IDEA-375222 Always show directory for non-unique file names

Browse Source 
Current problems:
- does not respect the application-wide "Show directory for non-unique file names" setting
- does not update tab names when tabs are closed

see also: #IJ-CR-166669

GitOrigin-RevId: 971f29a075fd3262cc0272cc4221aa38128e1991
This commit is contained in:
Bartek Pacia
2025-06-30 16:50:07 +00:00
committed by intellij-monorepo-bot
parent df2d398f21
commit 79a1401a08
1 changed files with 40 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/ByteCodeViewer/src/com/intellij/byteCodeViewer/ShowBytecodeAction.kt
+40 -10
View File
@@ -6,12 +6,16 @@ import com.intellij.notification.Notification
import com.intellij.notification.NotificationType
import com.intellij.openapi.actionSystem.*
import com.intellij.openapi.util.Key
import com.intellij.openapi.vfs.VfsUtil
import com.intellij.openapi.vfs.VirtualFile
import com.intellij.openapi.wm.ToolWindow
import com.intellij.openapi.wm.ToolWindowAnchor
import com.intellij.openapi.wm.ToolWindowManager
import com.intellij.ui.content.Content
import com.intellij.ui.content.ContentFactory
private val JAVA_SOURCE_FILE = Key.create<String>("JAVA_SOURCE_FILE")
private val JAVA_SOURCE_FILE = Key.create<VirtualFile>("JAVA_SOURCE_FILE")
private val JAVA_CLASS_FILE = Key.create<VirtualFile>("JAVA_CLASS_FILE")
internal class ShowBytecodeAction : AnAction() {
override fun getActionUpdateThread(): ActionUpdateThread = ActionUpdateThread.BGT
@@ -35,10 +39,9 @@ internal class ShowBytecodeAction : AnAction() {
val psiFile = event.getData(CommonDataKeys.PSI_FILE) ?: return
val psiElement = psiFile.findElementAt(editor.caretModel.offset) ?: return
val psiClass = ByteCodeViewerManager.getContainingClass(psiElement) ?: return
val javaSourceFile = psiFile.virtualFile?.path ?: return
val clsFile = ByteCodeViewerManager.findClassFile(psiClass)
val javaClassFile = ByteCodeViewerManager.findClassFile(psiClass)
if (clsFile == null) {
if (javaClassFile == null) {
val title = BytecodeViewerBundle.message("bytecode.not.found.title")
val content = BytecodeViewerBundle.message("please.build.project")
val notification = Notification("Bytecode Viewer Errors", title, content, NotificationType.WARNING).setImportant(false)
@@ -64,21 +67,48 @@ internal class ShowBytecodeAction : AnAction() {
return
}
val panel = BytecodeToolWindowPanel(project, psiClass, clsFile)
val panel = BytecodeToolWindowPanel(project, psiClass, javaClassFile)
val content = toolWindow.contentManager.contents.firstOrNull { it.getUserData(JAVA_SOURCE_FILE) == javaSourceFile }
?: ContentFactory.getInstance().createContent(panel, clsFile.presentableName, false).apply {
description = clsFile.presentableUrl // appears on tab hover
putUserData(JAVA_SOURCE_FILE, javaSourceFile)
val content = toolWindow.contentManager.contents.firstOrNull { it.getUserData(JAVA_CLASS_FILE) == javaClassFile }
?: ContentFactory.getInstance().createContent(panel, javaClassFile.presentableName, false).apply {
description = javaClassFile.presentableUrl // appears on tab hover
putUserData(JAVA_CLASS_FILE, javaClassFile)
}
toolWindow.contentManager.addContent(content)
deduplicateTabNames(toolWindow)
content.setDisposer(panel)
toolWindow.contentManager.setSelectedContent(content)
toolWindow.setAdditionalGearActions(createActionGroup())
toolWindow.activate(null)
}
private fun deduplicateTabNames(toolWindow: ToolWindow) {
val titlesToContents = mutableMapOf<String, MutableList<Content>>()
for (contentEntry in toolWindow.contentManager.contents) {
val tabName = contentEntry.getUserData(JAVA_CLASS_FILE)?.name ?: throw IllegalStateException("No title for content entry $contentEntry")
titlesToContents.getOrPut(tabName) { mutableListOf() }.add(contentEntry)
}
for (contents in titlesToContents.values) {
if (contents.size > 1) {
val paths = contents.map {
it.getUserData(JAVA_CLASS_FILE) ?: throw IllegalStateException("No class file path for content entry $it")
}
val commonAncestor = VfsUtil.getCommonAncestor(paths) ?: continue
for (i in contents.indices) {
val content = contents[i]
content.displayName = VfsUtil.getRelativePath(
content.getUserData(JAVA_CLASS_FILE) ?: throw IllegalStateException("No class file path for content entry $content"),
commonAncestor,
)
}
}
}
}
private fun createActionGroup(): ActionGroup {
val action = object : ToggleAction(BytecodeViewerBundle.messagePointer("action.show.debug.action.name")) {
override fun getActionUpdateThread(): ActionUpdateThread = ActionUpdateThread.EDT