From af10aa2c2e9cfc19c4cac9c5acdf0d1738743864 Mon Sep 17 00:00:00 2001 From: Will Lo Date: Tue, 7 Oct 2025 14:34:41 -0700 Subject: [PATCH 1/2] fix: experiment --- .../src/app/inline/recommendationService.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/amazonq/src/app/inline/recommendationService.ts b/packages/amazonq/src/app/inline/recommendationService.ts index 60fa8749cb0..df4f83b82af 100644 --- a/packages/amazonq/src/app/inline/recommendationService.ts +++ b/packages/amazonq/src/app/inline/recommendationService.ts @@ -246,12 +246,12 @@ export class RecommendationService { if (result.partialResultToken) { if (!isInlineEdit) { // If the suggestion is COMPLETIONS and there are more results to fetch, handle them in the background - getLogger().info( - 'Suggestion type is COMPLETIONS. Start fetching for more items if partialResultToken exists.' - ) - this.processRemainingRequests(languageClient, request, result, token).catch((error) => { - languageClient.warn(`Error when getting suggestions: ${error}`) - }) + // getLogger().info( + // 'Suggestion type is COMPLETIONS. Start fetching for more items if partialResultToken exists.' + // ) + // this.processRemainingRequests(languageClient, request, result, token).catch((error) => { + // languageClient.warn(`Error when getting suggestions: ${error}`) + // }) } else { // Skip fetching for more items if the suggesion is EDITS. If it is EDITS suggestion, only fetching for more // suggestions when the user start to accept a suggesion. @@ -283,7 +283,7 @@ export class RecommendationService { } } - private async processRemainingRequests( + async processRemainingRequests( languageClient: LanguageClient, initialRequest: InlineCompletionWithReferencesParams, firstResult: InlineCompletionListWithReferences, From ac892f75c8cbd349d86cb34d85e9d55ecd7a1125 Mon Sep 17 00:00:00 2001 From: Will Lo Date: Wed, 8 Oct 2025 00:47:30 -0700 Subject: [PATCH 2/2] disable --- packages/amazonq/package.json | 83 +++++++++++++++---- packages/amazonq/src/app/inline/completion.ts | 1 + .../src/app/inline/recommendationService.ts | 14 ++-- 3 files changed, 74 insertions(+), 24 deletions(-) diff --git a/packages/amazonq/package.json b/packages/amazonq/package.json index cfe150bd418..cd676c7016c 100644 --- a/packages/amazonq/package.json +++ b/packages/amazonq/package.json @@ -1289,124 +1289,173 @@ "fontCharacter": "\\f1d2" } }, - "aws-lambda-function": { + "aws-lambda-deployed-function": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", "fontCharacter": "\\f1d3" } }, - "aws-mynah-MynahIconBlack": { + "aws-lambda-function": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", "fontCharacter": "\\f1d4" } }, - "aws-mynah-MynahIconWhite": { + "aws-lambda-invoke-remotely": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", "fontCharacter": "\\f1d5" } }, - "aws-mynah-logo": { + "aws-mynah-MynahIconBlack": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", "fontCharacter": "\\f1d6" } }, - "aws-redshift-cluster": { + "aws-mynah-MynahIconWhite": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", "fontCharacter": "\\f1d7" } }, - "aws-redshift-cluster-connected": { + "aws-mynah-logo": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", "fontCharacter": "\\f1d8" } }, - "aws-redshift-database": { + "aws-redshift-cluster": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", "fontCharacter": "\\f1d9" } }, - "aws-redshift-redshift-cluster-connected": { + "aws-redshift-cluster-connected": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", "fontCharacter": "\\f1da" } }, - "aws-redshift-schema": { + "aws-redshift-database": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", "fontCharacter": "\\f1db" } }, - "aws-redshift-table": { + "aws-redshift-redshift-cluster-connected": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", "fontCharacter": "\\f1dc" } }, - "aws-s3-bucket": { + "aws-redshift-schema": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", "fontCharacter": "\\f1dd" } }, - "aws-s3-create-bucket": { + "aws-redshift-table": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", "fontCharacter": "\\f1de" } }, - "aws-sagemaker-code-editor": { + "aws-s3-bucket": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", "fontCharacter": "\\f1df" } }, - "aws-sagemaker-jupyter-lab": { + "aws-s3-create-bucket": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", "fontCharacter": "\\f1e0" } }, - "aws-schemas-registry": { + "aws-sagemaker-code-editor": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", "fontCharacter": "\\f1e1" } }, - "aws-schemas-schema": { + "aws-sagemaker-jupyter-lab": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", "fontCharacter": "\\f1e2" } }, - "aws-stepfunctions-preview": { + "aws-sagemakerunifiedstudio-catalog": { "description": "AWS Contributed Icon", "default": { "fontPath": "./resources/fonts/aws-toolkit-icons.woff", "fontCharacter": "\\f1e3" } + }, + "aws-sagemakerunifiedstudio-spaces": { + "description": "AWS Contributed Icon", + "default": { + "fontPath": "./resources/fonts/aws-toolkit-icons.woff", + "fontCharacter": "\\f1e4" + } + }, + "aws-sagemakerunifiedstudio-spaces-dark": { + "description": "AWS Contributed Icon", + "default": { + "fontPath": "./resources/fonts/aws-toolkit-icons.woff", + "fontCharacter": "\\f1e5" + } + }, + "aws-sagemakerunifiedstudio-symbol-int": { + "description": "AWS Contributed Icon", + "default": { + "fontPath": "./resources/fonts/aws-toolkit-icons.woff", + "fontCharacter": "\\f1e6" + } + }, + "aws-sagemakerunifiedstudio-table": { + "description": "AWS Contributed Icon", + "default": { + "fontPath": "./resources/fonts/aws-toolkit-icons.woff", + "fontCharacter": "\\f1e7" + } + }, + "aws-schemas-registry": { + "description": "AWS Contributed Icon", + "default": { + "fontPath": "./resources/fonts/aws-toolkit-icons.woff", + "fontCharacter": "\\f1e8" + } + }, + "aws-schemas-schema": { + "description": "AWS Contributed Icon", + "default": { + "fontPath": "./resources/fonts/aws-toolkit-icons.woff", + "fontCharacter": "\\f1e9" + } + }, + "aws-stepfunctions-preview": { + "description": "AWS Contributed Icon", + "default": { + "fontPath": "./resources/fonts/aws-toolkit-icons.woff", + "fontCharacter": "\\f1ea" + } } }, "walkthroughs": [ diff --git a/packages/amazonq/src/app/inline/completion.ts b/packages/amazonq/src/app/inline/completion.ts index 9c4f8e3ad20..7d649013fae 100644 --- a/packages/amazonq/src/app/inline/completion.ts +++ b/packages/amazonq/src/app/inline/completion.ts @@ -292,6 +292,7 @@ export class AmazonQInlineCompletionItemProvider implements InlineCompletionItem token: CancellationToken, getAllRecommendationsOptions?: GetAllRecommendationsOptions ): Promise { + getLogger().info('!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!') getLogger().info('_provideInlineCompletionItems called with: %O', { documentUri: document.uri.toString(), position, diff --git a/packages/amazonq/src/app/inline/recommendationService.ts b/packages/amazonq/src/app/inline/recommendationService.ts index df4f83b82af..ea5a34ac99e 100644 --- a/packages/amazonq/src/app/inline/recommendationService.ts +++ b/packages/amazonq/src/app/inline/recommendationService.ts @@ -7,7 +7,7 @@ import { InlineCompletionWithReferencesParams, inlineCompletionWithReferencesRequestType, TextDocumentContentChangeEvent, - editCompletionRequestType, + // editCompletionRequestType, LogInlineCompletionSessionResultsParams, } from '@aws/language-server-runtimes/protocol' import { CancellationToken, InlineCompletionContext, Position, TextDocument, commands } from 'vscode' @@ -150,12 +150,12 @@ export class RecommendationService { /** * Though Edit request is sent on keystrokes everytime, the language server will execute the request in a debounced manner so that it won't be immediately executed. */ - const editPromise: Promise = languageClient.sendRequest( - editCompletionRequestType.method, - request, - token - ) - ps.push(editPromise) + // const editPromise: Promise = languageClient.sendRequest( + // editCompletionRequestType.method, + // request, + // token + // ) + // ps.push(editPromise) /** * First come first serve, ideally we should simply return the first response returned. However there are some caviar here because either