fix codewhisperer command not found error when codewhisperer is disabled (#3518)

Will-ShaoHua · web-flow · commit 2180bda24517 · 2023-06-02T15:57:11.000-04:00
* fix codewhisperer command not found error when codewhisperer is disabled

* fix bug introduced by previous fix commit

* changelog
diff --git a/.changes/next-release/Bug Fix-185bc9a6-c99a-4c9a-b230-2dd7c90e6162.json b/.changes/next-release/Bug Fix-185bc9a6-c99a-4c9a-b230-2dd7c90e6162.json
@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Fix CodeWhisperer not found error when it is disabled by users issue #3490"
+}
diff --git a/package.json b/package.json
@@ -3157,7 +3157,7 @@
                 "command": "aws.codeWhisperer",
                 "key": "alt+c",
                 "mac": "alt+c",
-                "when": "editorTextFocus"
+                "when": "editorTextFocus && CODEWHISPERER_ENABLED"
             },
             {
                 "command": "aws.codeWhisperer.rejectCodeSuggestion",
diff --git a/src/codewhisperer/activation.ts b/src/codewhisperer/activation.ts
@@ -255,7 +255,7 @@ export async function activate(context: ExtContext): Promise<void> {
         setSubscriptionsforCloud9()
     } else if (isInlineCompletionEnabled()) {
         await setSubscriptionsforInlineCompletion()
-        await vscode.commands.executeCommand('setContext', 'CODEWHISPERER_ENABLED', true)
+        await vscode.commands.executeCommand('setContext', 'CODEWHISPERER_ENABLED', AuthUtil.instance.isConnected())
     }
 
     async function setSubscriptionsforInlineCompletion() {
diff --git a/src/codewhisperer/util/authUtil.ts b/src/codewhisperer/util/authUtil.ts
@@ -72,6 +72,8 @@ export class AuthUtil {
                 vscode.commands.executeCommand('aws.codeWhisperer.refreshStatusBar'),
                 vscode.commands.executeCommand('aws.codeWhisperer.updateReferenceLog'),
             ])
+
+            await vscode.commands.executeCommand('setContext', 'CODEWHISPERER_ENABLED', this.isConnected())
         })
     }
 

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +	"type": "Bug Fix",
 +	"description": "Fix CodeWhisperer not found error when it is disabled by users issue #3490"
 +}
Original file line number	Diff line number	Diff line change
`@@ -3157,7 +3157,7 @@`
`3157`	`3157`	`"command": "aws.codeWhisperer",`
`3158`	`3158`	`"key": "alt+c",`
`3159`	`3159`	`"mac": "alt+c",`
`3160`		`- "when": "editorTextFocus"`
	`3160`	`+ "when": "editorTextFocus && CODEWHISPERER_ENABLED"`
`3161`	`3161`	`},`
`3162`	`3162`	`{`
`3163`	`3163`	`"command": "aws.codeWhisperer.rejectCodeSuggestion",`
Original file line number	Diff line number	Diff line change
`@@ -255,7 +255,7 @@ export async function activate(context: ExtContext): Promise<void> {`
`255`	`255`	`setSubscriptionsforCloud9()`
`256`	`256`	`} else if (isInlineCompletionEnabled()) {`
`257`	`257`	`await setSubscriptionsforInlineCompletion()`
`258`		`- await vscode.commands.executeCommand('setContext', 'CODEWHISPERER_ENABLED', true)`
	`258`	`+ await vscode.commands.executeCommand('setContext', 'CODEWHISPERER_ENABLED', AuthUtil.instance.isConnected())`
`259`	`259`	`}`
`260`	`260`
`261`	`261`	`async function setSubscriptionsforInlineCompletion() {`
Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,8 @@ export class AuthUtil {`
`72`	`72`	`vscode.commands.executeCommand('aws.codeWhisperer.refreshStatusBar'),`
`73`	`73`	`vscode.commands.executeCommand('aws.codeWhisperer.updateReferenceLog'),`
`74`	`74`	`])`
	`75`	`+`
	`76`	`+ await vscode.commands.executeCommand('setContext', 'CODEWHISPERER_ENABLED', this.isConnected())`
`75`	`77`	`})`
`76`	`78`	`}`
`77`	`79`