From b4fa4cd8988c38a5d4e55ff24663cd329520f014 Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Sun, 23 Jun 2019 19:43:52 +0200 Subject: [PATCH] :lipstick: --- src/vs/workbench/browser/web.main.ts | 2 +- src/vs/workbench/electron-browser/main.ts | 6 +++--- .../services/configuration/browser/configuration.ts | 2 +- .../configuration/browser/configurationService.ts | 2 +- .../configuration/common/configurationEditingService.ts | 2 +- .../electron-browser/configurationEditingService.test.ts | 2 +- .../test/electron-browser/configurationService.test.ts | 2 +- .../services/userData/common/fileUserDataService.ts | 2 +- .../userData/common/{userDataService.ts => userData.ts} | 9 --------- .../services/userData/common/userDataFileProvider.ts | 2 +- 10 files changed, 11 insertions(+), 20 deletions(-) rename src/vs/workbench/services/userData/common/{userDataService.ts => userData.ts} (78%) diff --git a/src/vs/workbench/browser/web.main.ts b/src/vs/workbench/browser/web.main.ts index 3e64ed90871..7bfb526bbea 100644 --- a/src/vs/workbench/browser/web.main.ts +++ b/src/vs/workbench/browser/web.main.ts @@ -36,7 +36,7 @@ import { hash } from 'vs/base/common/hash'; import { IWorkbenchConstructionOptions } from 'vs/workbench/workbench.web.api'; import { ProductService } from 'vs/platform/product/browser/productService'; import { FileUserDataService } from 'vs/workbench/services/userData/common/fileUserDataService'; -import { IUserDataService } from 'vs/workbench//services/userData/common/userDataService'; +import { IUserDataService } from 'vs/workbench/services/userData/common/userData'; import { UserDataFileProvider } from 'vs/workbench//services/userData/common/userDataFileProvider'; class CodeRendererMain extends Disposable { diff --git a/src/vs/workbench/electron-browser/main.ts b/src/vs/workbench/electron-browser/main.ts index 1dc0f324175..b1a7d8361bf 100644 --- a/src/vs/workbench/electron-browser/main.ts +++ b/src/vs/workbench/electron-browser/main.ts @@ -50,9 +50,9 @@ import { ConfigurationCache } from 'vs/workbench/services/configuration/node/con import { SpdLogService } from 'vs/platform/log/node/spdlogService'; import { SignService } from 'vs/platform/sign/node/signService'; import { ISignService } from 'vs/platform/sign/common/sign'; -import { IUserDataService } from '../services/userData/common/userDataService'; -import { FileUserDataService } from '../services/userData/common/fileUserDataService'; -import { UserDataFileProvider } from '../services/userData/common/userDataFileProvider'; +import { IUserDataService } from 'vs/workbench/services/userData/common/userData'; +import { FileUserDataService } from 'vs/workbench/services/userData/common/fileUserDataService'; +import { UserDataFileProvider } from 'vs/workbench/services/userData/common/userDataFileProvider'; class CodeRendererMain extends Disposable { diff --git a/src/vs/workbench/services/configuration/browser/configuration.ts b/src/vs/workbench/services/configuration/browser/configuration.ts index 38b605b5d89..7907be1ca34 100644 --- a/src/vs/workbench/services/configuration/browser/configuration.ts +++ b/src/vs/workbench/services/configuration/browser/configuration.ts @@ -23,7 +23,7 @@ import { Schemas } from 'vs/base/common/network'; import { IConfigurationModel } from 'vs/platform/configuration/common/configuration'; import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService'; import { hash } from 'vs/base/common/hash'; -import { IUserDataService } from 'vs/workbench/services/userData/common/userDataService'; +import { IUserDataService } from 'vs/workbench/services/userData/common/userData'; export class UserConfiguration extends Disposable { diff --git a/src/vs/workbench/services/configuration/browser/configurationService.ts b/src/vs/workbench/services/configuration/browser/configurationService.ts index 4c5eb4e2e57..7aa440f3117 100644 --- a/src/vs/workbench/services/configuration/browser/configurationService.ts +++ b/src/vs/workbench/services/configuration/browser/configurationService.ts @@ -29,7 +29,7 @@ import { isEqual, dirname } from 'vs/base/common/resources'; import { mark } from 'vs/base/common/performance'; import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService'; import { IFileService } from 'vs/platform/files/common/files'; -import { IUserDataService } from 'vs/workbench/services/userData/common/userDataService'; +import { IUserDataService } from 'vs/workbench/services/userData/common/userData'; export class WorkspaceService extends Disposable implements IConfigurationService, IWorkspaceContextService { diff --git a/src/vs/workbench/services/configuration/common/configurationEditingService.ts b/src/vs/workbench/services/configuration/common/configurationEditingService.ts index dd6e767be62..da010d44828 100644 --- a/src/vs/workbench/services/configuration/common/configurationEditingService.ts +++ b/src/vs/workbench/services/configuration/common/configurationEditingService.ts @@ -27,7 +27,7 @@ import { INotificationService, Severity } from 'vs/platform/notification/common/ import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences'; import { withUndefinedAsNull, withNullAsUndefined } from 'vs/base/common/types'; import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService'; -import { IUserDataService } from '../../userData/common/userDataService'; +import { IUserDataService } from 'vs/workbench/services/userData/common/userData'; import { IModelService } from 'vs/editor/common/services/modelService'; import { IModeService } from 'vs/editor/common/services/modeService'; import { Emitter } from 'vs/base/common/event'; diff --git a/src/vs/workbench/services/configuration/test/electron-browser/configurationEditingService.test.ts b/src/vs/workbench/services/configuration/test/electron-browser/configurationEditingService.test.ts index 063a8f58d04..7a0373be577 100644 --- a/src/vs/workbench/services/configuration/test/electron-browser/configurationEditingService.test.ts +++ b/src/vs/workbench/services/configuration/test/electron-browser/configurationEditingService.test.ts @@ -40,7 +40,7 @@ import { DiskFileSystemProvider } from 'vs/workbench/services/files/node/diskFil import { IFileService } from 'vs/platform/files/common/files'; import { ConfigurationCache } from 'vs/workbench/services/configuration/node/configurationCache'; import { FileUserDataService } from 'vs/workbench/services/userData/common/fileUserDataService'; -import { IUserDataService } from 'vs/workbench/services/userData/common/userDataService'; +import { IUserDataService } from 'vs/workbench/services/userData/common/userData'; import { dirname } from 'vs/base/common/resources'; class SettingsTestEnvironmentService extends EnvironmentService { diff --git a/src/vs/workbench/services/configuration/test/electron-browser/configurationService.test.ts b/src/vs/workbench/services/configuration/test/electron-browser/configurationService.test.ts index 663a11973e3..41bc29d871b 100644 --- a/src/vs/workbench/services/configuration/test/electron-browser/configurationService.test.ts +++ b/src/vs/workbench/services/configuration/test/electron-browser/configurationService.test.ts @@ -46,7 +46,7 @@ import { IConfigurationCache } from 'vs/workbench/services/configuration/common/ import { VSBuffer } from 'vs/base/common/buffer'; import { SignService } from 'vs/platform/sign/browser/signService'; import { FileUserDataService } from 'vs/workbench/services/userData/common/fileUserDataService'; -import { IUserDataService } from 'vs/workbench/services/userData/common/userDataService'; +import { IUserDataService } from 'vs/workbench/services/userData/common/userData'; class SettingsTestEnvironmentService extends EnvironmentService { diff --git a/src/vs/workbench/services/userData/common/fileUserDataService.ts b/src/vs/workbench/services/userData/common/fileUserDataService.ts index ae4ac73cb3b..847b923a90d 100644 --- a/src/vs/workbench/services/userData/common/fileUserDataService.ts +++ b/src/vs/workbench/services/userData/common/fileUserDataService.ts @@ -5,7 +5,7 @@ import { Event, Emitter } from 'vs/base/common/event'; import { Disposable } from 'vs/base/common/lifecycle'; -import { IUserDataService, IUserDataChangesEvent } from './userDataService'; +import { IUserDataService, IUserDataChangesEvent } from 'vs/workbench/services/userData/common/userData'; import { IFileService, FileChangesEvent } from 'vs/platform/files/common/files'; import { URI } from 'vs/base/common/uri'; import * as resources from 'vs/base/common/resources'; diff --git a/src/vs/workbench/services/userData/common/userDataService.ts b/src/vs/workbench/services/userData/common/userData.ts similarity index 78% rename from src/vs/workbench/services/userData/common/userDataService.ts rename to src/vs/workbench/services/userData/common/userData.ts index d47f01616e2..38e9b20b87f 100644 --- a/src/vs/workbench/services/userData/common/userDataService.ts +++ b/src/vs/workbench/services/userData/common/userData.ts @@ -7,7 +7,6 @@ import { createDecorator } from 'vs/platform/instantiation/common/instantiation' import { Event } from 'vs/base/common/event'; import { URI } from 'vs/base/common/uri'; -export const schme: string = 'vscode-userdata'; export const IUserDataService = createDecorator('userDataService'); export interface IUserDataChangesEvent { @@ -27,12 +26,4 @@ export interface IUserDataService { read(key: string): Promise; write(key: string, value: string): Promise; -} - -export const IUserDataEditorService = createDecorator('userDataEditorService'); - -export interface IUserDataEditorService { - _serviceBrand: any; - - openInEditor(key: string): Promise; } \ No newline at end of file diff --git a/src/vs/workbench/services/userData/common/userDataFileProvider.ts b/src/vs/workbench/services/userData/common/userDataFileProvider.ts index 76e4419a51d..2f48f9b1e79 100644 --- a/src/vs/workbench/services/userData/common/userDataFileProvider.ts +++ b/src/vs/workbench/services/userData/common/userDataFileProvider.ts @@ -5,7 +5,7 @@ import { IDisposable, Disposable } from 'vs/base/common/lifecycle'; import { FileSystemProviderCapabilities, FileWriteOptions, IStat, FileType, FileDeleteOptions, IWatchOptions, FileOverwriteOptions, IFileSystemProviderWithFileReadWriteCapability, IFileChange, FileChangesEvent, FileChangeType } from 'vs/platform/files/common/files'; -import { IUserDataService } from './userDataService'; +import { IUserDataService } from 'vs/workbench/services/userData/common/userData'; import { URI } from 'vs/base/common/uri'; import { VSBuffer } from 'vs/base/common/buffer'; import { Event, Emitter } from 'vs/base/common/event';