Skip to content

Commit bea8b29

Browse files
committed
Merge branch 'master' into vscodeVersion
2 parents 8eceed4 + 13282a0 commit bea8b29

File tree

161 files changed

+2703
-1118
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

161 files changed

+2703
-1118
lines changed

.eslintrc.js

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -173,13 +173,15 @@ module.exports = {
173173
"Avoid importing from the core lib's dist/ folders; please use directly from the core lib defined exports.",
174174
},
175175
],
176+
// The following will place an error on the `fs-extra` import since we do not want it to be used for browser compatibility reasons.
177+
paths: [
178+
{
179+
name: 'fs-extra',
180+
message:
181+
'Avoid fs-extra, use shared/fs/fs.ts. Notify the Toolkit team if your required functionality is not available.',
182+
},
183+
],
176184
},
177-
// The following will place an error on the `fs-extra` import since we do not want it to be used for browser compatibility reasons.
178-
// {
179-
// name: 'fs-extra',
180-
// message:
181-
// 'Avoid fs-extra, use shared/fs/fs.ts. Notify the Toolkit team if your required functionality is not available.',
182-
// },
183185
],
184186
},
185187
}

docs/vscode_behaviors.md

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# VS Code Behaviors
2+
3+
Many VS Code behavoirs for certain APIs or user interactions with the IDE are not clearly documented,
4+
or documented at all. Please add any findings to this document.
5+
6+
## `deactivate()` - extension shutdown
7+
8+
This method is defined as part of the VS Code extension API, and is run on a **graceful** shutdown
9+
for each extension.
10+
11+
- Our extension and its `deactivate()` function are in the Extension Host process [1]
12+
- The Extension Host process has at most 5 seconds to shut down, after which it will exit. [1]
13+
- The vscode API will be unreliable at deactivation time. So certain VSC APIs like the filesystem may not work. [1]
14+
- The VSC Filesystem API has been confirmed to not work
15+
- In `Run & Debug` mode, closing the Debug IDE instance behaves differently depending on how it is closed
16+
- The regular close button in the Debug IDE instance results in a graceful shutdown
17+
- The red square in the root IDE instance to stop the debugging session results on a non-graceful shutdown, meaning `deactivate()` is not run.
18+
- `Reload Window` triggers `deactivate()`
19+
20+
Sources:
21+
22+
- [[1]](https://github.com/Microsoft/vscode/issues/47881#issuecomment-381910587)
23+
- [[2]](https://github.com/microsoft/vscode/issues/122825#issuecomment-814218149)
24+
25+
## State (`globalState`, `Memento`)
26+
27+
TODO:
28+
29+
- How it behaves between remote (ssh) and local
30+
- How it is not completely reliable. Reads/writes have no guarantee to work (though we are fine in most cases)
31+
- How it can break as observed with crash monitoring work. At a certain point writes were seemingly succeeding, but did not actually propagate to all IDE instances.

package-lock.json

Lines changed: 13 additions & 40 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"generateNonCodeFiles": "npm run generateNonCodeFiles -w packages/ --if-present"
4040
},
4141
"devDependencies": {
42-
"@aws-toolkits/telemetry": "^1.0.258",
42+
"@aws-toolkits/telemetry": "^1.0.267",
4343
"@playwright/browser-chromium": "^1.43.1",
4444
"@types/vscode": "^1.68.0",
4545
"@types/vscode-webview": "^1.57.1",
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"date": "2024-10-03",
3+
"version": "1.28.0",
4+
"entries": [
5+
{
6+
"type": "Bug Fix",
7+
"description": "Amazon Q /dev: define first folder as a root path for LLM-created files when using workspaces"
8+
},
9+
{
10+
"type": "Feature",
11+
"description": "Amazon Q Code Transformation: allow users to skip running tests"
12+
},
13+
{
14+
"type": "Feature",
15+
"description": "Amazon Q Developer: Updated legal disclaimer text"
16+
}
17+
]
18+
}

packages/amazonq/.changes/next-release/Bug Fix-93a879d3-5fa1-47d3-a908-77fcbce9335d.json

Lines changed: 0 additions & 4 deletions
This file was deleted.

packages/amazonq/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
## 1.28.0 2024-10-03
2+
3+
- **Bug Fix** Amazon Q /dev: define first folder as a root path for LLM-created files when using workspaces
4+
- **Feature** Amazon Q Code Transformation: allow users to skip running tests
5+
- **Feature** Amazon Q Developer: Updated legal disclaimer text
6+
17
## 1.27.0 2024-09-27
28

39
- **Bug Fix** Security Scan: Fixes an issue that incorrectly removes hardcoded credentials detections from auto scans.

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": "Amazon Q is your generative AI-powered assistant across the software development lifecycle.",
5-
"version": "1.28.0-SNAPSHOT",
5+
"version": "1.29.0-SNAPSHOT",
66
"extensionKind": [
77
"workspace"
88
],

packages/amazonq/scripts/build/copyFiles.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6+
/* eslint-disable no-restricted-imports */
67
import * as fs from 'fs-extra'
78
import * as path from 'path'
89

packages/amazonq/src/extension.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ export async function activateAmazonQCommon(context: vscode.ExtensionContext, is
131131
registerCommands(context)
132132

133133
// Handle Amazon Q Extension un-installation.
134-
setupUninstallHandler(VSCODE_EXTENSION_ID.amazonq, context)
134+
setupUninstallHandler(VSCODE_EXTENSION_ID.amazonq, context.extension.packageJSON.version, context)
135135

136136
// Hide the Amazon Q tree in toolkit explorer
137137
await setContext('aws.toolkit.amazonq.dismissed', true)

0 commit comments

Comments
 (0)