Skip to content
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

bug fix(amazonq): fix an issue where user action is accept but telemetry is reject #5319

Merged
merged 8 commits into from
Feb 4, 2025
Merged

bug fix(amazonq): fix an issue where user action is accept but telemetry is reject #5319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
41bc885
bug fix(amazonq): fix an issue where user action is accept but teleme…
andrewyuq Feb 3, 2025
c6daddb
Merge branch 'main' into keybinding
andrewyuq Feb 3, 2025
5bd1260
detekt
andrewyuq Feb 3, 2025
0b17ceb
Merge branch 'main' into keybinding
andrewyuq Feb 3, 2025
3b3c081
fix increment logic when IntelliSense is showing up
andrewyuq Feb 3, 2025
a1ab241
Change to use a semaphore
andrewyuq Feb 4, 2025
b6ff0dd
Merge branch 'main' into keybinding
andrewyuq Feb 4, 2025
1fb56df
Merge branch 'main' into keybinding
andrewyuq Feb 4, 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
30 changes: 21 additions & 9 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,9 +41,11 @@ import com.intellij.ui.popup.AbstractPopup
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 @@ -85,7 +87,8 @@ import javax.swing.JLabel
class CodeWhispererPopupManager {
andrewyuq marked this conversation as resolved.
Show resolved Hide resolved
val popupComponents = CodeWhispererPopupComponents()

var shouldListenerCancelPopup: Boolean = true
// Act like a semaphore: one increment only corresponds to one decrement
andrewyuq marked this conversation as resolved.
Show resolved Hide resolved
var allowEditsDuringSuggestionPreview = Semaphore(MAX_EDIT_SOURCE_DURING_SUGGESTION_PREVIEW)
var sessionContext = SessionContext()
private set

Expand Down Expand Up @@ -245,12 +248,20 @@ class CodeWhispererPopupManager {
}
}

// Don't want to block or throw any kinds of exceptions here if it can continue to provide suggestions
fun dontClosePopupAndRun(runnable: () -> Unit) {
try {
shouldListenerCancelPopup = false
runnable()
} finally {
shouldListenerCancelPopup = true
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" }
}
}

Expand Down Expand Up @@ -496,7 +507,7 @@ class CodeWhispererPopupManager {
val editor = states.requestContext.editor
val codewhispererSelectionListener: SelectionListener = object : SelectionListener {
override fun selectionChanged(event: SelectionEvent) {
if (shouldListenerCancelPopup) {
if (allowEditsDuringSuggestionPreview.availablePermits == MAX_EDIT_SOURCE_DURING_SUGGESTION_PREVIEW) {
cancelPopup(states.popup)
}
super.selectionChanged(event)
Expand All @@ -512,7 +523,7 @@ class CodeWhispererPopupManager {
if (!delete) return
if (editor.caretModel.offset == event.offset) {
changeStates(states, 0)
} else if (shouldListenerCancelPopup) {
} else if (allowEditsDuringSuggestionPreview.availablePermits == MAX_EDIT_SOURCE_DURING_SUGGESTION_PREVIEW) {
cancelPopup(states.popup)
}
}
Expand All @@ -521,7 +532,7 @@ class CodeWhispererPopupManager {

val codewhispererCaretListener: CaretListener = object : CaretListener {
override fun caretPositionChanged(event: CaretEvent) {
if (shouldListenerCancelPopup) {
if (allowEditsDuringSuggestionPreview.availablePermits == MAX_EDIT_SOURCE_DURING_SUGGESTION_PREVIEW) {
cancelPopup(states.popup)
}
super.caretPositionChanged(event)
Expand Down Expand Up @@ -702,6 +713,7 @@ class CodeWhispererPopupManager {
"CodeWhisperer user action performed",
CodeWhispererUserActionListener::class.java
)
const val MAX_EDIT_SOURCE_DURING_SUGGESTION_PREVIEW = 2
}
}

Expand Down
20 changes: 15 additions & 5 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,8 +8,11 @@ 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 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 @@ -18,14 +21,17 @@ class CodeWhispererPopupIntelliSenseAcceptListener(private val states: Invocatio

addIntelliSenseAcceptListener(newLookup, states)
}

companion object {
val LOG = getLogger<CodeWhispererPopupIntelliSenseAcceptListener>()
}
}

fun addIntelliSenseAcceptListener(lookup: Lookup, states: InvocationContext) {
if (!CodeWhispererPopupManager.getInstance().allowEditsDuringSuggestionPreview.tryAcquire()) {
LOG.error { "Failed to acquire allowEditsDuringSuggestionPreview semaphore" }
}
lookup.addLookupListener(object : LookupListener {
override fun beforeItemSelected(event: LookupEvent): Boolean {
CodeWhispererPopupManager.getInstance().shouldListenerCancelPopup = false
return super.beforeItemSelected(event)
}
override fun itemSelected(event: LookupEvent) {
if (!CodeWhispererInvocationStatus.getInstance().isDisplaySessionActive() ||
!(event.lookup as LookupImpl).isShown
Expand All @@ -46,7 +52,11 @@ fun addIntelliSenseAcceptListener(lookup: Lookup, states: InvocationContext) {

private fun cleanup() {
lookup.removeLookupListener(this)
CodeWhispererPopupManager.getInstance().shouldListenerCancelPopup = true
try {
CodeWhispererPopupManager.getInstance().allowEditsDuringSuggestionPreview.release()
} catch (e: Exception) {
LOG.error(e) { "Failed to release allowEditsDuringSuggestionPreview semaphore" }
}
}
})
}
Loading