Skip to content

Commit cd4d1df

Browse files
committed
test for build local plugin
1 parent 82f5d76 commit cd4d1df

File tree

17 files changed

+23
-7
lines changed

17 files changed

+23
-7
lines changed

aws-toolkit-vscode.code-workspace

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
{
1313
"path": "packages/amazonq",
1414
},
15+
{
16+
"path": "../language-servers",
17+
},
1518
],
1619
"settings": {
1720
"typescript.tsdk": "node_modules/typescript/lib",

packages/.vscodeignore.packages

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
!package.json
2121
!package.nls.json
2222
!package.nls.*.json
23+
!**/*/clients.zip
24+
!**/*/servers.zip
2325

2426
!quickStart**
2527
!README.**

packages/amazonq/.vscode/launch.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
"args": ["--extensionDevelopmentPath=${workspaceFolder}"],
1414
"env": {
1515
"SSMDOCUMENT_LANGUAGESERVER_PORT": "6010",
16-
"WEBPACK_DEVELOPER_SERVER": "http://localhost:8080"
16+
"WEBPACK_DEVELOPER_SERVER": "http://localhost:8080",
1717
// Below allows for overrides used during development
18-
// "__AMAZONQLSP_PATH": "${workspaceFolder}/../../../language-servers/app/aws-lsp-codewhisperer-runtimes/out/agent-standalone.js",
19-
// "__AMAZONQLSP_UI": "${workspaceFolder}/../../../language-servers/chat-client/build/amazonq-ui.js"
18+
"__AMAZONQLSP_PATH": "${workspaceFolder}/../../../language-servers/app/aws-lsp-codewhisperer-runtimes/out/agent-standalone.js",
19+
"__AMAZONQLSP_UI": "${workspaceFolder}/../../../language-servers/chat-client/build/amazonq-ui.js"
2020
},
2121
"envFile": "${workspaceFolder}/.local.env",
2222
"outFiles": ["${workspaceFolder}/dist/**/*.js", "${workspaceFolder}/../core/dist/**/*.js"],

packages/amazonq/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "amazon-q-vscode",
33
"displayName": "Amazon Q",
44
"description": "The most capable generative AI-powered assistant for building, operating, and transforming software, with advanced capabilities for managing data and AI",
5-
"version": "1.70.0-SNAPSHOT",
5+
"version": "1.70.0-g82f5d76",
66
"extensionKind": [
77
"workspace"
88
],

packages/amazonq/src/lsp/activation.ts

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,24 @@
44
*/
55

66
import vscode from 'vscode'
7+
import path from 'path'
78
import { startLanguageServer } from './client'
8-
import { AmazonQLspInstaller } from './lspInstaller'
9+
import { AmazonQResourcePaths } from './lspInstaller'
910
import { lspSetupStage, ToolkitError, messages } from 'aws-core-vscode/shared'
1011

1112
export async function activate(ctx: vscode.ExtensionContext): Promise<void> {
1213
try {
1314
await lspSetupStage('all', async () => {
14-
const installResult = await new AmazonQLspInstaller().resolve()
15-
await lspSetupStage('launch', async () => await startLanguageServer(ctx, installResult.resourcePaths))
15+
// Use local servers instead of downloading
16+
const resourcesPath = path.join(ctx.extensionPath, 'resources')
17+
// Define paths to local resources
18+
const resourcePaths: AmazonQResourcePaths = {
19+
lsp: path.join(resourcesPath, 'servers/aws-lsp-codewhisperer.js'),
20+
node: path.join(resourcesPath, 'servers/node'),
21+
ripGrep: path.join(resourcesPath, 'servers/ripgrep/rg'),
22+
ui: path.join(resourcesPath, 'amazonq-ui.js'),
23+
}
24+
await lspSetupStage('launch', async () => await startLanguageServer(ctx, resourcePaths))
1625
})
1726
} catch (err) {
1827
const e = err as ToolkitError

packages/core/src/testFixtures/workspaceFolder/java17-gradle/HelloWorldFunction/.gradle/7.3.3/gc.properties

Whitespace-only changes.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
54AC7D075A5DC99881BC79055A6DB1DEFD6877EECBAAC48DAEF5BA2F0E97718E

0 commit comments

Comments
 (0)