Merge branch 'feature/editable_diffview' into feature/editable_diffview

Author: ashishrp-aws

docs/lsp.md

@@ -77,26 +77,60 @@ If you want to connect a local version of language-server-runtimes to aws-toolki
     /toolkit
     /core
     /amazonq
+    /language-servers
     /language-server-runtimes
     ```
 
 2. Inside of the language-server-runtimes project run:
+
     ```
     npm install
     npm run compile
     cd runtimes
     npm run prepub
     cd out
+    ```
+
+    If you get an error running `npm run prepub`, you can instead run `npm run prepub:copyFiles` to skip cleaning and testing.
+
+3. Choose one of the following approaches:
+
+### Option A: Using npm pack (Recommended)
+
+3a. Create a package file:
+
+    npm pack
+
+You will see a file created like this: `aws-language-server-runtimes-0.*.*.tgz`
+
+4a. Inside of language-servers, find the package where you need the change.
+
+For example, if you would like the change in `language-servers/app/aws-lsp-codewhisperer-runtimes`, you would run:
+
+    cd language-servers/app/aws-lsp-codewhisperer-runtimes
+
+    npm install ../../../language-server-runtimes/runtimes/out/aws-language-server-runtimes-0.*.*.tgz
+
+    npm run compile
+
+5a. If you need the change in aws-toolkit-vscode run:
+
+    cd aws-toolkit-vscode
+
+    npm install ../language-server-runtimes/runtimes/out/aws-language-server-runtimes-0.*.*.tgz
+
+### Option B: Using npm link (Alternative)
+
+3b. Create npm links:
+
     npm link
     cd ../../types
     npm link
-    ```
-    If you get an error running `npm run prepub`, you can instead run `npm run prepub:copyFiles` to skip cleaning and testing.
-3. Inside of aws-toolkit-vscode run:
-    ```
+
+4b. Inside of aws-toolkit-vscode run:
+
     npm install
     npm link @aws/language-server-runtimes @aws/language-server-runtimes-types
-    ```
 
 ## Amazon Q Inline Activation
 

package-lock.json

@@ -0,0 +1,5 @@
+{
+	"date": "2025-08-15",
+	"version": "1.90.0",
+	"entries": []
+}

packages/amazonq/.changes/1.90.0.json

@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "Amazon Q supports admin control for MCP servers to restrict MCP server usage"
+}

packages/amazonq/.changes/next-release/Feature-5e9de7e7-cf7b-4ed3-824f-062b82b3f4b9.json

@@ -1,3 +1,7 @@
+## 1.90.0 2025-08-15
+
+- Miscellaneous non-user-facing changes
+
 ## 1.89.0 2025-08-13
 
 - Miscellaneous non-user-facing changes

packages/amazonq/CHANGELOG.md

@@ -2,7 +2,7 @@
     "name": "amazon-q-vscode",
     "displayName": "Amazon Q",
     "description": "The most capable generative AI–powered assistant for software development.",
-    "version": "1.90.0-SNAPSHOT",
+    "version": "1.91.0-SNAPSHOT",
     "extensionKind": [
         "workspace"
     ],
@@ -219,6 +219,11 @@
                     "markdownDescription": "%AWS.configuration.description.amazonq.proxy.certificateAuthority%",
                     "default": null,
                     "scope": "application"
+                },
+                "amazonQ.proxy.enableProxyAndCertificateAutoDiscovery": {
+                    "type": "boolean",
+                    "markdownDescription": "%AWS.configuration.description.amazonq.proxy.enableProxyAndCertificateAutoDiscovery%",
+                    "default": true
                 }
             }
         },

packages/amazonq/package.json

@@ -18,6 +18,8 @@ export const emptyDiffSvg = {
     originalCodeHighlightRange: [],
 }
 
+const defaultLineHighlightLength = 4
+
 export class SvgGenerationService {
     /**
      * Generates an SVG image representing a code diff
@@ -431,8 +433,12 @@ export class SvgGenerationService {
         for (let lineIndex = 0; lineIndex < originalCode.length; lineIndex++) {
             const line = originalCode[lineIndex]
 
+            /**
+             * If [line] is an empty line or only contains whitespace char, [diffWordsWithSpace] will say it's not an "remove", i.e. [part.removed] will be undefined,
+             * therefore the deletion will not be highlighted. Thus fallback this scenario to highlight the entire line
+             */
             // If line exists in modifiedLines as a key, process character diffs
-            if (Array.from(modifiedLines.keys()).includes(line)) {
+            if (Array.from(modifiedLines.keys()).includes(line) && line.trim().length > 0) {
                 const modifiedLine = modifiedLines.get(line)!
                 const changes = diffWordsWithSpace(line, modifiedLine)
 
@@ -455,7 +461,7 @@ export class SvgGenerationService {
                 originalRanges.push({
                     line: lineIndex,
                     start: 0,
-                    end: line.length,
+                    end: line.length ?? defaultLineHighlightLength,
                 })
             }
         }

packages/amazonq/src/app/inline/EditRendering/svgGenerator.ts

@@ -9,7 +9,6 @@ import {
     CodeWhispererConstants,
     isInlineCompletionEnabled,
     runtimeLanguageContext,
-    TelemetryHelper,
     UserWrittenCodeTracker,
     vsCodeState,
 } from 'aws-core-vscode/codewhisperer'
@@ -52,11 +51,6 @@ export async function activate() {
                     return
                 }
 
-                if (vsCodeState.lastUserModificationTime) {
-                    TelemetryHelper.instance.setTimeSinceLastModification(
-                        performance.now() - vsCodeState.lastUserModificationTime
-                    )
-                }
                 vsCodeState.lastUserModificationTime = performance.now()
                 /**
                  * Important:  Doing this sleep(10) is to make sure

packages/amazonq/src/app/inline/activation.ts

@@ -391,6 +391,9 @@ export class AmazonQInlineCompletionItemProvider implements InlineCompletionItem
                 }
                 this.languageClient.sendNotification(this.logSessionResultMessageName, params)
                 this.sessionManager.clear()
+                // Do not make auto trigger if user rejects a suggestion
+                // by typing characters that does not match
+                return []
             }
 
             // tell the tutorial that completions has been triggered

packages/amazonq/src/app/inline/completion.ts

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import vscode from 'vscode'
+import vscode, { version } from 'vscode'
 import * as nls from 'vscode-nls'
 import { LanguageClient, LanguageClientOptions, RequestType, State } from 'vscode-languageclient'
 import { InlineCompletionManager } from '../app/inline/completion'
@@ -165,7 +165,7 @@ export async function startLanguageServer(
             aws: {
                 clientInfo: {
                     name: getClientName(),
-                    version: extensionVersion,
+                    version: version,
                     extension: {
                         name: 'AmazonQ-For-VSCode',
                         version: extensionVersion,