remove duplicate code

Author: Hweinstock

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

@@ -9,7 +9,6 @@ import { telemetry } from 'aws-core-vscode/telemetry'
 import { AuthUtil, CodeWhispererSettings } from 'aws-core-vscode/codewhisperer'
 import { Commands, placeholder, funcUtil } from 'aws-core-vscode/shared'
 import * as amazonq from 'aws-core-vscode/amazonq'
-import * as semver from 'semver'
 
 export async function activate(context: ExtensionContext) {
     const appInitContext = amazonq.DefaultAmazonQAppInitContext.instance
@@ -59,7 +58,6 @@ export async function activate(context: ExtensionContext) {
     await amazonq.activateBadge()
     void setupLsp()
     void setupAuthNotification()
-    void setupVscodeVersionNotification()
 }
 
 function registerApps(appInitContext: amazonq.AmazonQAppInitContext) {
@@ -106,31 +104,3 @@ async function setupAuthNotification() {
         }
     }
 }
-// TODO: remove once version bump to 1.83.0 is complete.
-export function setupVscodeVersionNotification() {
-    let notificationDisplayed = false
-    tryShowNotification()
-
-    function tryShowNotification() {
-        // Do not show the notification if the IDE version will continue to be supported.
-        if (!semver.gte(vscode.version, '1.83.0')) {
-            return
-        }
-
-        if (notificationDisplayed) {
-            return
-        }
-
-        notificationDisplayed = true
-
-        telemetry.toolkit_showNotification.emit({
-            component: 'editor',
-            id: 'versionNotification',
-            reason: 'unsupportedVersion',
-            result: 'Succeeded',
-        })
-        void vscode.window.showWarningMessage(
-            'Update VS Code to version 1.83.0+, support for previous versions will be dropped soon. '
-        )
-    }
-}

packages/core/src/extension.ts

@@ -50,6 +50,7 @@ import { Auth } from './auth'
 import { AuthFormId } from './login/webview/vue/types'
 import { getTelemetryMetadataForConn, isSsoConnection } from './auth/connection'
 import { registerCommands } from './commands'
+import * as semver from 'semver'
 
 // 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
@@ -170,7 +171,7 @@ export async function activateCommon(
         uriHandler: globals.uriHandler,
         credentialsStore: globals.loginManager.store,
     }
-
+    void setupVscodeVersionNotification()
     await activateViewsShared(extContext.extensionContext)
 
     return extContext
@@ -303,3 +304,32 @@ export async function emitUserState() {
         })
     })
 }
+
+// TODO: remove once version bump to 1.83.0 is complete.
+function setupVscodeVersionNotification() {
+    let notificationDisplayed = false
+    tryShowNotification()
+
+    function tryShowNotification() {
+        // Do not show the notification if the IDE version will continue to be supported.
+        if (!semver.gte(vscode.version, '1.83.0')) {
+            return
+        }
+
+        if (notificationDisplayed) {
+            return
+        }
+
+        notificationDisplayed = true
+
+        telemetry.toolkit_showNotification.emit({
+            component: 'editor',
+            id: 'versionNotification',
+            reason: 'unsupportedVersion',
+            result: 'Succeeded',
+        })
+        void vscode.window.showWarningMessage(
+            'Update VS Code to version 1.83.0+, support for previous versions will be dropped soon. '
+        )
+    }
+}

packages/toolkit/src/extensionNode.ts

@@ -7,48 +7,15 @@ import type { ExtensionContext } from 'vscode'
 import { activate as activateCore, deactivate as deactivateCore } from 'aws-core-vscode/node'
 import { awsToolkitApi } from './api'
 import { Commands } from 'aws-core-vscode/shared'
-import * as semver from 'semver'
-import * as vscode from 'vscode'
-import { telemetry } from 'aws-core-vscode/telemetry'
 
 export async function activate(context: ExtensionContext) {
     await activateCore(context)
 
     // after toolkit is activated, ask Amazon Q to register toolkit api callbacks
     await Commands.tryExecute('aws.amazonq.refreshConnectionCallback', awsToolkitApi)
-    void setupVscodeVersionNotification()
     return awsToolkitApi
 }
 
 export async function deactivate() {
     await deactivateCore()
 }
-
-// TODO: remove once version bump to 1.83.0 is complete.
-export function setupVscodeVersionNotification() {
-    let notificationDisplayed = false
-    tryShowNotification()
-
-    function tryShowNotification() {
-        // Do not show the notification if the IDE version will continue to be supported.
-        if (!semver.gte(vscode.version, '1.83.0')) {
-            return
-        }
-
-        if (notificationDisplayed) {
-            return
-        }
-
-        notificationDisplayed = true
-
-        telemetry.toolkit_showNotification.emit({
-            component: 'editor',
-            id: 'versionNotification',
-            reason: 'unsupportedVersion',
-            result: 'Succeeded',
-        })
-        void vscode.window.showWarningMessage(
-            'Update VS Code to version 1.83.0+, support for previous versions will be dropped soon. '
-        )
-    }
-}