Skip to content

Fix deadlock in Extract Method when multiple scopes exist #713

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nafg wants to merge 1 commit into
base: idea253.x
Choose a base branch
from
+4 −28
Open

Fix deadlock in Extract Method when multiple scopes exist #713

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 4 additions & 28 deletions ...ala-impl/src/org/jetbrains/plugins/scala/lang/refactoring/util/ScalaRefactoringUtil.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package org.jetbrains.plugins.scala.lang.refactoring.util

import com.intellij.codeInsight.PsiEquivalenceUtil
import com.intellij.codeInsight.highlighting.HighlightManager
import com.intellij.codeInsight.navigation.PsiTargetNavigator
import com.intellij.codeInsight.unwrap.ScopeHighlighter
import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.editor.colors.{EditorColors, EditorColorsScheme}
Expand All @@ -12,7 +11,6 @@ import com.intellij.openapi.project.Project
import com.intellij.openapi.ui.popup.{JBPopup, JBPopupFactory, JBPopupListener, LightweightWindowEvent}
import com.intellij.openapi.util.{Key, TextRange}
import com.intellij.openapi.vfs.ReadonlyStatusHandler
import com.intellij.platform.backend.presentation.TargetPresentation
import com.intellij.psi._
import com.intellij.psi.search.searches.ReferencesSearch
import com.intellij.psi.search.{GlobalSearchScope, LocalSearchScope}
Expand Down Expand Up @@ -547,32 +545,10 @@ object ScalaRefactoringUtil {
presentation: T => String,
toHighlight: PsiElement => PsiElement = identity)
(implicit project: Project, editor: Editor): Unit =
showChooserImpl(onChosen) { chooserModel =>
new PsiTargetNavigator(elements.asJava)
.presentationProvider((element: T) => TargetPresentation.builder(presentation(element)).presentation())
.builderConsumer { builder =>
builder
.setMovable(false)
.setResizable(false)
.setRequestFocus(true)
.addListener(chooserModel.highlighterPopupListener)
.setItemSelectedCallback { item =>
if (item != null) {
val element = item.dereference()
if (element != null) {
val psiElement = toHighlight(element)
if (psiElement != null) {
chooserModel.highlightPsi.accept(psiElement)
}
}
}
}
}
.createPopup(project, title, (element: T) => {
chooserModel.elementChosen.accept(element)
true
})
}
// Use JBPopupFactory instead of PsiTargetNavigator to avoid deadlock.
// PsiTargetNavigator.createPopup() calls computeItems() which uses runBlocking on the EDT,
// causing a deadlock when worker threads contend for the indexing lock. #SCL-25001
showChooserGeneric[T](elements, onChosen, title, presentation, toHighlight(_))

/** See [[showChooserImpl]] */
private final case class HighlightingChooserModel[T](
Expand Down