Skip to content

Fix semaphore not updated in pair could make Q unusable #5341

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

Merged
merged 4 commits into from
Feb 7, 2025
Merged

Fix semaphore not updated in pair could make Q unusable #5341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6b75203
Fix semaphore not updated in pair could make Q unusable
andrewyuq Feb 7, 2025
8b553af
detekt
andrewyuq Feb 7, 2025
fef6e78
Merge branch 'main' into keybinding
andrewyuq Feb 7, 2025
4acd831
remove previous listener when states are updated
andrewyuq Feb 7, 2025
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
29 changes: 10 additions & 19 deletions ...software/aws/toolkits/jetbrains/services/codewhisperer/popup/CodeWhispererPopupManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,9 @@
import com.intellij.ui.popup.PopupFactoryImpl
import com.intellij.util.messages.Topic
import com.intellij.util.ui.UIUtil
import kotlinx.coroutines.sync.Semaphore
import software.amazon.awssdk.services.codewhispererruntime.model.Import
import software.amazon.awssdk.services.codewhispererruntime.model.Reference
import software.aws.toolkits.core.utils.debug
import software.aws.toolkits.core.utils.error
import software.aws.toolkits.core.utils.getLogger
import software.aws.toolkits.jetbrains.services.codewhisperer.editor.CodeWhispererEditorManager
import software.aws.toolkits.jetbrains.services.codewhisperer.layout.CodeWhispererLayoutConfig.addHorizontalGlue
Expand Down Expand Up @@ -88,8 +86,8 @@
class CodeWhispererPopupManager {
val popupComponents = CodeWhispererPopupComponents()

// Act like a semaphore: one increment only corresponds to one decrement
var allowEditsDuringSuggestionPreview = Semaphore(MAX_EDIT_SOURCE_DURING_SUGGESTION_PREVIEW)
var allowTypingDuringSuggestionPreview = false
var allowIntelliSenseDuringSuggestionPreview = false
var sessionContext = SessionContext()
private set

Expand Down Expand Up @@ -251,18 +249,11 @@

// Don't want to block or throw any kinds of exceptions here if it can continue to provide suggestions
fun dontClosePopupAndRun(runnable: () -> Unit) {
if (allowEditsDuringSuggestionPreview.tryAcquire()) {
try {
runnable()
} finally {
try {
allowEditsDuringSuggestionPreview.release()
} catch (e: Exception) {
LOG.error(e) { "Failed to release allowEditsDuringSuggestionPreview semaphore" }
}
}
} else {
LOG.error { "Failed to acquire allowEditsDuringSuggestionPreview semaphore" }
try {
allowTypingDuringSuggestionPreview = true
runnable()
} finally {
allowTypingDuringSuggestionPreview = false
}
}

Expand Down Expand Up @@ -511,7 +502,7 @@
val editor = states.requestContext.editor
val codewhispererSelectionListener: SelectionListener = object : SelectionListener {
override fun selectionChanged(event: SelectionEvent) {
if (allowEditsDuringSuggestionPreview.availablePermits == MAX_EDIT_SOURCE_DURING_SUGGESTION_PREVIEW) {
if (!allowTypingDuringSuggestionPreview && !allowIntelliSenseDuringSuggestionPreview) {
cancelPopup(states.popup)
}
super.selectionChanged(event)
Expand All @@ -527,7 +518,7 @@
if (!delete) return
if (editor.caretModel.offset == event.offset) {
changeStates(states, 0)
} else if (allowEditsDuringSuggestionPreview.availablePermits == MAX_EDIT_SOURCE_DURING_SUGGESTION_PREVIEW) {
} else if (!allowTypingDuringSuggestionPreview && !allowIntelliSenseDuringSuggestionPreview) {
cancelPopup(states.popup)
}
}
Expand All @@ -536,7 +527,7 @@

val codewhispererCaretListener: CaretListener = object : CaretListener {
override fun caretPositionChanged(event: CaretEvent) {
if (allowEditsDuringSuggestionPreview.availablePermits == MAX_EDIT_SOURCE_DURING_SUGGESTION_PREVIEW) {
if (!allowTypingDuringSuggestionPreview && !allowIntelliSenseDuringSuggestionPreview) {
cancelPopup(states.popup)
}
super.caretPositionChanged(event)
Expand Down Expand Up @@ -717,7 +708,7 @@
"CodeWhisperer user action performed",
CodeWhispererUserActionListener::class.java
)
const val MAX_EDIT_SOURCE_DURING_SUGGESTION_PREVIEW = 2

Check warning on line 711 in plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/popup/CodeWhispererPopupManager.kt

View workflow job for this annotation

GitHub Actions / qodana

Unused symbol 

Property "MAX_EDIT_SOURCE_DURING_SUGGESTION_PREVIEW" is never used
}
}

Expand Down
22 changes: 10 additions & 12 deletions ...ns/services/codewhisperer/popup/listeners/CodeWhispererPopupIntelliSenseAcceptListener.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,10 @@ import com.intellij.codeInsight.lookup.LookupEvent
import com.intellij.codeInsight.lookup.LookupListener
import com.intellij.codeInsight.lookup.LookupManagerListener
import com.intellij.codeInsight.lookup.impl.LookupImpl
import software.aws.toolkits.core.utils.error
import com.intellij.openapi.util.Disposer
import software.aws.toolkits.core.utils.getLogger
import software.aws.toolkits.jetbrains.services.codewhisperer.model.InvocationContext
import software.aws.toolkits.jetbrains.services.codewhisperer.popup.CodeWhispererPopupManager
import software.aws.toolkits.jetbrains.services.codewhisperer.popup.listeners.CodeWhispererPopupIntelliSenseAcceptListener.Companion.LOG
import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispererInvocationStatus

class CodeWhispererPopupIntelliSenseAcceptListener(private val states: InvocationContext) : LookupManagerListener {
Expand All @@ -28,10 +27,8 @@ class CodeWhispererPopupIntelliSenseAcceptListener(private val states: Invocatio
}

fun addIntelliSenseAcceptListener(lookup: Lookup, states: InvocationContext) {
if (!CodeWhispererPopupManager.getInstance().allowEditsDuringSuggestionPreview.tryAcquire()) {
LOG.error { "Failed to acquire allowEditsDuringSuggestionPreview semaphore" }
}
lookup.addLookupListener(object : LookupListener {
CodeWhispererPopupManager.getInstance().allowIntelliSenseDuringSuggestionPreview = true
val listener = object : LookupListener {
override fun itemSelected(event: LookupEvent) {
if (!CodeWhispererInvocationStatus.getInstance().isDisplaySessionActive() ||
!(event.lookup as LookupImpl).isShown
Expand All @@ -52,11 +49,12 @@ fun addIntelliSenseAcceptListener(lookup: Lookup, states: InvocationContext) {

private fun cleanup() {
lookup.removeLookupListener(this)
try {
CodeWhispererPopupManager.getInstance().allowEditsDuringSuggestionPreview.release()
} catch (e: Exception) {
LOG.error(e) { "Failed to release allowEditsDuringSuggestionPreview semaphore" }
}
CodeWhispererPopupManager.getInstance().allowIntelliSenseDuringSuggestionPreview = false
}
})
}
lookup.addLookupListener(listener)
Disposer.register(states) {
lookup.removeLookupListener(listener)
CodeWhispererPopupManager.getInstance().allowIntelliSenseDuringSuggestionPreview = false
}
}
Loading