Merge #5749 from justinmk3/minvscode

feat(startup): show message if vscode is outdated

Author: justinmk3

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/core/package.json

@@ -5,7 +5,7 @@
     "license": "Apache-2.0",
     "engines": {
         "npm": "^10.1.0",
-        "vscode": "^1.83.0"
+        "vscode": "^1.68.0"
     },
     "exports": {
         ".": "./dist/src/extension.js",

packages/core/src/extension.ts

@@ -55,7 +55,7 @@ import { registerCommands } from './commands'
 // In web mode everything must be in a single file, so things like the endpoints file will not be available.
 // The following imports the endpoints file, which causes webpack to bundle it in the final output file
 import endpoints from '../resources/endpoints.json'
-import { getLogger, setupUninstallHandler } from './shared'
+import { getLogger, maybeShowMinVscodeWarning, setupUninstallHandler } from './shared'
 import { showViewLogsMessage } from './shared/utilities/messages'
 
 disableAwsSdkWarning()
@@ -102,6 +102,8 @@ export async function activateCommon(
         getLogger().error('fs.init: invalid home directory given by env vars: %O', homeDirLogs)
     }
 
+    void maybeShowMinVscodeWarning('1.83.0')
+
     if (isCloud9()) {
         vscode.window.withProgress = wrapWithProgressForCloud9(globals.outputChannel)
         context.subscriptions.push(

packages/core/src/shared/extensionStartup.ts

@@ -6,14 +6,43 @@
 import * as _ from 'lodash'
 import * as path from 'path'
 import * as vscode from 'vscode'
+import * as semver from 'semver'
 import * as nls from 'vscode-nls'
 
 import { BaseTemplates } from './templates/baseTemplates'
 import { fs } from '../shared/fs/fs'
-import { getIdeProperties, isCloud9, isCn } from './extensionUtilities'
+import { getIdeProperties, getIdeType, isAmazonQ, isCloud9, isCn, productName } from './extensionUtilities'
+import * as localizedText from './localizedText'
+import { AmazonQPromptSettings, ToolkitPromptSettings } from './settings'
 
 const localize = nls.loadMessageBundle()
 
+/**
+ * Shows a (suppressible) warning if the current vscode version is older than `minVscode`.
+ */
+export async function maybeShowMinVscodeWarning(minVscode: string) {
+    const settings = isAmazonQ() ? AmazonQPromptSettings.instance : ToolkitPromptSettings.instance
+    if (!(await settings.isPromptEnabled('minIdeVersion'))) {
+        return
+    }
+    const updateButton = `Update ${vscode.env.appName}`
+    if (getIdeType() === 'vscode' && semver.lt(vscode.version, minVscode)) {
+        void vscode.window
+            .showWarningMessage(
+                `${productName()} will soon require VS Code ${minVscode} or newer. The currently running version ${vscode.version} will no longer receive updates.`,
+                updateButton,
+                localizedText.dontShow
+            )
+            .then(async (resp) => {
+                if (resp === updateButton) {
+                    await vscode.commands.executeCommand('update.checkForUpdate')
+                } else if (resp === localizedText.dontShow) {
+                    void settings.disablePrompt('minIdeVersion')
+                }
+            })
+    }
+}
+
 /**
  * Helper function to show a webview containing the quick start page
  *

packages/core/src/shared/extensionUtilities.ts

@@ -58,36 +58,29 @@ export function commandsPrefix(): string {
     return isAmazonQ() ? 'Amazon Q' : getIdeProperties().company
 }
 
-export enum IDE {
-    vscode,
-    cloud9,
-    sagemaker,
-    unknown,
-}
-
 let computeRegion: string | undefined = notInitialized
 
-export function getIdeType(): IDE {
+export function getIdeType(): 'vscode' | 'cloud9' | 'sagemaker' | 'unknown' {
     const settings = DevSettings.instance
     if (
         vscode.env.appName === cloud9Appname ||
         vscode.env.appName === cloud9CnAppname ||
         settings.get('forceCloud9', false)
     ) {
-        return IDE.cloud9
+        return 'cloud9'
     }
 
     if (vscode.env.appName === sageMakerAppname) {
-        return IDE.sagemaker
+        return 'sagemaker'
     }
 
     // Theia doesn't necessarily have all env properties
     // so we should be defensive and assume appName is nullable.
     if (vscode.env.appName?.startsWith(vscodeAppname)) {
-        return IDE.vscode
+        return 'vscode'
     }
 
-    return IDE.unknown
+    return 'unknown'
 }
 
 interface IdeProperties {
@@ -112,12 +105,12 @@ export function getIdeProperties(): IdeProperties {
     }
 
     switch (getIdeType()) {
-        case IDE.cloud9:
+        case 'cloud9':
             if (isCn()) {
                 return createCloud9Properties(localize('AWS.title.cn', 'Amazon'))
             }
             return createCloud9Properties(company)
-        case IDE.sagemaker:
+        case 'sagemaker':
             if (isCn()) {
                 // check for cn region
                 return createSageMakerProperties(localize('AWS.title.cn', 'Amazon'))
@@ -155,7 +148,7 @@ function createCloud9Properties(company: string): IdeProperties {
  * Decides if the current system is (the specified flavor of) Cloud9.
  */
 export function isCloud9(flavor: 'classic' | 'codecatalyst' | 'any' = 'any'): boolean {
-    const cloud9 = getIdeType() === IDE.cloud9
+    const cloud9 = getIdeType() === 'cloud9'
     if (!cloud9 || flavor === 'any') {
         return cloud9
     }

packages/core/src/shared/index.ts

@@ -14,7 +14,8 @@ export { activate as activateTelemetry } from './telemetry/activation'
 export { DefaultAwsContext } from './awsContext'
 export { DefaultAWSClientBuilder, ServiceOptions } from './awsClientBuilder'
 export { Settings } from './settings'
-export { initializeComputeRegion } from './extensionUtilities'
+export * from './extensionUtilities'
+export * from './extensionStartup'
 export { RegionProvider } from './regions/regionProvider'
 export { Commands } from './vscode/commands2'
 export { getMachineId } from './vscode/env'

packages/core/src/shared/sam/activation.ts

@@ -25,7 +25,7 @@ import * as goLensProvider from '../codelens/goCodeLensProvider'
 import { SamTemplateCodeLensProvider } from '../codelens/samTemplateCodeLensProvider'
 import * as jsLensProvider from '../codelens/typescriptCodeLensProvider'
 import { ExtContext, VSCODE_EXTENSION_ID } from '../extensions'
-import { getIdeProperties, getIdeType, IDE, isCloud9 } from '../extensionUtilities'
+import { getIdeProperties, getIdeType, isCloud9 } from '../extensionUtilities'
 import { getLogger } from '../logger/logger'
 import { PerfLog } from '../logger/perfLogger'
 import { NoopWatcher } from '../fs/watchedFiles'
@@ -324,7 +324,7 @@ async function createYamlExtensionPrompt(): Promise<void> {
     // not have a marketplace or contain the YAML plugin.
     if (
         (await settings.isPromptEnabled('yamlExtPrompt')) &&
-        getIdeType() === IDE.vscode &&
+        getIdeType() === 'vscode' &&
         !vscode.extensions.getExtension(VSCODE_EXTENSION_ID.yaml)
     ) {
         // Disposed immediately after showing one, so the user isn't prompted