Merge release into master

aws-toolkit-automation · aws-toolkit-automation · commit 093dea1894c2 · 2024-07-11T22:08:19.000Z
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/amazonq/.changes/1.14.0.json b/packages/amazonq/.changes/1.14.0.json
@@ -0,0 +1,10 @@
+{
+	"date": "2024-07-11",
+	"version": "1.14.0",
+	"entries": [
+		{
+			"type": "Feature",
+			"description": "Amazon Q/dev proactively show code generation iterations"
+		}
+	]
+}
diff --git a/packages/amazonq/.changes/next-release/Feature-4a1c951a-2289-4808-b106-86fe4f03528e.json b/packages/amazonq/.changes/next-release/Feature-4a1c951a-2289-4808-b106-86fe4f03528e.json
diff --git a/packages/amazonq/CHANGELOG.md b/packages/amazonq/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.14.0 2024-07-11
+
+- **Feature** Amazon Q/dev proactively show code generation iterations
+
 ## 1.13.0 2024-07-11
 
 - **Bug Fix** AD/LDAP users may see "uv_os_get_passwd ENOENT" error on startup #5277
diff --git a/packages/amazonq/package.json b/packages/amazonq/package.json
@@ -2,7 +2,7 @@
     "name": "amazon-q-vscode",
     "displayName": "Amazon Q",
     "description": "Amazon Q is your generative AI-powered assistant across the software development lifecycle.",
-    "version": "1.14.0-SNAPSHOT",
+    "version": "1.15.0-SNAPSHOT",
     "extensionKind": [
         "workspace"
     ],
diff --git a/packages/core/src/login/webview/vue/login.vue b/packages/core/src/login/webview/vue/login.vue
@@ -222,13 +222,7 @@
                     Connecting to IAM...
                 </div>
                 <div v-else class="header bottomMargin">Authenticating in browser...</div>
-                <button
-                    class="continue-button"
-                    v-on:click="handleCancelButton()"
-                    style="color: #6f6f6f; background-color: var(--vscode-input-background)"
-                >
-                    Cancel
-                </button>
+                <button class="continue-button" v-on:click="handleCancelButton()">Cancel</button>
             </div>
         </template>
 
@@ -666,6 +660,26 @@ export default defineComponent({
     color: #6f6f6f;
     cursor: not-allowed;
 }
+body.vscode-high-contrast:not(body.vscode-high-contrast-light) .continue-button {
+    background-color: white;
+    color: var(--vscode-input-background);
+}
+
+body.vscode-high-contrast:not(body.vscode-high-contrast-light) .continue-button:disabled {
+    background-color: #6f6f6f;
+    color: var(--vscode-input-background);
+}
+
+body.vscode-high-contrast-light .continue-button {
+    background-color: var(--vscode-button-background);
+    color: white;
+}
+
+body.vscode-high-contrast-light .continue-button:disabled {
+    background-color: #6f6f6f;
+    color: var(--vscode-input-background);
+}
+
 .urlInput {
     background-color: var(--vscode-input-background);
     width: 244px;
@@ -679,10 +693,12 @@ export default defineComponent({
     font-size: var(--font-size-base);
     font-weight: 400;
 }
-body.vscode-light .urlInput {
+body.vscode-light .urlInput,
+body.vscode-high-contrast-light .urlInput {
     color: black;
 }
-body.vscode-dark .urlInput {
+body.vscode-dark .urlInput,
+body.vscode-high-contrast:not(body.vscode-high-contrast-light) .urlInput {
     color: #cccccc;
 }
 .iamInput {
@@ -698,10 +714,13 @@ body.vscode-dark .urlInput {
     font-size: var(--font-size-base);
     font-weight: 400;
 }
-body.vscode-light .iamInput {
+body.vscode-light .iamInput,
+body.vscode-high-contrast-light .iamInput {
     color: black;
 }
-body.vscode-dark .iamInput {
+
+body.vscode-dark .iamInput,
+body.vscode-high-contrast:not(body.vscode-high-contrast-light) .iamInput {
     color: #cccccc;
 }
 .regionSelect {
@@ -716,10 +735,13 @@ body.vscode-dark .iamInput {
     font-size: var(--font-size-base);
     font-weight: 400;
 }
-body.vscode-light .regionSelect {
+body.vscode-light .regionSelect,
+body.vscode-high-contrast-light .regionSelect {
     color: black;
 }
-body.vscode-dark .regionSelect {
+
+body.vscode-dark .regionSelect,
+body.vscode-high-contrast:not(body.vscode-high-contrast-light) .regionSelect {
     color: white;
 }
 .start-url-error {
diff --git a/packages/core/src/login/webview/vue/reauthenticate.vue b/packages/core/src/login/webview/vue/reauthenticate.vue
@@ -225,6 +225,11 @@ button#cancel {
     cursor: pointer;
 }
 
+body.vscode-high-contrast:not(body.vscode-high-contrast-light) button#reauthenticate {
+    background-color: white;
+    color: black;
+}
+
 #title {
     font-weight: bold;
 }
diff --git a/packages/core/src/login/webview/vue/selectableItem.vue b/packages/core/src/login/webview/vue/selectableItem.vue
@@ -134,13 +134,15 @@ export default defineComponent({
     word-break: break-all;
 }
 
-.vscode-dark .item-container-base.focussed:before {
+.vscode-dark .item-container-base.focussed:before,
+body.vscode-high-contrast:not(body.vscode-high-contrast-light) .item-container-base.focussed:before {
     background-color: white;
     color: rgba(0, 0, 0, 0.8);
 }
-.vscode-light .item-container-base.focussed:before {
-    background-color: black;
-    color: rgba(255, 255, 255, 0.8);
+.vscode-light .item-container-base.focussed:before,
+body.vscode-high-contrast-light .item-container-base.focussed:before {
+    background-color: rgba(255, 255, 255, 0.8);
+    color: black;
 }
 
 .hovering {
@@ -178,10 +180,12 @@ export default defineComponent({
     display: flex;
     align-items: center;
 }
-.vscode-dark .icon .svg-path {
+.vscode-dark .icon .svg-path,
+body.vscode-high-contrast:not(body.vscode-high-contrast-light) .icon .svg-path {
     fill: white;
 }
-.vscode-light .icon .svg-path {
+.vscode-light .icon .svg-path,
+body.vscode-high-contrast-light .icon .svg-path {
     fill: black;
 }
 </style>

Original file line number	Diff line number	Diff line change
`@@ -225,6 +225,11 @@ button#cancel {`
`225`	`225`	`cursor: pointer;`
`226`	`226`	`}`
`227`	`227`
	`228`	`+body.vscode-high-contrast:not(body.vscode-high-contrast-light) button#reauthenticate {`
	`229`	`+ background-color: white;`
	`230`	`+ color: black;`
	`231`	`+}`
	`232`	`+`
`228`	`233`	`#title {`
`229`	`234`	`font-weight: bold;`
`230`	`235`	`}`
Original file line number	Diff line number	Diff line change
`@@ -134,13 +134,15 @@ export default defineComponent({`
`134`	`134`	`word-break: break-all;`
`135`	`135`	`}`
`136`	`136`
`137`		`-.vscode-dark .item-container-base.focussed:before {`
	`137`	`+.vscode-dark .item-container-base.focussed:before,`
	`138`	`+body.vscode-high-contrast:not(body.vscode-high-contrast-light) .item-container-base.focussed:before {`
`138`	`139`	`background-color: white;`
`139`	`140`	`color: rgba(0, 0, 0, 0.8);`
`140`	`141`	`}`
`141`		`-.vscode-light .item-container-base.focussed:before {`
`142`		`- background-color: black;`
`143`		`- color: rgba(255, 255, 255, 0.8);`
	`142`	`+.vscode-light .item-container-base.focussed:before,`
	`143`	`+body.vscode-high-contrast-light .item-container-base.focussed:before {`
	`144`	`+ background-color: rgba(255, 255, 255, 0.8);`
	`145`	`+ color: black;`
`144`	`146`	`}`
`145`	`147`
`146`	`148`	`.hovering {`
`@@ -178,10 +180,12 @@ export default defineComponent({`
`178`	`180`	`display: flex;`
`179`	`181`	`align-items: center;`
`180`	`182`	`}`
`181`		`-.vscode-dark .icon .svg-path {`
	`183`	`+.vscode-dark .icon .svg-path,`
	`184`	`+body.vscode-high-contrast:not(body.vscode-high-contrast-light) .icon .svg-path {`
`182`	`185`	`fill: white;`
`183`	`186`	`}`
`184`		`-.vscode-light .icon .svg-path {`
	`187`	`+.vscode-light .icon .svg-path,`
	`188`	`+body.vscode-high-contrast-light .icon .svg-path {`
`185`	`189`	`fill: black;`
`186`	`190`	`}`
`187`	`191`	`</style>`