Skip to content

feat(amazonq): support import through language server #6896

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
justinmk3 merged 1 commit into from
Apr 1, 2025
Merged

feat(amazonq): support import through language server #6896

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
47 changes: 24 additions & 23 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions packages/amazonq/src/app/inline/completion.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import {
ReferenceHoverProvider,
ReferenceInlineProvider,
ReferenceLogViewProvider,
ImportAdderProvider,
} from 'aws-core-vscode/codewhisperer'

export class InlineCompletionManager implements Disposable {
Expand Down Expand Up @@ -66,6 +67,7 @@ export class InlineCompletionManager implements Disposable {
item: InlineCompletionItemWithReferences,
editor: TextEditor,
requestStartTime: number,
startLine: number,
firstCompletionDisplayLatency?: number
) => {
// TODO: also log the seen state for other suggestions in session
Expand Down Expand Up @@ -96,6 +98,9 @@ export class InlineCompletionManager implements Disposable {
ReferenceLogViewProvider.instance.addReferenceLog(referenceLog)
ReferenceHoverProvider.instance.addCodeReferences(item.insertText as string, item.references)
}
if (item.mostRelevantMissingImports?.length) {
await ImportAdderProvider.instance.onAcceptRecommendation(editor, item, startLine)
}
}
commands.registerCommand('aws.amazonq.acceptInline', onInlineAcceptance)

Expand Down Expand Up @@ -200,6 +205,7 @@ export class AmazonQInlineCompletionItemProvider implements InlineCompletionItem
item,
editor,
session.requestStartTime,
position.line,
session.firstCompletionDisplayLatency,
],
}
Expand All @@ -208,6 +214,7 @@ export class AmazonQInlineCompletionItemProvider implements InlineCompletionItem
item.insertText as string,
item.references
)
ImportAdderProvider.instance.onShowRecommendation(document, position.line, item)
}
return items as InlineCompletionItem[]
}
Expand Down
2 changes: 1 addition & 1 deletion packages/core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@
"devDependencies": {
"@aws-sdk/types": "^3.13.1",
"@aws/chat-client-ui-types": "^0.0.8",
"@aws/language-server-runtimes": "^0.2.44",
"@aws/language-server-runtimes": "^0.2.49",
"@cspotcode/source-map-support": "^0.8.1",
"@sinonjs/fake-timers": "^10.0.2",
"@types/adm-zip": "^0.4.34",
Expand Down
1 change: 1 addition & 0 deletions packages/core/src/codewhisperer/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ export { RecommendationService } from './service/recommendationService'
export { ClassifierTrigger } from './service/classifierTrigger'
export { DocumentChangedSource, KeyStrokeHandler, DefaultDocumentChangedType } from './service/keyStrokeHandler'
export { ReferenceLogViewProvider } from './service/referenceLogViewProvider'
export { ImportAdderProvider } from './service/importAdderProvider'
export { LicenseUtil } from './util/licenseUtil'
export { SecurityIssueProvider } from './service/securityIssueProvider'
export { listScanResults, mapToAggregatedList, pollScanJobStatus } from './service/securityScanHandler'
Expand Down
Loading