Skip to content

fix(amazonq): Change JB's behavior back to blocking auto trigger #5978

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 8 commits into from
Aug 18, 2025
Merged

fix(amazonq): Change JB's behavior back to blocking auto trigger #5978

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cf4af82
fix(amazonq): Change JB's behavior back to blocking auto trigger
andrewyuq Aug 15, 2025
3ecf43e
followup fixes
andrewyuq Aug 15, 2025
3bc5630
Update plugins/amazonq/codewhisperer/jetbrains-community/src/software…
andrewyuq Aug 15, 2025
35bcde4
Update plugins/amazonq/codewhisperer/jetbrains-community/src/software…
andrewyuq Aug 15, 2025
3f73d4b
Merge branch 'main' into q-lsp-chat
andrewyuq Aug 15, 2025
69b2a5f
change activeTriggerSessions to be an ordered map
andrewyuq Aug 15, 2025
4db13e8
Merge remote-tracking branch 'andrewyuq/q-lsp-chat' into q-lsp-chat
andrewyuq Aug 15, 2025
bbd91b4
detekt
andrewyuq Aug 15, 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
3 changes: 3 additions & 0 deletions ...unity/src-242/software/aws/toolkits/jetbrains/services/codewhisperer/popup/QManualCall.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.popup.QInlineCompl
fun InlineCompletionEvent.isManualCall(): Boolean =
this is InlineCompletionEvent.DirectCall && this.context?.getData(DATA_KEY_Q_AUTO_TRIGGER_INTELLISENSE) == false

fun InlineCompletionEvent.isIntelliSense(): Boolean =
this is InlineCompletionEvent.DirectCall && this.context?.getData(DATA_KEY_Q_AUTO_TRIGGER_INTELLISENSE) == true

fun getManualCallEvent(editor: Editor, isIntelliSenseAccept: Boolean): InlineCompletionEvent {
val dataContext = DataContext { dataId ->
when (dataId) {
Expand Down
3 changes: 3 additions & 0 deletions ...nity/src-243+/software/aws/toolkits/jetbrains/services/codewhisperer/popup/QManualCall.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,11 @@
import software.aws.toolkits.jetbrains.services.codewhisperer.popup.QInlineCompletionProvider.Companion.Q_INLINE_PROVIDER_ID

fun InlineCompletionEvent.isManualCall(): Boolean =
this is InlineCompletionEvent.ManualCall && this.additionalData.getUserData(KEY_Q_AUTO_TRIGGER_INTELLISENSE) == false

Check warning on line 12 in plugins/amazonq/codewhisperer/jetbrains-community/src-243+/software/aws/toolkits/jetbrains/services/codewhisperer/popup/QManualCall.kt

View workflow job for this annotation

GitHub Actions / qodana

Unstable API Usage 

'additionalData' is marked unstable with @ApiStatus.Experimental

Check warning on line 12 in plugins/amazonq/codewhisperer/jetbrains-community/src-243+/software/aws/toolkits/jetbrains/services/codewhisperer/popup/QManualCall.kt

View workflow job for this annotation

GitHub Actions / qodana

Unstable API Usage 

'com.intellij.codeInsight.inline.completion.InlineCompletionEvent.ManualCall' is marked unstable with @ApiStatus.Experimental

fun InlineCompletionEvent.isIntelliSense(): Boolean =
this is InlineCompletionEvent.ManualCall && this.additionalData.getUserData(KEY_Q_AUTO_TRIGGER_INTELLISENSE) == true

fun getManualCallEvent(editor: Editor, isIntelliSenseAccept: Boolean): InlineCompletionEvent {
val data = UserDataHolderBase().apply { this.putUserData(KEY_Q_AUTO_TRIGGER_INTELLISENSE, isIntelliSenseAccept) }
return InlineCompletionEvent.ManualCall(editor, Q_INLINE_PROVIDER_ID, data)
Expand Down
Loading
Loading