Skip to content

Commit dabf574

Browse files
committed
Revert "fix(amazonq): Let Enter invoke auto completion more consistently (aws#7700)"
This reverts commit 477b71a.
1 parent 42125c3 commit dabf574

File tree

3 files changed

+6
-29
lines changed

3 files changed

+6
-29
lines changed

packages/amazonq/.changes/next-release/Bug Fix-316fb610-0ea9-40d1-bdb7-d371a6be4a4e.json

Lines changed: 0 additions & 4 deletions
This file was deleted.

packages/amazonq/src/app/inline/completion.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -241,12 +241,6 @@ export class AmazonQInlineCompletionItemProvider implements InlineCompletionItem
241241
return []
242242
}
243243

244-
const isAutoTrigger = context.triggerKind === InlineCompletionTriggerKind.Automatic
245-
if (isAutoTrigger && !CodeSuggestionsState.instance.isSuggestionsEnabled()) {
246-
// return early when suggestions are disabled with auto trigger
247-
return []
248-
}
249-
250244
// yield event loop to let the document listen catch updates
251245
await sleep(1)
252246
// prevent user deletion invoking auto trigger
@@ -260,6 +254,12 @@ export class AmazonQInlineCompletionItemProvider implements InlineCompletionItem
260254
try {
261255
const t0 = performance.now()
262256
vsCodeState.isRecommendationsActive = true
257+
const isAutoTrigger = context.triggerKind === InlineCompletionTriggerKind.Automatic
258+
if (isAutoTrigger && !CodeSuggestionsState.instance.isSuggestionsEnabled()) {
259+
// return early when suggestions are disabled with auto trigger
260+
return []
261+
}
262+
263263
// handling previous session
264264
const prevSession = this.sessionManager.getActiveSession()
265265
const prevSessionId = prevSession?.sessionId

packages/amazonq/src/app/inline/documentEventListener.ts

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,6 @@ export class DocumentEventListener {
2121
this.lastDocumentChangeEventMap.clear()
2222
}
2323
this.lastDocumentChangeEventMap.set(e.document.uri.fsPath, { event: e, timestamp: performance.now() })
24-
// The VS Code provideInlineCompletionCallback may not trigger when Enter is pressed, especially in Python files
25-
// manually make this trigger. In case of duplicate, the provideInlineCompletionCallback is already debounced
26-
if (this.isEnter(e) && vscode.window.activeTextEditor) {
27-
void vscode.commands.executeCommand('editor.action.inlineSuggest.trigger')
28-
}
2924
}
3025
})
3126
}
@@ -52,18 +47,4 @@ export class DocumentEventListener {
5247
this.documentChangeListener.dispose()
5348
}
5449
}
55-
56-
private isEnter(e: vscode.TextDocumentChangeEvent): boolean {
57-
if (e.contentChanges.length !== 1) {
58-
return false
59-
}
60-
const str = e.contentChanges[0].text
61-
if (str.length === 0) {
62-
return false
63-
}
64-
return (
65-
(str.startsWith('\r\n') && str.substring(2).trim() === '') ||
66-
(str[0] === '\n' && str.substring(1).trim() === '')
67-
)
68-
}
6950
}

0 commit comments

Comments
 (0)