Merge remote-tracking branch 'upstream/master' into crossfile-config

Author: Will-ShaoHua

packages/amazonq/.changes/next-release/Bug Fix-ff32752d-fa0b-4d38-b719-68eb3c9ddca6.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Q dev handle no change required"
+}

packages/amazonq/.changes/next-release/Deprecation-4577def6-0191-48db-bec3-480b226285b8.json

@@ -0,0 +1,4 @@
+{
+	"type": "Deprecation",
+	"description": "The next release of this extension will require VS Code 1.83.0 or newer."
+}

packages/amazonq/.changes/next-release/Feature-b02fae9d-cb44-4625-af37-0b119c18ef63.json

@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "Show a one-time warning if new VS Code is required"
+}

packages/amazonq/package.json

@@ -112,6 +112,10 @@
                             "type": "boolean",
                             "default": false
                         },
+                        "minIdeVersion": {
+                            "type": "boolean",
+                            "default": false
+                        },
                         "ssoCacheError": {
                             "type": "boolean",
                             "default": false
@@ -1046,6 +1050,6 @@
     },
     "engines": {
         "npm": "^10.1.0",
-        "vscode": "^1.83.0"
+        "vscode": "^1.68.0"
     }
 }

packages/amazonq/src/extension.ts

@@ -40,6 +40,7 @@ import {
     placeholder,
     setContext,
     setupUninstallHandler,
+    maybeShowMinVscodeWarning,
 } from 'aws-core-vscode/shared'
 import { ExtStartUpSources, telemetry } from 'aws-core-vscode/telemetry'
 import { VSCODE_EXTENSION_ID } from 'aws-core-vscode/utils'
@@ -98,6 +99,8 @@ export async function activateAmazonQCommon(context: vscode.ExtensionContext, is
         }
     }
 
+    void maybeShowMinVscodeWarning('1.83.0')
+
     globals.machineId = await getMachineId()
     globals.awsContext = new DefaultAwsContext()
     globals.sdkClientBuilder = new DefaultAWSClientBuilder(globals.awsContext)

packages/amazonq/test/unit/codewhisperer/commands/onAcceptance.test.ts

@@ -8,18 +8,14 @@ import * as vscode from 'vscode'
 import * as sinon from 'sinon'
 import {
     onAcceptance,
-    UserGroup,
     AcceptedSuggestionEntry,
     session,
     CodeWhispererTracker,
     RecommendationHandler,
-    CodeWhispererUserGroupSettings,
     AuthUtil,
 } from 'aws-core-vscode/codewhisperer'
 import { resetCodeWhispererGlobalVariables, createMockTextEditor } from 'aws-core-vscode/test'
 import { assertTelemetryCurried } from 'aws-core-vscode/test'
-import { globals } from 'aws-core-vscode/shared'
-import { extensionVersion } from 'aws-core-vscode/shared'
 
 describe('onAcceptance', function () {
     describe('onAcceptance', function () {
@@ -31,7 +27,6 @@ describe('onAcceptance', function () {
         afterEach(function () {
             sinon.restore()
             session.reset()
-            CodeWhispererUserGroupSettings.instance.reset()
         })
 
         it('Should enqueue an event object to tracker', async function () {
@@ -75,11 +70,6 @@ describe('onAcceptance', function () {
         })
 
         it('Should report telemetry that records this user decision event', async function () {
-            await globals.globalState.update('CODEWHISPERER_USER_GROUP', {
-                group: UserGroup.Control,
-                version: extensionVersion,
-            })
-
             const testStartUrl = 'testStartUrl'
             sinon.stub(AuthUtil.instance, 'startUrl').value(testStartUrl)
             const mockEditor = createMockTextEditor()
@@ -117,7 +107,6 @@ describe('onAcceptance', function () {
                 codewhispererCompletionType: 'Line',
                 codewhispererLanguage: 'python',
                 credentialStartUrl: testStartUrl,
-                codewhispererUserGroup: 'Control',
             })
         })
     })

packages/amazonq/test/unit/codewhisperer/commands/onInlineAcceptance.test.ts

@@ -8,14 +8,7 @@ import * as vscode from 'vscode'
 import * as sinon from 'sinon'
 import { resetCodeWhispererGlobalVariables, createMockTextEditor } from 'aws-core-vscode/test'
 import { assertTelemetryCurried } from 'aws-core-vscode/test'
-import {
-    onInlineAcceptance,
-    RecommendationHandler,
-    AuthUtil,
-    session,
-    CodeWhispererUserGroupSettings,
-    UserGroup,
-} from 'aws-core-vscode/codewhisperer'
+import { onInlineAcceptance, RecommendationHandler, AuthUtil, session } from 'aws-core-vscode/codewhisperer'
 import { globals } from 'aws-core-vscode/shared'
 import { extensionVersion } from 'aws-core-vscode/shared'
 
@@ -29,7 +22,6 @@ describe('onInlineAcceptance', function () {
         afterEach(function () {
             sinon.restore()
             session.reset()
-            CodeWhispererUserGroupSettings.instance.reset()
         })
 
         it('Should dispose inline completion provider', async function () {
@@ -53,7 +45,6 @@ describe('onInlineAcceptance', function () {
 
         it('Should report telemetry that records this user decision event', async function () {
             await globals.globalState.update('CODEWHISPERER_USER_GROUP', {
-                group: UserGroup.Classifier,
                 version: extensionVersion,
             })
 
@@ -95,7 +86,6 @@ describe('onInlineAcceptance', function () {
                 codewhispererCompletionType: 'Line',
                 codewhispererLanguage: 'python',
                 credentialStartUrl: testStartUrl,
-                codewhispererUserGroup: 'Classifier',
             })
         })
     })

packages/amazonq/test/unit/codewhisperer/service/keyStrokeHandler.test.ts

@@ -13,14 +13,12 @@ import {
     resetCodeWhispererGlobalVariables,
 } from 'aws-core-vscode/test'
 import * as EditorContext from 'aws-core-vscode/codewhisperer'
-import * as CodeWhispererConstants from 'aws-core-vscode/codewhisperer'
 import {
     ConfigurationEntry,
     DocumentChangedSource,
     KeyStrokeHandler,
     DefaultDocumentChangedType,
     RecommendationService,
-    CodeWhispererUserGroupSettings,
     ClassifierTrigger,
     isInlineCompletionEnabled,
     RecommendationHandler,
@@ -52,7 +50,6 @@ describe('keyStrokeHandler', function () {
         })
         afterEach(function () {
             sinon.restore()
-            CodeWhispererUserGroupSettings.instance.reset()
         })
 
         it('Whatever the input is, should skip when automatic trigger is turned off, should not call invokeAutomatedTrigger', async function () {
@@ -145,19 +142,13 @@ describe('keyStrokeHandler', function () {
             }
         })
 
-        async function testShouldInvoke(
-            input: string,
-            shouldTrigger: boolean,
-            rightContext: string = '',
-            userGroup: CodeWhispererConstants.UserGroup = CodeWhispererConstants.UserGroup.Control
-        ) {
+        async function testShouldInvoke(input: string, shouldTrigger: boolean, rightContext: string = '') {
             const mockEditor = createMockTextEditor(rightContext, 'test.js', 'javascript', 0, 0)
             const mockEvent: vscode.TextDocumentChangeEvent = createTextDocumentChangeEvent(
                 mockEditor.document,
                 new vscode.Range(new vscode.Position(0, 0), new vscode.Position(0, 1)),
                 input
             )
-            CodeWhispererUserGroupSettings.instance.userGroup = userGroup
             await KeyStrokeHandler.instance.processKeyStroke(mockEvent, mockEditor, mockClient, config)
             assert.strictEqual(
                 invokeSpy.called,

packages/amazonq/test/unit/codewhisperer/service/recommendationHandler.test.ts

@@ -10,13 +10,11 @@ import {
     ReferenceInlineProvider,
     session,
     AuthUtil,
-    CodeWhispererUserGroupSettings,
     DefaultCodeWhispererClient,
     RecommendationsList,
     ConfigurationEntry,
     RecommendationHandler,
     CodeWhispererCodeCoverageTracker,
-    UserGroup,
     supplementalContextUtil,
 } from 'aws-core-vscode/codewhisperer'
 import {
@@ -26,7 +24,6 @@ import {
     resetCodeWhispererGlobalVariables,
 } from 'aws-core-vscode/test'
 // import * as supplementalContextUtil from 'aws-core-vscode/codewhisperer'
-import { globals, extensionVersion } from 'aws-core-vscode/shared'
 
 describe('recommendationHandler', function () {
     const config: ConfigurationEntry = {
@@ -55,7 +52,6 @@ describe('recommendationHandler', function () {
 
         afterEach(function () {
             sinon.restore()
-            CodeWhispererUserGroupSettings.instance.reset()
         })
 
         it('should assign correct recommendations given input', async function () {
@@ -110,11 +106,6 @@ describe('recommendationHandler', function () {
         })
 
         it('should call telemetry function that records a CodeWhisperer service invocation', async function () {
-            await globals.globalState.update('CODEWHISPERER_USER_GROUP', {
-                group: UserGroup.CrossFile,
-                version: extensionVersion,
-            })
-
             const mockServerResult = {
                 recommendations: [{ content: "print('Hello World!')" }, { content: '' }],
                 $response: {
@@ -157,16 +148,10 @@ describe('recommendationHandler', function () {
                 codewhispererSupplementalContextTimeout: false,
                 codewhispererSupplementalContextLatency: 0,
                 codewhispererSupplementalContextLength: 100,
-                codewhispererUserGroup: 'CrossFile',
             })
         })
 
         it('should call telemetry function that records a Empty userDecision event', async function () {
-            await globals.globalState.update('CODEWHISPERER_USER_GROUP', {
-                group: UserGroup.CrossFile,
-                version: extensionVersion,
-            })
-
             const mockServerResult = {
                 recommendations: [],
                 nextToken: '',
@@ -198,7 +183,6 @@ describe('recommendationHandler', function () {
                 codewhispererCompletionType: 'Line',
                 codewhispererLanguage: 'python',
                 credentialStartUrl: testStartUrl,
-                codewhispererUserGroup: 'CrossFile',
             })
         })
     })

packages/amazonq/test/unit/codewhisperer/service/telemetry.test.ts

@@ -53,7 +53,6 @@ describe.skip('CodeWhisperer telemetry', async function () {
             codewhispererSuggestionState: 'Accept',
             codewhispererSuggestionImportCount: 0,
             codewhispererTypeaheadLength: 0,
-            codewhispererUserGroup: 'Control',
             ...ops,
         }
     }