Amazon Q: multiple issues fixes (aws#5306)

* Amazon Q: multiple issues fixes

1. Updated wording of data option settings to say "
Amazon Q Developer Pro Tier instead of Business Tier"
2. Fixed an issue where SendTelemetryEvent call would fail
due to undefined ProgrammingLanguage field
3. Fixed a chat hang issue from an infinite loop when trying
to truncate chat context below limit.
Updated wording of data optin settings
4. Make auto trigger by default true even if enableCodeSuggestion
is not called

* Amazon Q: multiple issues fixes

1. Updated wording of data option settings to say "
Amazon Q Developer Pro Tier instead of Business Tier"
2. Fixed an issue where SendTelemetryEvent call would fail
due to undefined ProgrammingLanguage field
3. Fixed a chat hang issue from an infinite loop when trying
to truncate chat context below limit.
Updated wording of data optin settings
4. Make auto trigger by default true even if enableCodeSuggestion
is not called

* test fix

Author: andrewyuq

packages/amazonq/.changes/next-release/Bug Fix-edc3438f-6837-40fe-b737-08c92bc17179.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Amazon Q: Corrected a miswording in the Amazon Q: Share Content With AWS setting."
+}

packages/core/package.nls.json

@@ -71,7 +71,7 @@
     "AWS.configuration.description.awssam.debug.snippets.api.label.cn": "Amazon SAM: API Gateway lambda invoke",
     "AWS.configuration.description.awssam.debug.snippets.api.description.cn": "A new configuration for invoking an Amazon Lambda in a CloudFormation template, simulating API Gateway",
     "AWS.configuration.description.amazonq": "Amazon Q creates a code reference when you insert a code suggestion from Amazon Q that is similar to training data. When unchecked, Amazon Q will not show code suggestions that have code references. If you authenticate through IAM Identity Center, this setting is controlled by your Amazon Q administrator. [Learn More](https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/code-reference.html)",
-    "AWS.configuration.description.amazonq.shareContentWithAWS": "When checked, your content processed by Amazon Q may be used for service improvement (except for content processed by the Amazon Q Enterprise service tier). Unchecking this box will cause AWS to delete any of your content used for that purpose. The information used to provide the Amazon Q service to you will not be affected. See the [Service Terms](https://aws.amazon.com/service-terms) for more detail.",
+    "AWS.configuration.description.amazonq.shareContentWithAWS": "When checked, your content processed by Amazon Q may be used for service improvement (except for content processed for users with the Amazon Q Developer Pro Tier). Unchecking this box will cause AWS to delete any of your content used for that purpose. The information used to provide the Amazon Q service to you will not be affected. See the [Service Terms](https://aws.amazon.com/service-terms) for more details.",
     "AWS.configuration.description.amazonq.importRecommendation": "Amazon Q will add import statements with inline code suggestions when necessary.",
     "AWS.configuration.description.amazonq.workspaceIndex": "This feature is in BETA. When you add @workspace to your question in Amazon Q chat, Amazon Q will index your open workspace files locally to use as context for its response. Extra CPU usage is expected while indexing a workspace. This will not impact Amazon Q features or your IDE, but you may manage CPU usage by setting the number of local threads in 'Local Workspace Index Threads'.",
     "AWS.configuration.description.amazonq.workspaceIndexWorkerThreads": "Number of worker threads of Amazon Q local index process. '0' will use the system default worker threads for balance performance. You may increase this number to more quickly index your workspace, but only up to your hardware's number of CPU cores. Please restart VS Code or reload the VS Code window after changing worker threads.",

packages/core/src/codewhisperer/models/model.ts

@@ -88,7 +88,7 @@ export class CodeSuggestionsState {
         return (this.#instance ??= new this())
     }
 
-    protected constructor(context: vscode.Memento = globals.context.globalState, fallback: boolean = false) {
+    protected constructor(context: vscode.Memento = globals.context.globalState, fallback: boolean = true) {
         this.#context = context
         this.#fallback = fallback
     }

packages/core/src/codewhispererChat/controllers/chat/telemetryHelper.ts

@@ -359,6 +359,9 @@ export class CWCTelemetryHelper {
         }
 
         telemetry.amazonq_addMessage.emit(event)
+        const language = this.isProgrammingLanguageSupported(triggerPayload.fileLanguage)
+            ? { languageName: triggerPayload.fileLanguage as string }
+            : undefined
         codeWhispererClient
             .sendTelemetryEvent({
                 telemetryEvent: {
@@ -367,9 +370,7 @@ export class CWCTelemetryHelper {
                         messageId: event.cwsprChatMessageId,
                         userIntent: triggerPayload.userIntent,
                         hasCodeSnippet: event.cwsprChatHasCodeSnippet,
-                        programmingLanguage: this.isProgrammingLanguageSupported(triggerPayload.fileLanguage)
-                            ? { languageName: triggerPayload.fileLanguage as string }
-                            : undefined,
+                        ...(language !== undefined ? { programmingLanguage: language } : {}),
                         activeEditorTotalCharacters: event.cwsprChatActiveEditorTotalCharacters,
                         timeToFirstChunkMilliseconds: event.cwsprChatTimeToFirstChunk,
                         timeBetweenChunks: this.getResponseStreamTimeBetweenChunks(message.tabID),

packages/core/src/codewhispererChat/editor/context/focusArea/focusAreaExtractor.ts

@@ -210,6 +210,7 @@ export class FocusAreaContextExtractor {
                         range.end.line,
                         charLimit - selectionSizeWithoutLastLine - 1
                     )
+                    return range
                 }
             }
         }

packages/core/src/test/codewhisperer/commands/basicCommands.test.ts

@@ -114,15 +114,13 @@ describe('CodeWhisperer-basicCommands', function () {
             codeSuggestionsState = new TestCodeSuggestionsState()
         })
 
-        it('has suggestions disabled by default', async function () {
+        it('has suggestions enabled by default', async function () {
             targetCommand = testCommand(toggleCodeSuggestions, codeSuggestionsState)
-            assert.strictEqual(codeSuggestionsState.isSuggestionsEnabled(), false)
+            assert.strictEqual(codeSuggestionsState.isSuggestionsEnabled(), true)
         })
 
         it('toggles states as expected', async function () {
             targetCommand = testCommand(toggleCodeSuggestions, codeSuggestionsState)
-            assert.strictEqual(codeSuggestionsState.isSuggestionsEnabled(), false)
-            await targetCommand.execute(placeholder, cwQuickPickSource)
             assert.strictEqual(codeSuggestionsState.isSuggestionsEnabled(), true)
             await targetCommand.execute(placeholder, cwQuickPickSource)
             assert.strictEqual(codeSuggestionsState.isSuggestionsEnabled(), false)
@@ -131,10 +129,7 @@ describe('CodeWhisperer-basicCommands', function () {
         })
 
         it('setSuggestionsEnabled() works as expected', async function () {
-            // initially false
-            assert.strictEqual(codeSuggestionsState.isSuggestionsEnabled(), false)
-
-            await codeSuggestionsState.setSuggestionsEnabled(true)
+            // initially true
             assert.strictEqual(codeSuggestionsState.isSuggestionsEnabled(), true)
 
             // set new state to current state
@@ -160,28 +155,28 @@ describe('CodeWhisperer-basicCommands', function () {
             assert.strictEqual(eventListener.callCount, 1)
         })
 
-        it('emits aws_modifySetting event on user toggling autoSuggestion - deactivate', async function () {
-            codeSuggestionsState = new TestCodeSuggestionsState(true)
-            assert.strictEqual(codeSuggestionsState.isSuggestionsEnabled(), true)
+        it('emits aws_modifySetting event on user toggling autoSuggestion - activate', async function () {
+            codeSuggestionsState = new TestCodeSuggestionsState(false)
+            assert.strictEqual(codeSuggestionsState.isSuggestionsEnabled(), false)
 
             targetCommand = testCommand(toggleCodeSuggestions, codeSuggestionsState)
             await targetCommand.execute(placeholder, cwQuickPickSource)
 
-            assert.strictEqual(codeSuggestionsState.isSuggestionsEnabled(), false)
+            assert.strictEqual(codeSuggestionsState.isSuggestionsEnabled(), true)
             assertTelemetryCurried('aws_modifySetting')({
                 settingId: CodeWhispererConstants.autoSuggestionConfig.settingId,
-                settingState: CodeWhispererConstants.autoSuggestionConfig.deactivated,
+                settingState: CodeWhispererConstants.autoSuggestionConfig.activated,
             })
         })
 
-        it('emits aws_modifySetting event on user toggling autoSuggestion -- activate', async function () {
+        it('emits aws_modifySetting event on user toggling autoSuggestion -- deactivate', async function () {
             targetCommand = testCommand(toggleCodeSuggestions, codeSuggestionsState)
             await targetCommand.execute(placeholder, cwQuickPickSource)
 
-            assert.strictEqual(codeSuggestionsState.isSuggestionsEnabled(), true)
+            assert.strictEqual(codeSuggestionsState.isSuggestionsEnabled(), false)
             assertTelemetryCurried('aws_modifySetting')({
                 settingId: CodeWhispererConstants.autoSuggestionConfig.settingId,
-                settingState: CodeWhispererConstants.autoSuggestionConfig.activated,
+                settingState: CodeWhispererConstants.autoSuggestionConfig.deactivated,
             })
         })