merge upstream changes

Author: Hweinstock

.changes/1.80.0.json

@@ -0,0 +1,10 @@
+{
+	"date": "2023-07-05",
+	"version": "1.80.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "Fix function that determined who was a first time user"
+		}
+	]
+}

.changes/1.81.0.json

@@ -0,0 +1,14 @@
+{
+	"date": "2023-07-13",
+	"version": "1.81.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "codewhisperer: improper request format when sending empty supplemental context"
+		},
+		{
+			"type": "Feature",
+			"description": "CodeWhisperer: Improve suggestion quality with enhanced file context fetching"
+		}
+	]
+}

.changes/1.82.0.json

@@ -0,0 +1,22 @@
+{
+	"date": "2023-07-26",
+	"version": "1.82.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "CodeWhisperer: issue with fetching enhanced file context"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "User setting for \"Share CodeWhisperer Content With AWS\" was not reflected in workspace-level settings"
+		},
+		{
+			"type": "Feature",
+			"description": "CodeWhisperer: Improve Java suggestion quality with enhanced file context fetching"
+		},
+		{
+			"type": "Feature",
+			"description": "Lambda \"Download\" action now expects \".mjs\" extension for Node18+ lambdas"
+		}
+	]
+}

.changes/1.83.0.json

@@ -0,0 +1,10 @@
+{
+	"date": "2023-08-03",
+	"version": "1.83.0",
+	"entries": [
+		{
+			"type": "Feature",
+			"description": "IAM Identity Center (SSO): log a warning if SSO user is not linked to an account"
+		}
+	]
+}

.changes/next-release/Bug Fix-110e714c-9b81-4780-8257-ff8604f2578d.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "misleading error when downloading a Lambda to a workspace without a folder"
+}

.github/workflows/node.js.yml

@@ -14,6 +14,7 @@ jobs:
         name: test macOS
         runs-on: macos-latest
         strategy:
+            fail-fast: false
             matrix:
                 node-version: [16.x]
                 vscode-version: [minimum, stable, insiders]

.vscode/launch.json

@@ -24,20 +24,13 @@
             "preLaunchTask": "watch"
         },
         {
-            "name": "Attach to ASL Server",
-            "type": "node",
-            "request": "attach",
-            "port": 6009,
-            "restart": true,
-            "outFiles": ["${workspaceRoot}/dist/src/stepFunctions/asl/**.js"]
-        },
-        {
-            "name": "Attach to SSM Document Language Server",
-            "type": "node",
-            "request": "attach",
-            "port": 6010,
-            "restart": true,
-            "outFiles": ["${workspaceRoot}/dist/src/ssmDocument/ssm/ssmServer.js"]
+            "name": "Extension (web)",
+            "type": "pwa-extensionHost",
+            "debugWebWorkerHost": true,
+            "request": "launch",
+            "args": ["--extensionDevelopmentPath=${workspaceFolder}", "--extensionDevelopmentKind=web"],
+            "outFiles": ["${workspaceFolder}/dist/**/*.js"],
+            "preLaunchTask": "${defaultBuildTask}"
         },
         {
             "name": "Extension (webpack)",
@@ -145,6 +138,22 @@
             "program": "${workspaceFolder}/scripts/lint/testLint.ts",
             "outFiles": ["${workspaceFolder}/dist/**/*.js"],
             "preLaunchTask": "${defaultBuildTask}"
+        },
+        {
+            "name": "Attach to ASL Server",
+            "type": "node",
+            "request": "attach",
+            "port": 6009,
+            "restart": true,
+            "outFiles": ["${workspaceRoot}/dist/src/stepFunctions/asl/**.js"]
+        },
+        {
+            "name": "Attach to SSM Document Language Server",
+            "type": "node",
+            "request": "attach",
+            "port": 6010,
+            "restart": true,
+            "outFiles": ["${workspaceRoot}/dist/src/ssmDocument/ssm/ssmServer.js"]
         }
     ],
     "compounds": [

CHANGELOG.md

@@ -1,3 +1,23 @@
+## 1.83.0 2023-08-03
+
+- **Feature** IAM Identity Center (SSO): log a warning if SSO user is not linked to an account
+
+## 1.82.0 2023-07-26
+
+- **Bug Fix** CodeWhisperer: issue with fetching enhanced file context
+- **Bug Fix** User setting for "Share CodeWhisperer Content With AWS" was not reflected in workspace-level settings
+- **Feature** CodeWhisperer: Improve Java suggestion quality with enhanced file context fetching
+- **Feature** Lambda "Download" action now expects ".mjs" extension for Node18+ lambdas
+
+## 1.81.0 2023-07-13
+
+- **Bug Fix** codewhisperer: improper request format when sending empty supplemental context
+- **Feature** CodeWhisperer: Improve suggestion quality with enhanced file context fetching
+
+## 1.80.0 2023-07-05
+
+- **Bug Fix** Fix function that determined who was a first time user
+
 ## 1.79.0 2023-06-30
 
 - **Feature** New Add Connection workflow

CONTRIBUTING.md

@@ -35,15 +35,21 @@ Then clone the repository and install NPM packages:
 
 ### Run
 
-You can run the extension from Visual Studio Code:
+To run the extension from VSCode as a Node.js app:
 
 1. Select the Run panel from the sidebar.
 2. From the dropdown at the top of the Run pane, choose `Extension`.
-3. Press `F5` to launch a new instance of Visual Studio Code with the extension installed and the debugger attached.
+3. Press `F5` to launch a new instance of VSCode with the extension installed and the debugger attached.
+
+To run the extension from VSCode in "web mode" (a browser app, or "PWA"):
+
+1. Select the Run panel from the sidebar.
+2. From the dropdown at the top of the Run pane, choose `Extension (web)`.
+3. Press `F5` to launch a new instance of VSCode (web mode) with the extension installed and the debugger attached.
 
 ### Build
 
-When you launch the extension or run tests from Visual Studio Code, it will automatically build the extension and watch for changes.
+When you launch the extension or run tests from VSCode, it will automatically build the extension and watch for changes.
 
 You can also use these NPM tasks (see `npm run` for the full list):
 
@@ -118,7 +124,7 @@ You can also use these NPM tasks (see `npm run` for the full list):
 See [TESTPLAN.md](./docs/TESTPLAN.md) to understand the project's test
 structure, mechanics and philosophy.
 
-You can run tests directly from Visual Studio Code:
+You can run tests directly from VSCode:
 
 1. Select `View > Debug`, or select the Debug pane from the sidebar.
 2. From the dropdown at the top of the Debug pane, select the `Extension Tests` configuration.
@@ -343,7 +349,7 @@ Webviews can be hot-reloaded (updated without restarting the extension) by runni
 
 ### Font generation
 
-For extensions to contribute their own codicons, VS Code requires a font file as well as how that font maps to codicon IDs. The mapping is found in `package.json` under the `icons` contribution point. Icons located in `resources/icons` are stitched together at build-time into a single font, automatically adding mappings to `package.json`. More information can be found [here](docs/icons.md).
+For extensions to contribute their own codicons, VSCode requires a font file as well as how that font maps to codicon IDs. The mapping is found in `package.json` under the `icons` contribution point. Icons located in `resources/icons` are stitched together at build-time into a single font, automatically adding mappings to `package.json`. More information can be found [here](docs/icons.md).
 
 As a simple example, let's say I wanted to add a new icon for CloudWatch log streams. I would do the following:
 
@@ -373,6 +379,18 @@ Note therefore:
 2. `HEAD` implies that the URL depends on the current _default branch_ (i.e.
    `master`). Changes to other branches won't affect the marketplace page.
 
+## Using new vscode APIs
+
+The minimum required vscode version specified in [package.json](https://github.com/aws/aws-toolkit-vscode/blob/07119655109bb06105a3f53bbcd86b812b32cdbe/package.json#L16)
+is decided by the version of vscode running in Cloud9 and other vscode-compatible targets.
+
+But you can still use the latest vscode APIs, by checking the current running vscode version. For example, to use a vscode 1.64 API:
+
+1. Check the vscode version: `semver.gte(vscode.version, '1.64.0')`
+2. Disable the feature if is too old. That could mean just skipping the code entirely, or showing a different UI.
+
+Full example: https://github.com/aws/aws-toolkit-vscode/blob/7cb97a2ef0a765862d21842693967070b0dcdd49/src/shared/credentials/defaultCredentialSelectionDataProvider.ts#L54-L76
+
 ## Importing icons from other open source repos
 
 If you are contribuing visual assets from other open source repos, the source repo must have a compatible license (such as MIT), and we need to document the source of the images. Follow these steps: