Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
83 changes: 66 additions & 17 deletions packages/amazonq/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
1 change: 1 addition & 0 deletions packages/amazonq/src/app/inline/completion.ts
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,7 @@ export class AmazonQInlineCompletionItemProvider implements InlineCompletionItem
token: CancellationToken,
getAllRecommendationsOptions?: GetAllRecommendationsOptions
): Promise<InlineCompletionItem[]> {
getLogger().info('!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!')
getLogger().info('_provideInlineCompletionItems called with: %O', {
documentUri: document.uri.toString(),
position,
Expand Down
28 changes: 14 additions & 14 deletions packages/amazonq/src/app/inline/recommendationService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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<InlineCompletionListWithReferences> = languageClient.sendRequest(
editCompletionRequestType.method,
request,
token
)
ps.push(editPromise)
// const editPromise: Promise<InlineCompletionListWithReferences> = 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
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -283,7 +283,7 @@ export class RecommendationService {
}
}

private async processRemainingRequests(
async processRemainingRequests(
languageClient: LanguageClient,
initialRequest: InlineCompletionWithReferencesParams,
firstResult: InlineCompletionListWithReferences,
Expand Down
Loading