maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

backups - move tracker and restorer out of contrib into service

Browse source
This commit is contained in:
Benjamin Pasero 2021-04-09 14:13:41 +02:00
parent 2d2696a6d6
commit acb172752a
No known key found for this signature in database
GPG key ID: E6380CC4C8219E65
17 changed files with 36 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
build/lib/i18n.resources.json
View file

@ -30,10 +30,6 @@
"name": "vs/workbench/api/common",
"project": "vscode-workbench"
},
{
"name": "vs/workbench/contrib/backup",
"project": "vscode-workbench"
},
{
"name": "vs/workbench/contrib/bulkEdit",
"project": "vscode-workbench"
@ -258,6 +254,10 @@
"name": "vs/workbench/services/authToken",
"project": "vscode-workbench"
},
{
"name": "vs/workbench/services/backup",
"project": "vscode-workbench"
},
{
"name": "vs/workbench/services/bulkEdit",
"project": "vscode-workbench"

12
src/vs/workbench/contrib/backup/browser/backup.web.contribution.ts
View file

@ -1,12 +0,0 @@
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { Registry } from 'vs/platform/registry/common/platform';
import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
import { BrowserBackupTracker } from 'vs/workbench/contrib/backup/browser/backupTracker';
// Register Backup Tracker
Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(BrowserBackupTracker, LifecyclePhase.Starting);

12
src/vs/workbench/contrib/backup/common/backup.contribution.ts
View file

@ -1,12 +0,0 @@
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { Registry } from 'vs/platform/registry/common/platform';
import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
import { BackupRestorer } from 'vs/workbench/contrib/backup/common/backupRestorer';
import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
// Register Backup Restorer
Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(BackupRestorer, LifecyclePhase.Starting);

12
src/vs/workbench/contrib/backup/electron-sandbox/backup.contribution.ts
View file

@ -1,12 +0,0 @@
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { Registry } from 'vs/platform/registry/common/platform';
import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
import { NativeBackupTracker } from 'vs/workbench/contrib/backup/electron-sandbox/backupTracker';
// Register Backup Tracker
Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(NativeBackupTracker, LifecyclePhase.Starting);

8
src/vs/workbench/services/backup/browser/backupFileService.ts
View file

@ -11,6 +11,10 @@ import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
import { IBackupFileService } from 'vs/workbench/services/backup/common/backup';
import { joinPath } from 'vs/base/common/resources';
import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
import { Registry } from 'vs/platform/registry/common/platform';
import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
import { BrowserBackupTracker } from 'vs/workbench/services/backup/browser/backupTracker';
export class BrowserBackupFileService extends BackupFileService {
@ -24,4 +28,8 @@ export class BrowserBackupFileService extends BackupFileService {
}
}
// Register Service
registerSingleton(IBackupFileService, BrowserBackupFileService);
// Register Backup Tracker
Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(BrowserBackupTracker, LifecyclePhase.Starting);

2
src/vs/workbench/contrib/backup/browser/backupTracker.ts → src/vs/workbench/services/backup/browser/backupTracker.ts
View file

@ -9,7 +9,7 @@ import { IFilesConfigurationService } from 'vs/workbench/services/filesConfigura
import { IWorkingCopyService } from 'vs/workbench/services/workingCopy/common/workingCopyService';
import { ILifecycleService, ShutdownReason } from 'vs/workbench/services/lifecycle/common/lifecycle';
import { ILogService } from 'vs/platform/log/common/log';
import { BackupTracker } from 'vs/workbench/contrib/backup/common/backupTracker';
import { BackupTracker } from 'vs/workbench/services/backup/common/backupTracker';
export class BrowserBackupTracker extends BackupTracker implements IWorkbenchContribution {

7
src/vs/workbench/services/backup/common/backupFileService.ts
View file

@ -21,6 +21,10 @@ import { ILogService } from 'vs/platform/log/common/log';
import { CancellationToken } from 'vs/base/common/cancellation';
import { Schemas } from 'vs/base/common/network';
import { hash } from 'vs/base/common/hash';
import { Registry } from 'vs/platform/registry/common/platform';
import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
import { BackupRestorer } from 'vs/workbench/services/backup/common/backupRestorer';
import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
export interface IBackupFilesModel {
resolve(backupRoot: URI): Promise<void>;
@ -509,3 +513,6 @@ export function hashPath(resource: URI): string {
return hash(str).toString(16);
}
// Register Backup Restorer
Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(BackupRestorer, LifecyclePhase.Starting);

0
src/vs/workbench/contrib/backup/common/backupRestorer.ts → src/vs/workbench/services/backup/common/backupRestorer.ts
View file

0
src/vs/workbench/contrib/backup/common/backupTracker.ts → src/vs/workbench/services/backup/common/backupTracker.ts
View file

8
src/vs/workbench/services/backup/electron-sandbox/backupFileService.ts
View file

@ -10,6 +10,10 @@ import { IBackupFileService } from 'vs/workbench/services/backup/common/backup';
import { IFileService } from 'vs/platform/files/common/files';
import { ILogService } from 'vs/platform/log/common/log';
import { INativeWorkbenchEnvironmentService } from 'vs/workbench/services/environment/electron-sandbox/environmentService';
import { Registry } from 'vs/platform/registry/common/platform';
import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
import { NativeBackupTracker } from 'vs/workbench/services/backup/electron-sandbox/backupTracker';
export class NativeBackupFileService extends BackupFileService {
@ -22,4 +26,8 @@ export class NativeBackupFileService extends BackupFileService {
}
}
// Register Service
registerSingleton(IBackupFileService, NativeBackupFileService);
// Register Backup Tracker
Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(NativeBackupTracker, LifecyclePhase.Starting);

2
src/vs/workbench/contrib/backup/electron-sandbox/backupTracker.ts → src/vs/workbench/services/backup/electron-sandbox/backupTracker.ts
View file

@ -15,7 +15,7 @@ import { WorkbenchState, IWorkspaceContextService } from 'vs/platform/workspace/
import { isMacintosh } from 'vs/base/common/platform';
import { HotExitConfiguration } from 'vs/platform/files/common/files';
import { INativeHostService } from 'vs/platform/native/electron-sandbox/native';
import { BackupTracker } from 'vs/workbench/contrib/backup/common/backupTracker';
import { BackupTracker } from 'vs/workbench/services/backup/common/backupTracker';
import { ILogService } from 'vs/platform/log/common/log';
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
import { SaveReason } from 'vs/workbench/common/editor';

4
src/vs/workbench/contrib/backup/test/browser/backupRestorer.test.ts → src/vs/workbench/services/backup/test/browser/backupRestorer.test.ts
View file

@ -15,8 +15,8 @@ import { IBackupFileService } from 'vs/workbench/services/backup/common/backup';
import { Schemas } from 'vs/base/common/network';
import { isEqual } from 'vs/base/common/resources';
import { createEditorPart, InMemoryTestBackupFileService, registerTestResourceEditor, TestServiceAccessor, workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
import { BackupRestorer } from 'vs/workbench/contrib/backup/common/backupRestorer';
import { BrowserBackupTracker } from 'vs/workbench/contrib/backup/browser/backupTracker';
import { BackupRestorer } from 'vs/workbench/services/backup/common/backupRestorer';
import { BrowserBackupTracker } from 'vs/workbench/services/backup/browser/backupTracker';
import { DisposableStore } from 'vs/base/common/lifecycle';
suite('BackupRestorer', () => {

4
src/vs/workbench/contrib/backup/test/browser/backupTracker.test.ts → src/vs/workbench/services/backup/test/browser/backupTracker.test.ts
View file

@ -16,14 +16,14 @@ import { IFilesConfigurationService } from 'vs/workbench/services/filesConfigura
import { IWorkingCopyBackup, IWorkingCopyService } from 'vs/workbench/services/workingCopy/common/workingCopyService';
import { ILogService } from 'vs/platform/log/common/log';
import { ILifecycleService } from 'vs/workbench/services/lifecycle/common/lifecycle';
import { BackupTracker } from 'vs/workbench/contrib/backup/common/backupTracker';
import { BackupTracker } from 'vs/workbench/services/backup/common/backupTracker';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { UntitledTextEditorInput } from 'vs/workbench/services/untitled/common/untitledTextEditorInput';
import { createEditorPart, InMemoryTestBackupFileService, registerTestResourceEditor, TestServiceAccessor, workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
import { TestWorkingCopy } from 'vs/workbench/test/common/workbenchTestServices';
import { CancellationToken } from 'vs/base/common/cancellation';
import { timeout } from 'vs/base/common/async';
import { BrowserBackupTracker } from 'vs/workbench/contrib/backup/browser/backupTracker';
import { BrowserBackupTracker } from 'vs/workbench/services/backup/browser/backupTracker';
import { DisposableStore } from 'vs/base/common/lifecycle';
suite('BackupTracker (browser)', function () {

4
src/vs/workbench/contrib/backup/test/electron-browser/backupTracker.test.ts → src/vs/workbench/services/backup/test/electron-browser/backupTracker.test.ts
View file

@ -12,7 +12,7 @@ import { rimraf, writeFile } from 'vs/base/node/pfs';
import { URI } from 'vs/base/common/uri';
import { flakySuite, getRandomTestPath } from 'vs/base/test/node/testUtils';
import { hashPath } from 'vs/workbench/services/backup/common/backupFileService';
import { NativeBackupTracker } from 'vs/workbench/contrib/backup/electron-sandbox/backupTracker';
import { NativeBackupTracker } from 'vs/workbench/services/backup/electron-sandbox/backupTracker';
import { TextFileEditorModelManager } from 'vs/workbench/services/textfile/common/textFileEditorModelManager';
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
import { EditorPart } from 'vs/workbench/browser/parts/editor/editorPart';
@ -30,7 +30,7 @@ import { ShutdownReason, ILifecycleService, BeforeShutdownEvent } from 'vs/workb
import { IFileDialogService, ConfirmResult, IDialogService } from 'vs/platform/dialogs/common/dialogs';
import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
import { INativeHostService } from 'vs/platform/native/electron-sandbox/native';
import { BackupTracker } from 'vs/workbench/contrib/backup/common/backupTracker';
import { BackupTracker } from 'vs/workbench/services/backup/common/backupTracker';
import { workbenchInstantiationService, TestServiceAccessor } from 'vs/workbench/test/electron-browser/workbenchTestServices';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';

5
src/vs/workbench/workbench.common.main.ts
View file

@ -171,10 +171,7 @@ import 'vs/workbench/contrib/files/browser/explorerViewlet';
import 'vs/workbench/contrib/files/browser/fileActions.contribution';
import 'vs/workbench/contrib/files/browser/files.contribution';
// Backup
import 'vs/workbench/contrib/backup/common/backup.contribution';
// bulkEdit
// Bulk Edit
import 'vs/workbench/contrib/bulkEdit/browser/bulkEditService';
import 'vs/workbench/contrib/bulkEdit/browser/preview/bulkEdit.contribution';

3
src/vs/workbench/workbench.sandbox.main.ts
View file

@ -94,9 +94,6 @@ import 'vs/workbench/electron-sandbox/desktop.contribution';
import 'vs/workbench/contrib/files/electron-sandbox/files.contribution';
import 'vs/workbench/contrib/files/electron-sandbox/fileActions.contribution';
// Backup
import 'vs/workbench/contrib/backup/electron-sandbox/backup.contribution';
// CodeEditor Contributions
import 'vs/workbench/contrib/codeEditor/electron-sandbox/codeEditor.contribution';

3
src/vs/workbench/workbench.web.main.ts
View file

@ -115,9 +115,6 @@ import 'vs/workbench/contrib/output/common/outputChannelModelService';
// Explorer
import 'vs/workbench/contrib/files/browser/files.web.contribution';
// Backup
import 'vs/workbench/contrib/backup/browser/backup.web.contribution';
// Preferences
import 'vs/workbench/contrib/preferences/browser/keyboardLayoutPicker';