Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
2320972f
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,发现更多精彩内容 >>
提交
2320972f
编写于
9月 16, 2019
作者:
M
Matt Bierner
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Revert "Move user data sync service to platform"
This reverts commit
0772a8fc
.
上级
a6c689dc
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
10 addition
and
11 deletion
+10
-11
src/vs/workbench/contrib/userData/browser/userData.contribution.ts
...rkbench/contrib/userData/browser/userData.contribution.ts
+0
-4
src/vs/workbench/services/userData/common/settingsSync.ts
src/vs/workbench/services/userData/common/settingsSync.ts
+2
-2
src/vs/workbench/services/userData/common/userDataSyncService.ts
...workbench/services/userData/common/userDataSyncService.ts
+7
-2
src/vs/workbench/workbench.common.main.ts
src/vs/workbench/workbench.common.main.ts
+1
-3
未找到文件。
src/vs/workbench/contrib/userData/browser/userData.contribution.ts
浏览文件 @
2320972f
...
...
@@ -25,8 +25,6 @@ import { IEditorService } from 'vs/workbench/services/editor/common/editorServic
import
{
ITextFileService
}
from
'
vs/workbench/services/textfile/common/textfiles
'
;
import
{
Event
}
from
'
vs/base/common/event
'
;
import
{
IHistoryService
}
from
'
vs/workbench/services/history/common/history
'
;
import
{
IFileService
}
from
'
vs/platform/files/common/files
'
;
import
{
InMemoryFileSystemProvider
}
from
'
vs/workbench/services/userData/common/inMemoryUserDataProvider
'
;
const
CONTEXT_SYNC_STATE
=
new
RawContextKey
<
string
>
(
'
syncStatus
'
,
SyncStatus
.
Uninitialized
);
...
...
@@ -49,13 +47,11 @@ Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration)
class
UserDataSyncContribution
extends
Disposable
implements
IWorkbenchContribution
{
constructor
(
@
IFileService
fileService
:
IFileService
,
@
IConfigurationService
private
readonly
configurationService
:
IConfigurationService
,
@
IUserDataSyncService
private
readonly
userDataSyncService
:
IUserDataSyncService
,
@
IUserDataSyncStoreService
private
readonly
userDataSyncStoreService
:
IUserDataSyncStoreService
,
)
{
super
();
this
.
_register
(
fileService
.
registerProvider
(
USER_DATA_PREVIEW_SCHEME
,
new
InMemoryFileSystemProvider
()));
this
.
sync
(
true
);
this
.
_register
(
Event
.
any
<
any
>
(
Event
.
filter
(
this
.
configurationService
.
onDidChangeConfiguration
,
e
=>
e
.
affectsConfiguration
(
'
userConfiguration.enableSync
'
)
&&
this
.
configurationService
.
getValue
<
boolean
>
(
'
userConfiguration.enableSync
'
)),
...
...
src/vs/
platform/userDataSync
/common/settingsSync.ts
→
src/vs/
workbench/services/userData
/common/settingsSync.ts
浏览文件 @
2320972f
...
...
@@ -6,7 +6,7 @@
import
{
Disposable
}
from
'
vs/base/common/lifecycle
'
;
import
{
IFileService
,
FileSystemProviderErrorCode
,
FileSystemProviderError
,
IFileContent
}
from
'
vs/platform/files/common/files
'
;
import
{
IStorageService
,
StorageScope
}
from
'
vs/platform/storage/common/storage
'
;
import
{
IUserData
,
UserDataSyncStoreError
,
UserDataSyncStoreErrorCode
,
ISynchroniser
,
SyncStatus
,
ISettingsMergeService
,
IUserDataSyncStoreService
,
SETTINGS_PREVIEW_RESOURCE
as
SETTINGS_CONFLICTS_RESOURCE
}
from
'
vs/platform/userDataSync/common/userDataSync
'
;
import
{
IUserData
,
UserDataSyncStoreError
,
UserDataSyncStoreErrorCode
,
ISynchroniser
,
SyncStatus
,
ISettingsMergeService
,
IUserDataSyncStoreService
,
SETTINGS_PREVIEW_RESOURCE
}
from
'
vs/platform/userDataSync/common/userDataSync
'
;
import
{
VSBuffer
}
from
'
vs/base/common/buffer
'
;
import
{
parse
,
ParseError
}
from
'
vs/base/common/json
'
;
import
{
localize
}
from
'
vs/nls
'
;
...
...
@@ -40,7 +40,7 @@ export class SettingsSynchroniser extends Disposable implements ISynchroniser {
private
_onDidChangeLocal
:
Emitter
<
void
>
=
this
.
_register
(
new
Emitter
<
void
>
());
readonly
onDidChangeLocal
:
Event
<
void
>
=
this
.
_onDidChangeLocal
.
event
;
readonly
conflicts
:
URI
=
SETTINGS_
CONFLICTS
_RESOURCE
;
readonly
conflicts
:
URI
=
SETTINGS_
PREVIEW
_RESOURCE
;
constructor
(
@
IFileService
private
readonly
fileService
:
IFileService
,
...
...
src/vs/
platform/userDataSync
/common/userDataSyncService.ts
→
src/vs/
workbench/services/userData
/common/userDataSyncService.ts
浏览文件 @
2320972f
...
...
@@ -3,12 +3,14 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import
{
IUserDataSyncService
,
SyncStatus
,
ISynchroniser
,
IUserDataSyncStoreService
}
from
'
vs/platform/userDataSync/common/userDataSync
'
;
import
{
IUserDataSyncService
,
SyncStatus
,
ISynchroniser
,
USER_DATA_PREVIEW_SCHEME
,
IUserDataSyncStoreService
}
from
'
vs/platform/userDataSync/common/userDataSync
'
;
import
{
Disposable
}
from
'
vs/base/common/lifecycle
'
;
import
{
registerSingleton
}
from
'
vs/platform/instantiation/common/extensions
'
;
import
{
IInstantiationService
}
from
'
vs/platform/instantiation/common/instantiation
'
;
import
{
SettingsSynchroniser
}
from
'
vs/
platform/userDataSync
/common/settingsSync
'
;
import
{
SettingsSynchroniser
}
from
'
vs/
workbench/services/userData
/common/settingsSync
'
;
import
{
Emitter
,
Event
}
from
'
vs/base/common/event
'
;
import
{
IFileService
}
from
'
vs/platform/files/common/files
'
;
import
{
InMemoryFileSystemProvider
}
from
'
vs/workbench/services/userData/common/inMemoryUserDataProvider
'
;
import
{
URI
}
from
'
vs/base/common/uri
'
;
export
class
UserDataSyncService
extends
Disposable
implements
IUserDataSyncService
{
...
...
@@ -30,6 +32,7 @@ export class UserDataSyncService extends Disposable implements IUserDataSyncServ
@
IInstantiationService
private
readonly
instantiationService
:
IInstantiationService
,
)
{
super
();
this
.
_register
(
fileService
.
registerProvider
(
USER_DATA_PREVIEW_SCHEME
,
new
InMemoryFileSystemProvider
()));
this
.
synchronisers
=
[
this
.
instantiationService
.
createInstance
(
SettingsSynchroniser
)
];
...
...
@@ -92,3 +95,5 @@ export class UserDataSyncService extends Disposable implements IUserDataSyncServ
}
}
registerSingleton
(
IUserDataSyncService
,
UserDataSyncService
);
src/vs/workbench/workbench.common.main.ts
浏览文件 @
2320972f
...
...
@@ -107,9 +107,8 @@ 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
{
IUserDataSyncStoreService
,
IUserDataSyncService
}
from
'
vs/platform/userDataSync/common/userDataSync
'
;
import
{
IUserDataSyncStoreService
}
from
'
vs/platform/userDataSync/common/userDataSync
'
;
import
{
UserDataSyncStoreService
}
from
'
vs/platform/userDataSync/common/userDataSyncStoreService
'
;
import
{
UserDataSyncService
}
from
'
vs/platform/userDataSync/common/userDataSyncService
'
;
registerSingleton
(
IExtensionGalleryService
,
ExtensionGalleryService
,
true
);
registerSingleton
(
IContextViewService
,
ContextViewService
,
true
);
...
...
@@ -124,7 +123,6 @@ registerSingleton(IMenuService, MenuService, true);
registerSingleton
(
IDownloadService
,
DownloadService
,
true
);
registerSingleton
(
IOpenerService
,
OpenerService
,
true
);
registerSingleton
(
IUserDataSyncStoreService
,
UserDataSyncStoreService
);
registerSingleton
(
IUserDataSyncService
,
UserDataSyncService
);
//#endregion
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录