Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
8440dcd6
V
vscode
项目概览
xxadev
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
8440dcd6
编写于
6月 16, 2020
作者:
S
Sandeep Somavarapu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
rename to UserDataSyncResourceEnablementService
上级
5a986588
变更
17
隐藏空白更改
内联
并排
Showing
17 changed file
with
65 addition
and
65 deletion
+65
-65
src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts
.../code/electron-browser/sharedProcess/sharedProcessMain.ts
+3
-3
src/vs/platform/userDataSync/common/abstractSynchronizer.ts
src/vs/platform/userDataSync/common/abstractSynchronizer.ts
+7
-7
src/vs/platform/userDataSync/common/extensionsSync.ts
src/vs/platform/userDataSync/common/extensionsSync.ts
+3
-3
src/vs/platform/userDataSync/common/globalStateSync.ts
src/vs/platform/userDataSync/common/globalStateSync.ts
+3
-3
src/vs/platform/userDataSync/common/keybindingsSync.ts
src/vs/platform/userDataSync/common/keybindingsSync.ts
+3
-3
src/vs/platform/userDataSync/common/settingsSync.ts
src/vs/platform/userDataSync/common/settingsSync.ts
+3
-3
src/vs/platform/userDataSync/common/snippetsSync.ts
src/vs/platform/userDataSync/common/snippetsSync.ts
+3
-3
src/vs/platform/userDataSync/common/userDataAutoSyncService.ts
...s/platform/userDataSync/common/userDataAutoSyncService.ts
+3
-3
src/vs/platform/userDataSync/common/userDataSync.ts
src/vs/platform/userDataSync/common/userDataSync.ts
+2
-2
src/vs/platform/userDataSync/common/userDataSyncResourceEnablementService.ts
...rDataSync/common/userDataSyncResourceEnablementService.ts
+2
-2
src/vs/platform/userDataSync/electron-browser/userDataAutoSyncService.ts
.../userDataSync/electron-browser/userDataAutoSyncService.ts
+3
-3
src/vs/platform/userDataSync/test/common/synchronizer.test.ts
...vs/platform/userDataSync/test/common/synchronizer.test.ts
+2
-2
src/vs/platform/userDataSync/test/common/userDataSyncClient.ts
...s/platform/userDataSync/test/common/userDataSyncClient.ts
+3
-3
src/vs/workbench/contrib/userDataSync/browser/userDataAutoSyncService.ts
...h/contrib/userDataSync/browser/userDataAutoSyncService.ts
+3
-3
src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts
...vs/workbench/contrib/userDataSync/browser/userDataSync.ts
+11
-11
src/vs/workbench/contrib/userDataSync/browser/userDataSyncViews.ts
...rkbench/contrib/userDataSync/browser/userDataSyncViews.ts
+8
-8
src/vs/workbench/workbench.common.main.ts
src/vs/workbench/workbench.common.main.ts
+3
-3
未找到文件。
src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts
浏览文件 @
8440dcd6
...
...
@@ -49,7 +49,7 @@ import { IFileService } from 'vs/platform/files/common/files';
import
{
DiskFileSystemProvider
}
from
'
vs/platform/files/node/diskFileSystemProvider
'
;
import
{
Schemas
}
from
'
vs/base/common/network
'
;
import
{
IProductService
}
from
'
vs/platform/product/common/productService
'
;
import
{
IUserDataSyncService
,
IUserDataSyncStoreService
,
registerConfiguration
,
IUserDataSyncLogService
,
IUserDataSyncUtilService
,
IUserDataSyncEnablementService
,
IUserDataSyncBackupStoreService
}
from
'
vs/platform/userDataSync/common/userDataSync
'
;
import
{
IUserDataSyncService
,
IUserDataSyncStoreService
,
registerConfiguration
,
IUserDataSyncLogService
,
IUserDataSyncUtilService
,
IUserDataSync
Resource
EnablementService
,
IUserDataSyncBackupStoreService
}
from
'
vs/platform/userDataSync/common/userDataSync
'
;
import
{
UserDataSyncService
}
from
'
vs/platform/userDataSync/common/userDataSyncService
'
;
import
{
UserDataSyncStoreService
}
from
'
vs/platform/userDataSync/common/userDataSyncStoreService
'
;
import
{
UserDataSyncChannel
,
UserDataSyncUtilServiceClient
,
UserDataAutoSyncChannel
,
StorageKeysSyncRegistryChannelClient
,
UserDataSyncMachinesServiceChannel
,
UserDataSyncAccountServiceChannel
}
from
'
vs/platform/userDataSync/common/userDataSyncIpc
'
;
...
...
@@ -63,7 +63,7 @@ import { NativeStorageService } from 'vs/platform/storage/node/storageService';
import
{
GlobalStorageDatabaseChannelClient
}
from
'
vs/platform/storage/node/storageIpc
'
;
import
{
IStorageService
}
from
'
vs/platform/storage/common/storage
'
;
import
{
GlobalExtensionEnablementService
}
from
'
vs/platform/extensionManagement/common/extensionEnablementService
'
;
import
{
UserDataSync
EnablementService
}
from
'
vs/platform/userDataSync/common/userDataSync
EnablementService
'
;
import
{
UserDataSync
ResourceEnablementService
}
from
'
vs/platform/userDataSync/common/userDataSyncResource
EnablementService
'
;
import
{
IUserDataSyncAccountService
,
UserDataSyncAccountService
}
from
'
vs/platform/userDataSync/common/userDataSyncAccount
'
;
import
{
UserDataSyncBackupStoreService
}
from
'
vs/platform/userDataSync/common/userDataSyncBackupStoreService
'
;
import
{
IStorageKeysSyncRegistryService
}
from
'
vs/platform/userDataSync/common/storageKeys
'
;
...
...
@@ -205,7 +205,7 @@ async function main(server: Server, initData: ISharedProcessInitData, configurat
services
.
set
(
IUserDataSyncStoreService
,
new
SyncDescriptor
(
UserDataSyncStoreService
));
services
.
set
(
IUserDataSyncMachinesService
,
new
SyncDescriptor
(
UserDataSyncMachinesService
));
services
.
set
(
IUserDataSyncBackupStoreService
,
new
SyncDescriptor
(
UserDataSyncBackupStoreService
));
services
.
set
(
IUserDataSync
EnablementService
,
new
SyncDescriptor
(
UserDataSync
EnablementService
));
services
.
set
(
IUserDataSync
ResourceEnablementService
,
new
SyncDescriptor
(
UserDataSyncResource
EnablementService
));
services
.
set
(
IUserDataSyncService
,
new
SyncDescriptor
(
UserDataSyncService
));
registerConfiguration
();
...
...
src/vs/platform/userDataSync/common/abstractSynchronizer.ts
浏览文件 @
8440dcd6
...
...
@@ -9,7 +9,7 @@ import { VSBuffer } from 'vs/base/common/buffer';
import
{
URI
}
from
'
vs/base/common/uri
'
;
import
{
SyncResource
,
SyncStatus
,
IUserData
,
IUserDataSyncStoreService
,
UserDataSyncErrorCode
,
UserDataSyncError
,
IUserDataSyncLogService
,
IUserDataSyncUtilService
,
IUserDataSyncEnablementService
,
IUserDataSyncBackupStoreService
,
Conflict
,
ISyncResourceHandle
,
USER_DATA_SYNC_SCHEME
,
ISyncPreview
,
IUserDataManifest
,
ISyncData
,
IRemoteUserData
IUserDataSync
Resource
EnablementService
,
IUserDataSyncBackupStoreService
,
Conflict
,
ISyncResourceHandle
,
USER_DATA_SYNC_SCHEME
,
ISyncPreview
,
IUserDataManifest
,
ISyncData
,
IRemoteUserData
}
from
'
vs/platform/userDataSync/common/userDataSync
'
;
import
{
IEnvironmentService
}
from
'
vs/platform/environment/common/environment
'
;
import
{
joinPath
,
dirname
,
isEqual
,
basename
}
from
'
vs/base/common/resources
'
;
...
...
@@ -85,7 +85,7 @@ export abstract class AbstractSynchroniser extends Disposable {
@
IStorageService
storageService
:
IStorageService
,
@
IUserDataSyncStoreService
protected
readonly
userDataSyncStoreService
:
IUserDataSyncStoreService
,
@
IUserDataSyncBackupStoreService
protected
readonly
userDataSyncBackupStoreService
:
IUserDataSyncBackupStoreService
,
@
IUserDataSync
EnablementService
protected
readonly
userDataSyncEnablementService
:
IUserDataSync
EnablementService
,
@
IUserDataSync
ResourceEnablementService
protected
readonly
userDataSyncResourceEnablementService
:
IUserDataSyncResource
EnablementService
,
@
ITelemetryService
protected
readonly
telemetryService
:
ITelemetryService
,
@
IUserDataSyncLogService
protected
readonly
logService
:
IUserDataSyncLogService
,
@
IConfigurationService
protected
readonly
configurationService
:
IConfigurationService
,
...
...
@@ -97,7 +97,7 @@ export abstract class AbstractSynchroniser extends Disposable {
this
.
currentMachineIdPromise
=
getServiceMachineId
(
environmentService
,
fileService
,
storageService
);
}
protected
isEnabled
():
boolean
{
return
this
.
userDataSyncEnablementService
.
isResourceEnabled
(
this
.
resource
);
}
protected
isEnabled
():
boolean
{
return
this
.
userDataSync
Resource
EnablementService
.
isResourceEnabled
(
this
.
resource
);
}
protected
async
triggerLocalChange
():
Promise
<
void
>
{
if
(
this
.
isEnabled
())
{
...
...
@@ -551,12 +551,12 @@ export abstract class AbstractFileSynchroniser extends AbstractSynchroniser {
@
IStorageService
storageService
:
IStorageService
,
@
IUserDataSyncStoreService
userDataSyncStoreService
:
IUserDataSyncStoreService
,
@
IUserDataSyncBackupStoreService
userDataSyncBackupStoreService
:
IUserDataSyncBackupStoreService
,
@
IUserDataSync
EnablementService
userDataSyncEnablementService
:
IUserDataSync
EnablementService
,
@
IUserDataSync
ResourceEnablementService
userDataSyncResourceEnablementService
:
IUserDataSyncResource
EnablementService
,
@
ITelemetryService
telemetryService
:
ITelemetryService
,
@
IUserDataSyncLogService
logService
:
IUserDataSyncLogService
,
@
IConfigurationService
configurationService
:
IConfigurationService
,
)
{
super
(
resource
,
fileService
,
environmentService
,
storageService
,
userDataSyncStoreService
,
userDataSyncBackupStoreService
,
userDataSyncEnablementService
,
telemetryService
,
logService
,
configurationService
);
super
(
resource
,
fileService
,
environmentService
,
storageService
,
userDataSyncStoreService
,
userDataSyncBackupStoreService
,
userDataSync
Resource
EnablementService
,
telemetryService
,
logService
,
configurationService
);
this
.
_register
(
this
.
fileService
.
watch
(
dirname
(
file
)));
this
.
_register
(
this
.
fileService
.
onDidFilesChange
(
e
=>
this
.
onFileChanges
(
e
)));
}
...
...
@@ -631,13 +631,13 @@ export abstract class AbstractJsonFileSynchroniser extends AbstractFileSynchroni
@
IStorageService
storageService
:
IStorageService
,
@
IUserDataSyncStoreService
userDataSyncStoreService
:
IUserDataSyncStoreService
,
@
IUserDataSyncBackupStoreService
userDataSyncBackupStoreService
:
IUserDataSyncBackupStoreService
,
@
IUserDataSync
EnablementService
userDataSyncEnablementService
:
IUserDataSync
EnablementService
,
@
IUserDataSync
ResourceEnablementService
userDataSyncResourceEnablementService
:
IUserDataSyncResource
EnablementService
,
@
ITelemetryService
telemetryService
:
ITelemetryService
,
@
IUserDataSyncLogService
logService
:
IUserDataSyncLogService
,
@
IUserDataSyncUtilService
protected
readonly
userDataSyncUtilService
:
IUserDataSyncUtilService
,
@
IConfigurationService
configurationService
:
IConfigurationService
,
)
{
super
(
file
,
resource
,
fileService
,
environmentService
,
storageService
,
userDataSyncStoreService
,
userDataSyncBackupStoreService
,
userDataSyncEnablementService
,
telemetryService
,
logService
,
configurationService
);
super
(
file
,
resource
,
fileService
,
environmentService
,
storageService
,
userDataSyncStoreService
,
userDataSyncBackupStoreService
,
userDataSync
Resource
EnablementService
,
telemetryService
,
logService
,
configurationService
);
}
protected
hasErrors
(
content
:
string
):
boolean
{
...
...
src/vs/platform/userDataSync/common/extensionsSync.ts
浏览文件 @
8440dcd6
...
...
@@ -4,7 +4,7 @@
*--------------------------------------------------------------------------------------------*/
import
{
IUserDataSyncStoreService
,
ISyncExtension
,
IUserDataSyncLogService
,
IUserDataSynchroniser
,
SyncResource
,
IUserDataSyncEnablementService
,
IUserDataSyncStoreService
,
ISyncExtension
,
IUserDataSyncLogService
,
IUserDataSynchroniser
,
SyncResource
,
IUserDataSync
Resource
EnablementService
,
IUserDataSyncBackupStoreService
,
ISyncResourceHandle
,
ISyncPreview
,
USER_DATA_SYNC_SCHEME
,
IRemoteUserData
,
ISyncData
}
from
'
vs/platform/userDataSync/common/userDataSync
'
;
import
{
Event
}
from
'
vs/base/common/event
'
;
...
...
@@ -60,10 +60,10 @@ export class ExtensionsSynchroniser extends AbstractSynchroniser implements IUse
@
IUserDataSyncLogService
logService
:
IUserDataSyncLogService
,
@
IExtensionGalleryService
private
readonly
extensionGalleryService
:
IExtensionGalleryService
,
@
IConfigurationService
configurationService
:
IConfigurationService
,
@
IUserDataSync
EnablementService
userDataSyncEnablementService
:
IUserDataSync
EnablementService
,
@
IUserDataSync
ResourceEnablementService
userDataSyncResourceEnablementService
:
IUserDataSyncResource
EnablementService
,
@
ITelemetryService
telemetryService
:
ITelemetryService
,
)
{
super
(
SyncResource
.
Extensions
,
fileService
,
environmentService
,
storageService
,
userDataSyncStoreService
,
userDataSyncBackupStoreService
,
userDataSyncEnablementService
,
telemetryService
,
logService
,
configurationService
);
super
(
SyncResource
.
Extensions
,
fileService
,
environmentService
,
storageService
,
userDataSyncStoreService
,
userDataSyncBackupStoreService
,
userDataSync
Resource
EnablementService
,
telemetryService
,
logService
,
configurationService
);
this
.
_register
(
Event
.
debounce
(
Event
.
any
<
any
>
(
...
...
src/vs/platform/userDataSync/common/globalStateSync.ts
浏览文件 @
8440dcd6
...
...
@@ -4,7 +4,7 @@
*--------------------------------------------------------------------------------------------*/
import
{
IUserDataSyncStoreService
,
IUserDataSyncLogService
,
IGlobalState
,
SyncResource
,
IUserDataSynchroniser
,
IUserDataSyncEnablementService
,
IUserDataSyncStoreService
,
IUserDataSyncLogService
,
IGlobalState
,
SyncResource
,
IUserDataSynchroniser
,
IUserDataSync
Resource
EnablementService
,
IUserDataSyncBackupStoreService
,
ISyncResourceHandle
,
IStorageValue
,
ISyncPreview
,
USER_DATA_SYNC_SCHEME
,
IRemoteUserData
,
ISyncData
}
from
'
vs/platform/userDataSync/common/userDataSync
'
;
import
{
VSBuffer
}
from
'
vs/base/common/buffer
'
;
...
...
@@ -54,13 +54,13 @@ export class GlobalStateSynchroniser extends AbstractSynchroniser implements IUs
@
IUserDataSyncBackupStoreService
userDataSyncBackupStoreService
:
IUserDataSyncBackupStoreService
,
@
IUserDataSyncLogService
logService
:
IUserDataSyncLogService
,
@
IEnvironmentService
private
readonly
environmentService
:
IEnvironmentService
,
@
IUserDataSync
EnablementService
userDataSyncEnablementService
:
IUserDataSync
EnablementService
,
@
IUserDataSync
ResourceEnablementService
userDataSyncResourceEnablementService
:
IUserDataSyncResource
EnablementService
,
@
ITelemetryService
telemetryService
:
ITelemetryService
,
@
IConfigurationService
configurationService
:
IConfigurationService
,
@
IStorageService
private
readonly
storageService
:
IStorageService
,
@
IStorageKeysSyncRegistryService
private
readonly
storageKeysSyncRegistryService
:
IStorageKeysSyncRegistryService
,
)
{
super
(
SyncResource
.
GlobalState
,
fileService
,
environmentService
,
storageService
,
userDataSyncStoreService
,
userDataSyncBackupStoreService
,
userDataSyncEnablementService
,
telemetryService
,
logService
,
configurationService
);
super
(
SyncResource
.
GlobalState
,
fileService
,
environmentService
,
storageService
,
userDataSyncStoreService
,
userDataSyncBackupStoreService
,
userDataSync
Resource
EnablementService
,
telemetryService
,
logService
,
configurationService
);
this
.
_register
(
this
.
fileService
.
watch
(
dirname
(
this
.
environmentService
.
argvResource
)));
this
.
_register
(
Event
.
any
(
...
...
src/vs/platform/userDataSync/common/keybindingsSync.ts
浏览文件 @
8440dcd6
...
...
@@ -6,7 +6,7 @@
import
{
IFileService
,
FileOperationError
,
FileOperationResult
}
from
'
vs/platform/files/common/files
'
;
import
{
UserDataSyncError
,
UserDataSyncErrorCode
,
IUserDataSyncStoreService
,
IUserDataSyncLogService
,
IUserDataSyncUtilService
,
SyncResource
,
IUserDataSynchroniser
,
IUserDataSyncEnablementService
,
IUserDataSyncBackupStoreService
,
USER_DATA_SYNC_SCHEME
,
PREVIEW_DIR_NAME
,
ISyncResourceHandle
,
IUserDataSynchroniser
,
IUserDataSync
Resource
EnablementService
,
IUserDataSyncBackupStoreService
,
USER_DATA_SYNC_SCHEME
,
PREVIEW_DIR_NAME
,
ISyncResourceHandle
,
IRemoteUserData
,
ISyncData
}
from
'
vs/platform/userDataSync/common/userDataSync
'
;
import
{
merge
}
from
'
vs/platform/userDataSync/common/keybindingsMerge
'
;
...
...
@@ -43,14 +43,14 @@ export class KeybindingsSynchroniser extends AbstractJsonFileSynchroniser implem
@
IUserDataSyncBackupStoreService
userDataSyncBackupStoreService
:
IUserDataSyncBackupStoreService
,
@
IUserDataSyncLogService
logService
:
IUserDataSyncLogService
,
@
IConfigurationService
configurationService
:
IConfigurationService
,
@
IUserDataSync
EnablementService
userDataSyncEnablementService
:
IUserDataSync
EnablementService
,
@
IUserDataSync
ResourceEnablementService
userDataSyncResourceEnablementService
:
IUserDataSyncResource
EnablementService
,
@
IFileService
fileService
:
IFileService
,
@
IEnvironmentService
environmentService
:
IEnvironmentService
,
@
IStorageService
storageService
:
IStorageService
,
@
IUserDataSyncUtilService
userDataSyncUtilService
:
IUserDataSyncUtilService
,
@
ITelemetryService
telemetryService
:
ITelemetryService
,
)
{
super
(
environmentService
.
keybindingsResource
,
SyncResource
.
Keybindings
,
fileService
,
environmentService
,
storageService
,
userDataSyncStoreService
,
userDataSyncBackupStoreService
,
userDataSyncEnablementService
,
telemetryService
,
logService
,
userDataSyncUtilService
,
configurationService
);
super
(
environmentService
.
keybindingsResource
,
SyncResource
.
Keybindings
,
fileService
,
environmentService
,
storageService
,
userDataSyncStoreService
,
userDataSyncBackupStoreService
,
userDataSync
Resource
EnablementService
,
telemetryService
,
logService
,
userDataSyncUtilService
,
configurationService
);
}
protected
async
generatePullPreview
(
remoteUserData
:
IRemoteUserData
,
lastSyncUserData
:
IRemoteUserData
|
null
,
token
:
CancellationToken
):
Promise
<
IFileSyncPreview
>
{
...
...
src/vs/platform/userDataSync/common/settingsSync.ts
浏览文件 @
8440dcd6
...
...
@@ -6,7 +6,7 @@
import
{
IFileService
,
FileOperationError
,
FileOperationResult
}
from
'
vs/platform/files/common/files
'
;
import
{
UserDataSyncError
,
UserDataSyncErrorCode
,
IUserDataSyncStoreService
,
IUserDataSyncLogService
,
IUserDataSyncUtilService
,
CONFIGURATION_SYNC_STORE_KEY
,
SyncResource
,
IUserDataSyncEnablementService
,
IUserDataSyncBackupStoreService
,
USER_DATA_SYNC_SCHEME
,
PREVIEW_DIR_NAME
,
ISyncResourceHandle
,
IUserDataSynchroniser
,
SyncResource
,
IUserDataSync
Resource
EnablementService
,
IUserDataSyncBackupStoreService
,
USER_DATA_SYNC_SCHEME
,
PREVIEW_DIR_NAME
,
ISyncResourceHandle
,
IUserDataSynchroniser
,
IRemoteUserData
,
ISyncData
}
from
'
vs/platform/userDataSync/common/userDataSync
'
;
import
{
VSBuffer
}
from
'
vs/base/common/buffer
'
;
...
...
@@ -51,11 +51,11 @@ export class SettingsSynchroniser extends AbstractJsonFileSynchroniser implement
@
IUserDataSyncLogService
logService
:
IUserDataSyncLogService
,
@
IUserDataSyncUtilService
userDataSyncUtilService
:
IUserDataSyncUtilService
,
@
IConfigurationService
configurationService
:
IConfigurationService
,
@
IUserDataSync
EnablementService
userDataSyncEnablementService
:
IUserDataSync
EnablementService
,
@
IUserDataSync
ResourceEnablementService
userDataSyncResourceEnablementService
:
IUserDataSyncResource
EnablementService
,
@
ITelemetryService
telemetryService
:
ITelemetryService
,
@
IExtensionManagementService
private
readonly
extensionManagementService
:
IExtensionManagementService
,
)
{
super
(
environmentService
.
settingsResource
,
SyncResource
.
Settings
,
fileService
,
environmentService
,
storageService
,
userDataSyncStoreService
,
userDataSyncBackupStoreService
,
userDataSyncEnablementService
,
telemetryService
,
logService
,
userDataSyncUtilService
,
configurationService
);
super
(
environmentService
.
settingsResource
,
SyncResource
.
Settings
,
fileService
,
environmentService
,
storageService
,
userDataSyncStoreService
,
userDataSyncBackupStoreService
,
userDataSync
Resource
EnablementService
,
telemetryService
,
logService
,
userDataSyncUtilService
,
configurationService
);
}
protected
async
generatePullPreview
(
remoteUserData
:
IRemoteUserData
,
lastSyncUserData
:
IRemoteUserData
|
null
,
token
:
CancellationToken
):
Promise
<
IFileSyncPreview
>
{
...
...
src/vs/platform/userDataSync/common/snippetsSync.ts
浏览文件 @
8440dcd6
...
...
@@ -4,7 +4,7 @@
*--------------------------------------------------------------------------------------------*/
import
{
IUserDataSyncStoreService
,
IUserDataSyncLogService
,
IUserDataSynchroniser
,
SyncResource
,
IUserDataSyncEnablementService
,
IUserDataSyncBackupStoreService
,
IUserDataSyncStoreService
,
IUserDataSyncLogService
,
IUserDataSynchroniser
,
SyncResource
,
IUserDataSync
Resource
EnablementService
,
IUserDataSyncBackupStoreService
,
Conflict
,
USER_DATA_SYNC_SCHEME
,
PREVIEW_DIR_NAME
,
ISyncResourceHandle
,
IRemoteUserData
,
ISyncData
,
ISyncPreview
}
from
'
vs/platform/userDataSync/common/userDataSync
'
;
import
{
IEnvironmentService
}
from
'
vs/platform/environment/common/environment
'
;
...
...
@@ -44,10 +44,10 @@ export class SnippetsSynchroniser extends AbstractSynchroniser implements IUserD
@
IUserDataSyncBackupStoreService
userDataSyncBackupStoreService
:
IUserDataSyncBackupStoreService
,
@
IUserDataSyncLogService
logService
:
IUserDataSyncLogService
,
@
IConfigurationService
configurationService
:
IConfigurationService
,
@
IUserDataSync
EnablementService
userDataSyncEnablementService
:
IUserDataSync
EnablementService
,
@
IUserDataSync
ResourceEnablementService
userDataSyncResourceEnablementService
:
IUserDataSyncResource
EnablementService
,
@
ITelemetryService
telemetryService
:
ITelemetryService
,
)
{
super
(
SyncResource
.
Snippets
,
fileService
,
environmentService
,
storageService
,
userDataSyncStoreService
,
userDataSyncBackupStoreService
,
userDataSyncEnablementService
,
telemetryService
,
logService
,
configurationService
);
super
(
SyncResource
.
Snippets
,
fileService
,
environmentService
,
storageService
,
userDataSyncStoreService
,
userDataSyncBackupStoreService
,
userDataSync
Resource
EnablementService
,
telemetryService
,
logService
,
configurationService
);
this
.
snippetsFolder
=
environmentService
.
snippetsHome
;
this
.
snippetsPreviewFolder
=
joinPath
(
this
.
syncFolder
,
PREVIEW_DIR_NAME
);
this
.
_register
(
this
.
fileService
.
watch
(
environmentService
.
userRoamingDataHome
));
...
...
src/vs/platform/userDataSync/common/userDataAutoSyncService.ts
浏览文件 @
8440dcd6
...
...
@@ -6,7 +6,7 @@
import
{
Delayer
,
disposableTimeout
,
CancelablePromise
,
createCancelablePromise
}
from
'
vs/base/common/async
'
;
import
{
Event
,
Emitter
}
from
'
vs/base/common/event
'
;
import
{
Disposable
,
toDisposable
,
MutableDisposable
,
IDisposable
}
from
'
vs/base/common/lifecycle
'
;
import
{
IUserDataSyncLogService
,
IUserDataSyncService
,
IUserDataAutoSyncService
,
UserDataSyncError
,
UserDataSyncErrorCode
,
IUserDataSyncEnablementService
,
IUserDataSyncStoreService
}
from
'
vs/platform/userDataSync/common/userDataSync
'
;
import
{
IUserDataSyncLogService
,
IUserDataSyncService
,
IUserDataAutoSyncService
,
UserDataSyncError
,
UserDataSyncErrorCode
,
IUserDataSync
Resource
EnablementService
,
IUserDataSyncStoreService
}
from
'
vs/platform/userDataSync/common/userDataSync
'
;
import
{
IUserDataSyncAccountService
}
from
'
vs/platform/userDataSync/common/userDataSyncAccount
'
;
import
{
ITelemetryService
}
from
'
vs/platform/telemetry/common/telemetry
'
;
import
{
isPromiseCanceledError
}
from
'
vs/base/common/errors
'
;
...
...
@@ -75,7 +75,7 @@ export class UserDataAutoSyncService extends UserDataAutoSyncEnablementService i
constructor
(
@
IUserDataSyncStoreService
userDataSyncStoreService
:
IUserDataSyncStoreService
,
@
IUserDataSync
EnablementService
private
readonly
userDataSyncEnablementService
:
IUserDataSync
EnablementService
,
@
IUserDataSync
ResourceEnablementService
private
readonly
userDataSyncResourceEnablementService
:
IUserDataSyncResource
EnablementService
,
@
IUserDataSyncService
private
readonly
userDataSyncService
:
IUserDataSyncService
,
@
IUserDataSyncLogService
private
readonly
logService
:
IUserDataSyncLogService
,
@
IUserDataSyncAccountService
private
readonly
authTokenService
:
IUserDataSyncAccountService
,
...
...
@@ -90,7 +90,7 @@ export class UserDataAutoSyncService extends UserDataAutoSyncEnablementService i
this
.
updateAutoSync
();
this
.
_register
(
authTokenService
.
onDidChangeAccount
(()
=>
this
.
updateAutoSync
()));
this
.
_register
(
Event
.
debounce
<
string
,
string
[]
>
(
userDataSyncService
.
onDidChangeLocal
,
(
last
,
source
)
=>
last
?
[...
last
,
source
]
:
[
source
],
1000
)(
sources
=>
this
.
triggerSync
(
sources
,
false
)));
this
.
_register
(
Event
.
filter
(
this
.
userDataSyncEnablementService
.
onDidChangeResourceEnablement
,
([,
enabled
])
=>
enabled
)(()
=>
this
.
triggerSync
([
'
resourceEnablement
'
],
false
)));
this
.
_register
(
Event
.
filter
(
this
.
userDataSync
Resource
EnablementService
.
onDidChangeResourceEnablement
,
([,
enabled
])
=>
enabled
)(()
=>
this
.
triggerSync
([
'
resourceEnablement
'
],
false
)));
}
}
...
...
src/vs/platform/userDataSync/common/userDataSync.ts
浏览文件 @
8440dcd6
...
...
@@ -329,8 +329,8 @@ export interface IUserDataSynchroniser {
// #region User Data Sync Services
export
const
IUserDataSync
EnablementService
=
createDecorator
<
IUserDataSyncEnablementService
>
(
'
IUserDataSync
EnablementService
'
);
export
interface
IUserDataSyncEnablementService
{
export
const
IUserDataSync
ResourceEnablementService
=
createDecorator
<
IUserDataSyncResourceEnablementService
>
(
'
IUserDataSyncResource
EnablementService
'
);
export
interface
IUserDataSync
Resource
EnablementService
{
_serviceBrand
:
any
;
readonly
onDidChangeResourceEnablement
:
Event
<
[
SyncResource
,
boolean
]
>
;
...
...
src/vs/platform/userDataSync/common/userDataSyncEnablementService.ts
→
src/vs/platform/userDataSync/common/userDataSync
Resource
EnablementService.ts
浏览文件 @
8440dcd6
...
...
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import
{
IUserDataSyncEnablementService
,
ALL_SYNC_RESOURCES
,
SyncResource
}
from
'
vs/platform/userDataSync/common/userDataSync
'
;
import
{
IUserDataSync
Resource
EnablementService
,
ALL_SYNC_RESOURCES
,
SyncResource
}
from
'
vs/platform/userDataSync/common/userDataSync
'
;
import
{
Disposable
}
from
'
vs/base/common/lifecycle
'
;
import
{
Emitter
,
Event
}
from
'
vs/base/common/event
'
;
import
{
IStorageService
,
IWorkspaceStorageChangeEvent
,
StorageScope
}
from
'
vs/platform/storage/common/storage
'
;
...
...
@@ -16,7 +16,7 @@ type SyncEnablementClassification = {
const
enablementKey
=
'
sync.enable
'
;
function
getEnablementKey
(
resource
:
SyncResource
)
{
return
`
${
enablementKey
}
.
${
resource
}
`
;
}
export
class
UserDataSync
EnablementService
extends
Disposable
implements
IUserDataSync
EnablementService
{
export
class
UserDataSync
ResourceEnablementService
extends
Disposable
implements
IUserDataSyncResource
EnablementService
{
_serviceBrand
:
any
;
...
...
src/vs/platform/userDataSync/electron-browser/userDataAutoSyncService.ts
浏览文件 @
8440dcd6
...
...
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import
{
IUserDataSyncService
,
IUserDataSyncLogService
,
IUserDataSyncEnablementService
,
IUserDataSyncStoreService
}
from
'
vs/platform/userDataSync/common/userDataSync
'
;
import
{
IUserDataSyncService
,
IUserDataSyncLogService
,
IUserDataSync
Resource
EnablementService
,
IUserDataSyncStoreService
}
from
'
vs/platform/userDataSync/common/userDataSync
'
;
import
{
Event
}
from
'
vs/base/common/event
'
;
import
{
IElectronService
}
from
'
vs/platform/electron/electron-sandbox/electron
'
;
import
{
UserDataAutoSyncService
as
BaseUserDataAutoSyncService
}
from
'
vs/platform/userDataSync/common/userDataAutoSyncService
'
;
...
...
@@ -16,7 +16,7 @@ export class UserDataAutoSyncService extends BaseUserDataAutoSyncService {
constructor
(
@
IUserDataSyncStoreService
userDataSyncStoreService
:
IUserDataSyncStoreService
,
@
IUserDataSync
EnablementService
userDataSyncEnablementService
:
IUserDataSync
EnablementService
,
@
IUserDataSync
ResourceEnablementService
userDataSyncResourceEnablementService
:
IUserDataSyncResource
EnablementService
,
@
IUserDataSyncService
userDataSyncService
:
IUserDataSyncService
,
@
IElectronService
electronService
:
IElectronService
,
@
IUserDataSyncLogService
logService
:
IUserDataSyncLogService
,
...
...
@@ -25,7 +25,7 @@ export class UserDataAutoSyncService extends BaseUserDataAutoSyncService {
@
IStorageService
storageService
:
IStorageService
,
@
IEnvironmentService
environmentService
:
IEnvironmentService
,
)
{
super
(
userDataSyncStoreService
,
userDataSyncEnablementService
,
userDataSyncService
,
logService
,
authTokenService
,
telemetryService
,
storageService
,
environmentService
);
super
(
userDataSyncStoreService
,
userDataSync
Resource
EnablementService
,
userDataSyncService
,
logService
,
authTokenService
,
telemetryService
,
storageService
,
environmentService
);
this
.
_register
(
Event
.
debounce
<
string
,
string
[]
>
(
Event
.
any
<
string
>
(
Event
.
map
(
electronService
.
onWindowFocus
,
()
=>
'
windowFocus
'
),
...
...
src/vs/platform/userDataSync/test/common/synchronizer.test.ts
浏览文件 @
8440dcd6
...
...
@@ -4,7 +4,7 @@
*--------------------------------------------------------------------------------------------*/
import
*
as
assert
from
'
assert
'
;
import
{
IUserDataSyncStoreService
,
SyncResource
,
SyncStatus
,
IUserDataSyncEnablementService
,
IRemoteUserData
,
ISyncData
,
ISyncPreview
}
from
'
vs/platform/userDataSync/common/userDataSync
'
;
import
{
IUserDataSyncStoreService
,
SyncResource
,
SyncStatus
,
IUserDataSync
Resource
EnablementService
,
IRemoteUserData
,
ISyncData
,
ISyncPreview
}
from
'
vs/platform/userDataSync/common/userDataSync
'
;
import
{
UserDataSyncClient
,
UserDataSyncTestServer
}
from
'
vs/platform/userDataSync/test/common/userDataSyncClient
'
;
import
{
DisposableStore
,
toDisposable
}
from
'
vs/base/common/lifecycle
'
;
import
{
AbstractSynchroniser
}
from
'
vs/platform/userDataSync/common/abstractSynchronizer
'
;
...
...
@@ -186,7 +186,7 @@ suite('TestSynchronizer', () => {
test
(
'
sync should not run if disabled
'
,
async
()
=>
{
const
testObject
:
TestSynchroniser
=
client
.
instantiationService
.
createInstance
(
TestSynchroniser
,
SyncResource
.
Settings
);
client
.
instantiationService
.
get
(
IUserDataSyncEnablementService
).
setResourceEnablement
(
testObject
.
resource
,
false
);
client
.
instantiationService
.
get
(
IUserDataSync
Resource
EnablementService
).
setResourceEnablement
(
testObject
.
resource
,
false
);
const
actual
:
SyncStatus
[]
=
[];
disposableStore
.
add
(
testObject
.
onDidChangeStatus
(
status
=>
actual
.
push
(
status
)));
...
...
src/vs/platform/userDataSync/test/common/userDataSyncClient.ts
浏览文件 @
8440dcd6
...
...
@@ -6,7 +6,7 @@
import
{
IRequestService
}
from
'
vs/platform/request/common/request
'
;
import
{
IRequestOptions
,
IRequestContext
,
IHeaders
}
from
'
vs/base/parts/request/common/request
'
;
import
{
CancellationToken
}
from
'
vs/base/common/cancellation
'
;
import
{
IUserData
,
IUserDataManifest
,
ALL_SYNC_RESOURCES
,
IUserDataSyncLogService
,
IUserDataSyncStoreService
,
IUserDataSyncUtilService
,
IUserDataSyncEnablementService
,
IUserDataSyncService
,
getDefaultIgnoredSettings
,
IUserDataSyncBackupStoreService
,
SyncResource
,
ServerResource
}
from
'
vs/platform/userDataSync/common/userDataSync
'
;
import
{
IUserData
,
IUserDataManifest
,
ALL_SYNC_RESOURCES
,
IUserDataSyncLogService
,
IUserDataSyncStoreService
,
IUserDataSyncUtilService
,
IUserDataSync
Resource
EnablementService
,
IUserDataSyncService
,
getDefaultIgnoredSettings
,
IUserDataSyncBackupStoreService
,
SyncResource
,
ServerResource
}
from
'
vs/platform/userDataSync/common/userDataSync
'
;
import
{
bufferToStream
,
VSBuffer
}
from
'
vs/base/common/buffer
'
;
import
{
generateUuid
}
from
'
vs/base/common/uuid
'
;
import
{
UserDataSyncService
}
from
'
vs/platform/userDataSync/common/userDataSyncService
'
;
...
...
@@ -25,7 +25,7 @@ import { URI } from 'vs/base/common/uri';
import
{
joinPath
}
from
'
vs/base/common/resources
'
;
import
{
IStringDictionary
}
from
'
vs/base/common/collections
'
;
import
{
FormattingOptions
}
from
'
vs/base/common/jsonFormatter
'
;
import
{
UserDataSync
EnablementService
}
from
'
vs/platform/userDataSync/common/userDataSync
EnablementService
'
;
import
{
UserDataSync
ResourceEnablementService
}
from
'
vs/platform/userDataSync/common/userDataSyncResource
EnablementService
'
;
import
{
IGlobalExtensionEnablementService
,
IExtensionManagementService
,
IExtensionGalleryService
,
DidInstallExtensionEvent
,
DidUninstallExtensionEvent
}
from
'
vs/platform/extensionManagement/common/extensionManagement
'
;
import
{
GlobalExtensionEnablementService
}
from
'
vs/platform/extensionManagement/common/extensionEnablementService
'
;
import
{
InMemoryFileSystemProvider
}
from
'
vs/platform/files/common/inMemoryFilesystemProvider
'
;
...
...
@@ -95,7 +95,7 @@ export class UserDataSyncClient extends Disposable {
this
.
instantiationService
.
stub
(
IUserDataSyncMachinesService
,
this
.
instantiationService
.
createInstance
(
UserDataSyncMachinesService
));
this
.
instantiationService
.
stub
(
IUserDataSyncBackupStoreService
,
this
.
instantiationService
.
createInstance
(
UserDataSyncBackupStoreService
));
this
.
instantiationService
.
stub
(
IUserDataSyncUtilService
,
new
TestUserDataSyncUtilService
());
this
.
instantiationService
.
stub
(
IUserDataSync
EnablementService
,
this
.
instantiationService
.
createInstance
(
UserDataSync
EnablementService
));
this
.
instantiationService
.
stub
(
IUserDataSync
ResourceEnablementService
,
this
.
instantiationService
.
createInstance
(
UserDataSyncResource
EnablementService
));
this
.
instantiationService
.
stub
(
IStorageKeysSyncRegistryService
,
this
.
instantiationService
.
createInstance
(
StorageKeysSyncRegistryService
));
this
.
instantiationService
.
stub
(
IGlobalExtensionEnablementService
,
this
.
instantiationService
.
createInstance
(
GlobalExtensionEnablementService
));
...
...
src/vs/workbench/contrib/userDataSync/browser/userDataAutoSyncService.ts
浏览文件 @
8440dcd6
...
...
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import
{
IUserDataSyncService
,
IUserDataSyncLogService
,
IUserDataSyncEnablementService
,
IUserDataSyncStoreService
}
from
'
vs/platform/userDataSync/common/userDataSync
'
;
import
{
IUserDataSyncService
,
IUserDataSyncLogService
,
IUserDataSync
Resource
EnablementService
,
IUserDataSyncStoreService
}
from
'
vs/platform/userDataSync/common/userDataSync
'
;
import
{
Event
}
from
'
vs/base/common/event
'
;
import
{
UserDataAutoSyncService
as
BaseUserDataAutoSyncService
}
from
'
vs/platform/userDataSync/common/userDataAutoSyncService
'
;
import
{
IInstantiationService
}
from
'
vs/platform/instantiation/common/instantiation
'
;
...
...
@@ -18,7 +18,7 @@ export class UserDataAutoSyncService extends BaseUserDataAutoSyncService {
constructor
(
@
IUserDataSyncStoreService
userDataSyncStoreService
:
IUserDataSyncStoreService
,
@
IUserDataSync
EnablementService
userDataSyncEnablementService
:
IUserDataSync
EnablementService
,
@
IUserDataSync
ResourceEnablementService
userDataSyncResourceEnablementService
:
IUserDataSyncResource
EnablementService
,
@
IUserDataSyncService
userDataSyncService
:
IUserDataSyncService
,
@
IUserDataSyncLogService
logService
:
IUserDataSyncLogService
,
@
IUserDataSyncAccountService
authTokenService
:
IUserDataSyncAccountService
,
...
...
@@ -28,7 +28,7 @@ export class UserDataAutoSyncService extends BaseUserDataAutoSyncService {
@
IStorageService
storageService
:
IStorageService
,
@
IEnvironmentService
environmentService
:
IEnvironmentService
,
)
{
super
(
userDataSyncStoreService
,
userDataSyncEnablementService
,
userDataSyncService
,
logService
,
authTokenService
,
telemetryService
,
storageService
,
environmentService
);
super
(
userDataSyncStoreService
,
userDataSync
Resource
EnablementService
,
userDataSyncService
,
logService
,
authTokenService
,
telemetryService
,
storageService
,
environmentService
);
this
.
_register
(
Event
.
debounce
<
string
,
string
[]
>
(
Event
.
any
<
string
>
(
Event
.
map
(
hostService
.
onDidChangeFocus
,
()
=>
'
windowFocus
'
),
...
...
src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts
浏览文件 @
8440dcd6
...
...
@@ -29,7 +29,7 @@ import { IQuickInputService, IQuickPickItem, IQuickPickSeparator } from 'vs/plat
import
{
ITelemetryService
}
from
'
vs/platform/telemetry/common/telemetry
'
;
import
{
IUserDataAutoSyncService
,
IUserDataSyncService
,
registerConfiguration
,
SyncResource
,
SyncStatus
,
UserDataSyncError
,
UserDataSyncErrorCode
,
USER_DATA_SYNC_SCHEME
,
IUserDataSyncEnablementService
,
SyncResource
,
SyncStatus
,
UserDataSyncError
,
UserDataSyncErrorCode
,
USER_DATA_SYNC_SCHEME
,
IUserDataSync
Resource
EnablementService
,
SyncResourceConflicts
,
Conflict
,
getSyncResourceFromLocalPreview
}
from
'
vs/platform/userDataSync/common/userDataSync
'
;
import
{
FloatingClickWidget
}
from
'
vs/workbench/browser/parts/editor/editorWidgets
'
;
...
...
@@ -97,7 +97,7 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
private
readonly
accountBadgeDisposable
=
this
.
_register
(
new
MutableDisposable
());
constructor
(
@
IUserDataSync
EnablementService
private
readonly
userDataSyncEnablementService
:
IUserDataSync
EnablementService
,
@
IUserDataSync
ResourceEnablementService
private
readonly
userDataSyncResourceEnablementService
:
IUserDataSyncResource
EnablementService
,
@
IUserDataSyncService
private
readonly
userDataSyncService
:
IUserDataSyncService
,
@
IUserDataSyncWorkbenchService
private
readonly
userDataSyncWorkbenchService
:
IUserDataSyncWorkbenchService
,
@
IContextKeyService
contextKeyService
:
IContextKeyService
,
...
...
@@ -486,7 +486,7 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
quickPick
.
ignoreFocusOut
=
true
;
const
items
=
this
.
getConfigureSyncQuickPickItems
();
quickPick
.
items
=
items
;
quickPick
.
selectedItems
=
items
.
filter
(
item
=>
this
.
userDataSyncEnablementService
.
isResourceEnabled
(
item
.
id
));
quickPick
.
selectedItems
=
items
.
filter
(
item
=>
this
.
userDataSync
Resource
EnablementService
.
isResourceEnabled
(
item
.
id
));
let
accepted
:
boolean
=
false
;
disposables
.
add
(
Event
.
any
(
quickPick
.
onDidAccept
,
quickPick
.
onDidCustom
)(()
=>
{
accepted
=
true
;
...
...
@@ -529,10 +529,10 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
private
updateConfiguration
(
items
:
ConfigureSyncQuickPickItem
[],
selectedItems
:
ReadonlyArray
<
ConfigureSyncQuickPickItem
>
):
void
{
for
(
const
item
of
items
)
{
const
wasEnabled
=
this
.
userDataSyncEnablementService
.
isResourceEnabled
(
item
.
id
);
const
wasEnabled
=
this
.
userDataSync
Resource
EnablementService
.
isResourceEnabled
(
item
.
id
);
const
isEnabled
=
!!
selectedItems
.
filter
(
selected
=>
selected
.
id
===
item
.
id
)[
0
];
if
(
wasEnabled
!==
isEnabled
)
{
this
.
userDataSyncEnablementService
.
setResourceEnablement
(
item
.
id
!
,
isEnabled
);
this
.
userDataSync
Resource
EnablementService
.
setResourceEnablement
(
item
.
id
!
,
isEnabled
);
}
}
}
...
...
@@ -549,7 +549,7 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
quickPick
.
ok
=
true
;
const
items
=
this
.
getConfigureSyncQuickPickItems
();
quickPick
.
items
=
items
;
quickPick
.
selectedItems
=
items
.
filter
(
item
=>
this
.
userDataSyncEnablementService
.
isResourceEnabled
(
item
.
id
));
quickPick
.
selectedItems
=
items
.
filter
(
item
=>
this
.
userDataSync
Resource
EnablementService
.
isResourceEnabled
(
item
.
id
));
disposables
.
add
(
quickPick
.
onDidAccept
(
async
()
=>
{
if
(
quickPick
.
selectedItems
.
length
)
{
this
.
updateConfiguration
(
items
,
quickPick
.
selectedItems
);
...
...
@@ -581,11 +581,11 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
private
disableSync
(
source
:
SyncResource
):
void
{
switch
(
source
)
{
case
SyncResource
.
Settings
:
return
this
.
userDataSyncEnablementService
.
setResourceEnablement
(
SyncResource
.
Settings
,
false
);
case
SyncResource
.
Keybindings
:
return
this
.
userDataSyncEnablementService
.
setResourceEnablement
(
SyncResource
.
Keybindings
,
false
);
case
SyncResource
.
Snippets
:
return
this
.
userDataSyncEnablementService
.
setResourceEnablement
(
SyncResource
.
Snippets
,
false
);
case
SyncResource
.
Extensions
:
return
this
.
userDataSyncEnablementService
.
setResourceEnablement
(
SyncResource
.
Extensions
,
false
);
case
SyncResource
.
GlobalState
:
return
this
.
userDataSyncEnablementService
.
setResourceEnablement
(
SyncResource
.
GlobalState
,
false
);
case
SyncResource
.
Settings
:
return
this
.
userDataSync
Resource
EnablementService
.
setResourceEnablement
(
SyncResource
.
Settings
,
false
);
case
SyncResource
.
Keybindings
:
return
this
.
userDataSync
Resource
EnablementService
.
setResourceEnablement
(
SyncResource
.
Keybindings
,
false
);
case
SyncResource
.
Snippets
:
return
this
.
userDataSync
Resource
EnablementService
.
setResourceEnablement
(
SyncResource
.
Snippets
,
false
);
case
SyncResource
.
Extensions
:
return
this
.
userDataSync
Resource
EnablementService
.
setResourceEnablement
(
SyncResource
.
Extensions
,
false
);
case
SyncResource
.
GlobalState
:
return
this
.
userDataSync
Resource
EnablementService
.
setResourceEnablement
(
SyncResource
.
GlobalState
,
false
);
}
}
...
...
src/vs/workbench/contrib/userDataSync/browser/userDataSyncViews.ts
浏览文件 @
8440dcd6
...
...
@@ -9,7 +9,7 @@ import { localize } from 'vs/nls';
import
{
SyncDescriptor
}
from
'
vs/platform/instantiation/common/descriptors
'
;
import
{
TreeViewPane
,
TreeView
}
from
'
vs/workbench/browser/parts/views/treeView
'
;
import
{
IInstantiationService
,
ServicesAccessor
}
from
'
vs/platform/instantiation/common/instantiation
'
;
import
{
ALL_SYNC_RESOURCES
,
SyncResource
,
IUserDataSyncService
,
ISyncResourceHandle
,
SyncStatus
,
IUserDataSyncEnablementService
,
IUserDataAutoSyncService
}
from
'
vs/platform/userDataSync/common/userDataSync
'
;
import
{
ALL_SYNC_RESOURCES
,
SyncResource
,
IUserDataSyncService
,
ISyncResourceHandle
,
SyncStatus
,
IUserDataSync
Resource
EnablementService
,
IUserDataAutoSyncService
}
from
'
vs/platform/userDataSync/common/userDataSync
'
;
import
{
registerAction2
,
Action2
,
MenuId
}
from
'
vs/platform/actions/common/actions
'
;
import
{
ContextKeyExpr
,
ContextKeyEqualsExpr
,
IContextKeyService
,
RawContextKey
}
from
'
vs/platform/contextkey/common/contextkey
'
;
import
{
URI
}
from
'
vs/base/common/uri
'
;
...
...
@@ -71,7 +71,7 @@ export class UserDataSyncDataViews extends Disposable {
container
:
ViewContainer
,
@
IInstantiationService
private
readonly
instantiationService
:
IInstantiationService
,
@
IUserDataAutoSyncService
private
readonly
userDataAutoSyncService
:
IUserDataAutoSyncService
,
@
IUserDataSync
EnablementService
private
readonly
userDataSyncEnablementService
:
IUserDataSync
EnablementService
,
@
IUserDataSync
ResourceEnablementService
private
readonly
userDataSyncResourceEnablementService
:
IUserDataSyncResource
EnablementService
,
@
IContextKeyService
private
readonly
contextKeyService
:
IContextKeyService
,
)
{
super
();
...
...
@@ -101,7 +101,7 @@ export class UserDataSyncDataViews extends Disposable {
:
this
.
instantiationService
.
createInstance
(
LocalUserDataSyncHistoryViewDataProvider
);
}
});
this
.
_register
(
Event
.
any
(
this
.
userDataSyncEnablementService
.
onDidChangeResourceEnablement
,
this
.
userDataAutoSyncService
.
onDidChangeEnablement
)(()
=>
treeView
.
refresh
()));
this
.
_register
(
Event
.
any
(
this
.
userDataSync
Resource
EnablementService
.
onDidChangeResourceEnablement
,
this
.
userDataAutoSyncService
.
onDidChangeEnablement
)(()
=>
treeView
.
refresh
()));
const
viewsRegistry
=
Registry
.
as
<
IViewsRegistry
>
(
Extensions
.
ViewsRegistry
);
viewsRegistry
.
registerViews
([
<
ITreeViewDescriptor
>
{
id
,
...
...
@@ -170,7 +170,7 @@ export class UserDataSyncDataViews extends Disposable {
treeView
.
dataProvider
=
dataProvider
;
}
});
this
.
_register
(
Event
.
any
(
this
.
userDataSyncEnablementService
.
onDidChangeResourceEnablement
,
this
.
userDataAutoSyncService
.
onDidChangeEnablement
)(()
=>
treeView
.
refresh
()));
this
.
_register
(
Event
.
any
(
this
.
userDataSync
Resource
EnablementService
.
onDidChangeResourceEnablement
,
this
.
userDataAutoSyncService
.
onDidChangeEnablement
)(()
=>
treeView
.
refresh
()));
const
viewsRegistry
=
Registry
.
as
<
IViewsRegistry
>
(
Extensions
.
ViewsRegistry
);
viewsRegistry
.
registerViews
([
<
ITreeViewDescriptor
>
{
id
,
...
...
@@ -342,7 +342,7 @@ abstract class UserDataSyncHistoryViewDataProvider implements ITreeViewDataProvi
constructor
(
@
IUserDataSyncService
protected
readonly
userDataSyncService
:
IUserDataSyncService
,
@
IUserDataAutoSyncService
protected
readonly
userDataAutoSyncService
:
IUserDataAutoSyncService
,
@
IUserDataSync
EnablementService
private
readonly
userDataSyncEnablementService
:
IUserDataSync
EnablementService
,
@
IUserDataSync
ResourceEnablementService
private
readonly
userDataSyncResourceEnablementService
:
IUserDataSyncResource
EnablementService
,
@
INotificationService
private
readonly
notificationService
:
INotificationService
,
)
{
}
...
...
@@ -370,7 +370,7 @@ abstract class UserDataSyncHistoryViewDataProvider implements ITreeViewDataProvi
handle
:
resourceKey
,
collapsibleState
:
TreeItemCollapsibleState
.
Collapsed
,
label
:
{
label
:
getSyncAreaLabel
(
resourceKey
)
},
description
:
!
this
.
userDataAutoSyncService
.
isEnabled
()
||
this
.
userDataSyncEnablementService
.
isResourceEnabled
(
resourceKey
)
?
undefined
:
localize
(
'
not syncing
'
,
"
Not syncing
"
),
description
:
!
this
.
userDataAutoSyncService
.
isEnabled
()
||
this
.
userDataSync
Resource
EnablementService
.
isResourceEnabled
(
resourceKey
)
?
undefined
:
localize
(
'
not syncing
'
,
"
Not syncing
"
),
themeIcon
:
FolderThemeIcon
,
contextValue
:
resourceKey
}));
...
...
@@ -432,11 +432,11 @@ class RemoteUserDataSyncHistoryViewDataProvider extends UserDataSyncHistoryViewD
constructor
(
@
IUserDataSyncService
userDataSyncService
:
IUserDataSyncService
,
@
IUserDataAutoSyncService
userDataAutoSyncService
:
IUserDataAutoSyncService
,
@
IUserDataSync
EnablementService
userDataSyncEnablementService
:
IUserDataSync
EnablementService
,
@
IUserDataSync
ResourceEnablementService
userDataSyncResourceEnablementService
:
IUserDataSyncResource
EnablementService
,
@
IUserDataSyncMachinesService
private
readonly
userDataSyncMachinesService
:
IUserDataSyncMachinesService
,
@
INotificationService
notificationService
:
INotificationService
,
)
{
super
(
userDataSyncService
,
userDataAutoSyncService
,
userDataSyncEnablementService
,
notificationService
);
super
(
userDataSyncService
,
userDataAutoSyncService
,
userDataSync
Resource
EnablementService
,
notificationService
);
}
async
getChildren
(
element
?:
ITreeItem
):
Promise
<
ITreeItem
[]
>
{
...
...
src/vs/workbench/workbench.common.main.ts
浏览文件 @
8440dcd6
...
...
@@ -111,10 +111,10 @@ import { IDownloadService } from 'vs/platform/download/common/download';
import
{
DownloadService
}
from
'
vs/platform/download/common/downloadService
'
;
import
{
OpenerService
}
from
'
vs/editor/browser/services/openerService
'
;
import
{
IOpenerService
}
from
'
vs/platform/opener/common/opener
'
;
import
{
IUserDataSyncEnablementService
}
from
'
vs/platform/userDataSync/common/userDataSync
'
;
import
{
UserDataSync
EnablementService
}
from
'
vs/platform/userDataSync/common/userDataSync
EnablementService
'
;
import
{
IUserDataSync
Resource
EnablementService
}
from
'
vs/platform/userDataSync/common/userDataSync
'
;
import
{
UserDataSync
ResourceEnablementService
}
from
'
vs/platform/userDataSync/common/userDataSyncResource
EnablementService
'
;
registerSingleton
(
IUserDataSync
EnablementService
,
UserDataSync
EnablementService
);
registerSingleton
(
IUserDataSync
ResourceEnablementService
,
UserDataSyncResource
EnablementService
);
registerSingleton
(
IGlobalExtensionEnablementService
,
GlobalExtensionEnablementService
);
registerSingleton
(
IExtensionGalleryService
,
ExtensionGalleryService
,
true
);
registerSingleton
(
IContextViewService
,
ContextViewService
,
true
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录