Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to VSCode 1.90.2 #451

Merged
merged 4 commits into from
Jun 20, 2024
Merged
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
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@
},
"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",
"version": "0.49.0"
"ref": "v0.50.0",
"version": "0.50.0"
}
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion src/monaco.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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>): IEditorOptions {
Expand Down
6 changes: 4 additions & 2 deletions src/service-override/userDataProfile.ts
Original file line number Diff line number Diff line change
@@ -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'
Expand All @@ -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'
Expand Down Expand Up @@ -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)
}
}
6 changes: 2 additions & 4 deletions src/service-override/userDataSync.ts
Original file line number Diff line number Diff line change
@@ -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'
Expand All @@ -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'

Expand All @@ -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)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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 @@
Expand Down