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

IJPL-186724 Support provided select-in contexts in SelectInProjectViewImpl

Browse Source 
This is a rare case, but it's still a valid case
when the editor provides a special kind of select-in
context, so neither SimpleSelectInContext nor
EditorSelectInContext work properly.

An example is MPS-37563.

GitOrigin-RevId: 8ec91cb35049ebba3e18eb5ec401ea4ea348bcd2
This commit is contained in:
Sergei Tachenov
2025-05-05 16:05:53 +00:00
committed by intellij-monorepo-bot
parent fe5b97a3aa
commit 0f69f459a6
1 changed files with 34 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/ide/projectView/impl/SelectInProjectViewImpl.kt
+34 -13
View File
@@ -116,7 +116,7 @@ internal class SelectInProjectViewImpl(
if (LOG.isDebugEnabled) {
LOG.debug("Created select-in context and delegating to it: $selectInContext")
}
selectInContext.selectInCurrentTarget(requestFocus = invokedManually)
selectInContext.selectInCurrentTarget(project, requestFocus = invokedManually)
}
break
}
@@ -155,13 +155,21 @@ internal class SelectInProjectViewImpl(
}
}
private fun createSelectInContext(psiFilePointer: SmartPsiElementPointer<PsiFile>, fileEditor: FileEditor): SimpleSelectInContext =
if (fileEditor is TextEditor) {
EditorSelectInContext(project, psiFilePointer, fileEditor)
}
else {
SimpleSelectInContext(project, psiFilePointer, fileEditor)
private fun createSelectInContext(psiFilePointer: SmartPsiElementPointer<PsiFile>, fileEditor: FileEditor): SelectInContext {
val dataContext = DataManager.getInstance().getDataContext(fileEditor.component)
val providedSelectInContext = dataContext.getData(SelectInContext.DATA_KEY)
return when {
providedSelectInContext != null -> {
providedSelectInContext
}
fileEditor is TextEditor -> {
EditorSelectInContext(project, psiFilePointer, fileEditor)
}
else -> {
SimpleSelectInContext(project, psiFilePointer, fileEditor)
}
}
}
fun ensureSelected(
paneId: String,
@@ -335,6 +343,24 @@ internal class SelectInProjectViewImpl(
}
private suspend fun SelectInContext.selectInCurrentTarget(project: Project, requestFocus: Boolean) {
if (this is SimpleSelectInContext) {
selectInCurrentTarget(requestFocus) // simple, but overridable
}
else {
simpleSelectInCurrentTarget(project, requestFocus)
}
}
private fun SelectInContext.simpleSelectInCurrentTarget(project: Project, requestFocus: Boolean) {
val currentTarget = (project.serviceOrNull<ProjectView>() as ProjectViewImpl?)?.currentSelectInTarget
if (LOG.isDebugEnabled) {
LOG.debug("The current target is $currentTarget")
}
if (currentTarget == null) return
currentTarget.selectIn(this, requestFocus)
}
private open class SimpleSelectInContext(
private val project: Project,
psiFilePointer: SmartPsiElementPointer<PsiFile>,
@@ -346,12 +372,7 @@ private open class SimpleSelectInContext(
}
open suspend fun selectInCurrentTarget(requestFocus: Boolean) {
val currentTarget = (project.serviceOrNull<ProjectView>() as ProjectViewImpl?)?.currentSelectInTarget
if (LOG.isDebugEnabled) {
LOG.debug("The current target is $currentTarget")
}
if (currentTarget == null) return
currentTarget.selectIn(this, requestFocus)
simpleSelectInCurrentTarget(project, requestFocus)
}
override fun toString(): String {