Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

This file was deleted.

2 changes: 1 addition & 1 deletion packages/amazonq/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -1046,6 +1046,6 @@
},
"engines": {
"npm": "^10.1.0",
"vscode": "^1.83.0"
"vscode": "^1.68.0"
}
}
1 change: 0 additions & 1 deletion packages/amazonq/src/app/chat/activation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ function registerApps(appInitContext: amazonq.AmazonQAppInitContext) {
amazonq.featureDevChatAppInit(appInitContext)
amazonq.gumbyChatAppInit(appInitContext)
}

/**
* Display a notification to user for Log In.
*
Expand Down
2 changes: 1 addition & 1 deletion packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
33 changes: 31 additions & 2 deletions packages/core/src/extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@

import vscode from 'vscode'
import * as nls from 'vscode-nls'

import globals, { initialize, isWeb } from './shared/extensionGlobals'
import { join } from 'path'
import { Commands } from './shared/vscode/commands2'
Expand Down Expand Up @@ -51,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
Expand Down Expand Up @@ -171,7 +171,7 @@ export async function activateCommon(
uriHandler: globals.uriHandler,
credentialsStore: globals.loginManager.store,
}

void setupVscodeVersionNotification()
await activateViewsShared(extContext.extensionContext)

return extContext
Expand Down Expand Up @@ -304,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({
Copy link
Contributor

@justinmk3 justinmk3 Oct 8, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

seems like we should have a vscode.window.* wrapper in shared/utilities/messages.ts that emits this (maybe optional by a boolean flag). #5762

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. '
)
}
}

This file was deleted.

This file was deleted.

2 changes: 1 addition & 1 deletion packages/toolkit/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"browser": "./dist/src/extensionWeb",
"engines": {
"npm": "^10.1.0",
"vscode": "^1.83.0"
"vscode": "^1.68.0"
},
"scripts": {
"vscode:prepublish": "npm run clean && npm run buildScripts && webpack --mode production",
Expand Down
Loading