From 17494e511f6beced5d730ffbc01733be9731b1c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Mangeonjean?= Date: Wed, 19 Jun 2024 21:53:54 +0200 Subject: [PATCH 1/4] lib: update to VSCode 1.90.2 --- package.json | 6 +++--- ...x-rollback-typescript-as-the-last-version-breaks-t.patch | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 92cd8a94..dd7ff165 100644 --- a/package.json +++ b/package.json @@ -31,9 +31,9 @@ }, "config": { "vscode": { - "version": "1.90.1", - "ref": "1.90.1", - "commit": "611f9bfce64f25108829dd295f54a6894e87339d" + "version": "1.90.2", + "ref": "1.90.2", + "commit": "5437499feb04f7a586f677b155b039bc2b3669eb" }, "monaco": { "ref": "v0.49.0", diff --git a/vscode-paches/0058-fix-rollback-typescript-as-the-last-version-breaks-t.patch b/vscode-paches/0058-fix-rollback-typescript-as-the-last-version-breaks-t.patch index f4667e7a..7cc4c652 100644 --- a/vscode-paches/0058-fix-rollback-typescript-as-the-last-version-breaks-t.patch +++ b/vscode-paches/0058-fix-rollback-typescript-as-the-last-version-breaks-t.patch @@ -10,7 +10,7 @@ Subject: [PATCH] fix: rollback typescript as the last version breaks the 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json -index 804d8a602c0..d738d5207ac 100644 +index 63fbf45b2d8..4363e4665d5 100644 --- a/package.json +++ b/package.json @@ -208,7 +208,7 @@ From a235c2b55353bd2c4aad9fb3ceda7e3d1254d62c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Mangeonjean?= Date: Wed, 19 Jun 2024 21:54:25 +0200 Subject: [PATCH 2/4] fix: export missing enum --- src/monaco.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/monaco.ts b/src/monaco.ts index 2a46d9a2..34ca56f5 100644 --- a/src/monaco.ts +++ b/src/monaco.ts @@ -47,7 +47,7 @@ import { ILogService } from 'vs/platform/log/common/log.service' import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput.service' import { createInjectedClass } from './tools/injection' import { getService } from './services' -export { registerEditorAction, registerEditorContribution, registerDiffEditorContribution, registerMultiEditorAction, EditorAction, EditorCommand } from 'vs/editor/browser/editorExtensions' +export { EditorContributionInstantiation, registerEditorAction, registerEditorContribution, registerDiffEditorContribution, registerMultiEditorAction, EditorAction, EditorCommand } from 'vs/editor/browser/editorExtensions' export { IEditorContribution, IDiffEditorContribution } from 'vs/editor/common/editorCommon' function computeConfiguration (configuration: IEditorConfiguration, overrides?: Readonly): IEditorOptions { From e262973a5a5799188fd15fb5efd070cd0050a44e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Mangeonjean?= Date: Wed, 19 Jun 2024 21:54:59 +0200 Subject: [PATCH 3/4] fix: IUserDataSyncUtilService is required by user data profile services --- src/service-override/userDataProfile.ts | 6 ++++-- src/service-override/userDataSync.ts | 6 ++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/service-override/userDataProfile.ts b/src/service-override/userDataProfile.ts index e45d3519..4141a8eb 100644 --- a/src/service-override/userDataProfile.ts +++ b/src/service-override/userDataProfile.ts @@ -1,6 +1,6 @@ import { IEditorOverrideServices } from 'vs/editor/standalone/browser/standaloneServices' import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' -import { IUserDataSyncStoreManagementService } from 'vs/platform/userDataSync/common/userDataSync.service' +import { IUserDataSyncStoreManagementService, IUserDataSyncUtilService } from 'vs/platform/userDataSync/common/userDataSync.service' import { BrowserUserDataProfilesService } from 'vs/platform/userDataProfile/browser/userDataProfile' import { IUserDataProfilesService } from 'vs/platform/userDataProfile/common/userDataProfile.service' import { IUserDataInitializer, UserDataInitializationService } from 'vs/workbench/services/userData/browser/userDataInit' @@ -27,6 +27,7 @@ import { UserDataProfileStorageService } from 'vs/workbench/services/userDataPro import { UserDataProfileService } from 'vs/workbench/services/userDataProfile/common/userDataProfileService' import { IAnyWorkspaceIdentifier } from 'vs/platform/workspace/common/workspace' import { IUserDataProfile } from 'vs/platform/userDataProfile/common/userDataProfile' +import { UserDataSyncUtilService } from 'vs/workbench/services/userDataSync/common/userDataSyncUtil' import { registerServiceInitializePostParticipant } from '../lifecycle' import { getWorkspaceIdentifier } from '../workbench' import 'vs/workbench/contrib/userDataProfile/browser/userDataProfile.contribution' @@ -126,6 +127,7 @@ export default function getServiceOverride (): IEditorOverrideServices { [IUserDataInitializationService.toString()]: new SyncDescriptor(InjectedUserDataInitializationService, [], true), [IUserDataProfileImportExportService.toString()]: new SyncDescriptor(UserDataProfileImportExportService, [], true), [IUserDataProfileManagementService.toString()]: new SyncDescriptor(UserDataProfileManagementService, [], true), - [IUserDataProfileStorageService.toString()]: new SyncDescriptor(UserDataProfileStorageService, [], true) + [IUserDataProfileStorageService.toString()]: new SyncDescriptor(UserDataProfileStorageService, [], true), + [IUserDataSyncUtilService.toString()]: new SyncDescriptor(UserDataSyncUtilService, [], true) } } diff --git a/src/service-override/userDataSync.ts b/src/service-override/userDataSync.ts index 00cc2535..9b4e3487 100644 --- a/src/service-override/userDataSync.ts +++ b/src/service-override/userDataSync.ts @@ -1,6 +1,6 @@ import { IEditorOverrideServices } from 'vs/editor/standalone/browser/standaloneServices' import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors' -import { IUserDataAutoSyncService, IUserDataSyncEnablementService, IUserDataSyncLocalStoreService, IUserDataSyncLogService, IUserDataSyncResourceProviderService, IUserDataSyncService, IUserDataSyncStoreManagementService, IUserDataSyncStoreService, IUserDataSyncUtilService } from 'vs/platform/userDataSync/common/userDataSync.service' +import { IUserDataAutoSyncService, IUserDataSyncEnablementService, IUserDataSyncLocalStoreService, IUserDataSyncLogService, IUserDataSyncResourceProviderService, IUserDataSyncService, IUserDataSyncStoreManagementService, IUserDataSyncStoreService } from 'vs/platform/userDataSync/common/userDataSync.service' import { UserDataSyncAccountService } from 'vs/platform/userDataSync/common/userDataSyncAccount' import { IUserDataSyncAccountService } from 'vs/platform/userDataSync/common/userDataSyncAccount.service' import { UserDataSyncMachinesService } from 'vs/platform/userDataSync/common/userDataSyncMachines' @@ -14,7 +14,6 @@ import { UserDataSyncResourceProviderService } from 'vs/platform/userDataSync/co import { UserDataSyncLocalStoreService } from 'vs/platform/userDataSync/common/userDataSyncLocalStoreService' import { UserDataSyncWorkbenchService } from 'vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService' import { IUserDataSyncWorkbenchService } from 'vs/workbench/services/userDataSync/common/userDataSync.service' -import { UserDataSyncUtilService } from 'vs/workbench/services/userDataSync/common/userDataSyncUtil' import getUserDataProfileServiceOverride from './userDataProfile' import 'vs/workbench/contrib/userDataSync/browser/userDataSync.contribution' @@ -31,7 +30,6 @@ export default function getServiceOverride (): IEditorOverrideServices { [IUserDataSyncMachinesService.toString()]: new SyncDescriptor(UserDataSyncMachinesService, [], true), [IUserDataSyncResourceProviderService.toString()]: new SyncDescriptor(UserDataSyncResourceProviderService, [], true), [IUserDataSyncLocalStoreService.toString()]: new SyncDescriptor(UserDataSyncLocalStoreService, [], true), - [IUserDataSyncWorkbenchService.toString()]: new SyncDescriptor(UserDataSyncWorkbenchService, [], true), - [IUserDataSyncUtilService.toString()]: new SyncDescriptor(UserDataSyncUtilService, [], true) + [IUserDataSyncWorkbenchService.toString()]: new SyncDescriptor(UserDataSyncWorkbenchService, [], true) } } From a560cafd0cb5a2292b0ad5132d313bed3cdf9997 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Mangeonjean?= Date: Thu, 20 Jun 2024 15:46:18 +0200 Subject: [PATCH 4/4] lib: update to monaco 0.50 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index dd7ff165..0cade2bc 100644 --- a/package.json +++ b/package.json @@ -36,8 +36,8 @@ "commit": "5437499feb04f7a586f677b155b039bc2b3669eb" }, "monaco": { - "ref": "v0.49.0", - "version": "0.49.0" + "ref": "v0.50.0", + "version": "0.50.0" } }, "devDependencies": {