Skip to content

fix(amazonq): no starting LSP in AL2 #7096

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 2 commits into from
Apr 18, 2025
Merged

fix(amazonq): no starting LSP in AL2 #7096

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b32330
no flare in al2
leigaol Apr 17, 2025
131d151
fix import
leigaol Apr 17, 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
6 changes: 5 additions & 1 deletion packages/amazonq/src/extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
import { focusAmazonQPanel } from 'aws-core-vscode/codewhispererChat'
import { activate as activateAmazonqLsp } from './lsp/activation'
import { activate as activateInlineCompletion } from './app/inline/activation'
import { isAmazonInternalOs } from '../../core/dist/src/shared/vscode/env'

Check failure on line 46 in packages/amazonq/src/extension.ts

View workflow job for this annotation

GitHub Actions / lint (18.x, stable) 

'../../core/dist/src/shared/vscode/env' import is restricted from being used by a pattern. Avoid importing from the core lib's dist/ folders; please use directly from the core lib defined exports

export const amazonQContextPrefix = 'amazonq'

Expand Down Expand Up @@ -119,7 +120,10 @@
}
// This contains every lsp agnostic things (auth, security scan, code scan)
await activateCodeWhisperer(extContext as ExtContext)
if (Experiments.instance.get('amazonqLSP', false) || Auth.instance.isInternalAmazonUser()) {
if (
(Experiments.instance.get('amazonqLSP', false) || Auth.instance.isInternalAmazonUser()) &&
!isAmazonInternalOs()
) {
// start the Amazon Q LSP for internal users first
await activateAmazonqLsp(context)
}
Expand Down
Loading