Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
a00a441b
V
vscode
项目概览
掘金者说
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
a00a441b
编写于
5月 07, 2020
作者:
S
Sandeep Somavarapu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
move sync trigger to autosync service
上级
052fca0b
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
9 addition
and
11 deletion
+9
-11
src/vs/workbench/contrib/userDataSync/browser/userDataAutoSyncService.ts
...h/contrib/userDataSync/browser/userDataAutoSyncService.ts
+1
-1
src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts
...vs/workbench/contrib/userDataSync/browser/userDataSync.ts
+0
-6
src/vs/workbench/contrib/userDataSync/electron-browser/userDataAutoSyncService.ts
.../userDataSync/electron-browser/userDataAutoSyncService.ts
+5
-3
src/vs/workbench/workbench.desktop.main.ts
src/vs/workbench/workbench.desktop.main.ts
+3
-1
未找到文件。
src/vs/workbench/contrib/userDataSync/browser/userDataAutoSyncService.ts
浏览文件 @
a00a441b
...
...
@@ -7,10 +7,10 @@ import { IUserDataSyncService, IUserDataSyncLogService, IUserDataSyncEnablementS
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
'
;
import
{
UserDataSyncTrigger
}
from
'
vs/workbench/contrib/userDataSync/browser/userDataSyncTrigger
'
;
import
{
IHostService
}
from
'
vs/workbench/services/host/browser/host
'
;
import
{
IAuthenticationTokenService
}
from
'
vs/platform/authentication/common/authentication
'
;
import
{
ITelemetryService
}
from
'
vs/platform/telemetry/common/telemetry
'
;
import
{
UserDataSyncTrigger
}
from
'
vs/workbench/contrib/userDataSync/browser/userDataSyncTrigger
'
;
export
class
UserDataAutoSyncService
extends
BaseUserDataAutoSyncService
{
...
...
src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts
浏览文件 @
a00a441b
...
...
@@ -8,7 +8,6 @@ import { toErrorMessage } from 'vs/base/common/errorMessage';
import
{
canceled
,
isPromiseCanceledError
}
from
'
vs/base/common/errors
'
;
import
{
Event
}
from
'
vs/base/common/event
'
;
import
{
Disposable
,
DisposableStore
,
dispose
,
MutableDisposable
,
toDisposable
,
IDisposable
}
from
'
vs/base/common/lifecycle
'
;
import
{
isWeb
}
from
'
vs/base/common/platform
'
;
import
{
isEqual
,
basename
}
from
'
vs/base/common/resources
'
;
import
{
URI
}
from
'
vs/base/common/uri
'
;
import
type
{
ICodeEditor
}
from
'
vs/editor/browser/editorBrowser
'
;
...
...
@@ -39,7 +38,6 @@ import { IEditorInput, toResource, SideBySideEditor } from 'vs/workbench/common/
import
{
DiffEditorInput
}
from
'
vs/workbench/common/editor/diffEditorInput
'
;
import
*
as
Constants
from
'
vs/workbench/contrib/logs/common/logConstants
'
;
import
{
IOutputService
}
from
'
vs/workbench/contrib/output/common/output
'
;
import
{
UserDataSyncTrigger
}
from
'
vs/workbench/contrib/userDataSync/browser/userDataSyncTrigger
'
;
import
{
IActivityService
,
IBadge
,
NumberBadge
,
ProgressBadge
}
from
'
vs/workbench/services/activity/common/activity
'
;
import
{
IEditorService
}
from
'
vs/workbench/services/editor/common/editorService
'
;
import
{
IWorkbenchEnvironmentService
}
from
'
vs/workbench/services/environment/common/environmentService
'
;
...
...
@@ -162,10 +160,6 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
textModelResolverService
.
registerTextModelContentProvider
(
USER_DATA_SYNC_SCHEME
,
instantiationService
.
createInstance
(
UserDataRemoteContentProvider
));
registerEditorContribution
(
AcceptChangesContribution
.
ID
,
AcceptChangesContribution
);
if
(
!
isWeb
)
{
this
.
_register
(
instantiationService
.
createInstance
(
UserDataSyncTrigger
).
onDidTriggerSync
(
source
=>
userDataAutoSyncService
.
triggerAutoSync
([
source
])));
}
}
}
...
...
src/vs/workbench/
services
/userDataSync/electron-browser/userDataAutoSyncService.ts
→
src/vs/workbench/
contrib
/userDataSync/electron-browser/userDataAutoSyncService.ts
浏览文件 @
a00a441b
...
...
@@ -7,8 +7,9 @@ import { IUserDataAutoSyncService, UserDataSyncError } from 'vs/platform/userDat
import
{
ISharedProcessService
}
from
'
vs/platform/ipc/electron-browser/sharedProcessService
'
;
import
{
Disposable
}
from
'
vs/base/common/lifecycle
'
;
import
{
IChannel
}
from
'
vs/base/parts/ipc/common/ipc
'
;
import
{
registerSingleton
}
from
'
vs/platform/instantiation/common/extensions
'
;
import
{
Event
}
from
'
vs/base/common/event
'
;
import
{
IInstantiationService
}
from
'
vs/platform/instantiation/common/instantiation
'
;
import
{
UserDataSyncTrigger
}
from
'
vs/workbench/contrib/userDataSync/browser/userDataSyncTrigger
'
;
export
class
UserDataAutoSyncService
extends
Disposable
implements
IUserDataAutoSyncService
{
...
...
@@ -18,16 +19,17 @@ export class UserDataAutoSyncService extends Disposable implements IUserDataAuto
get
onError
():
Event
<
UserDataSyncError
>
{
return
Event
.
map
(
this
.
channel
.
listen
<
Error
>
(
'
onError
'
),
e
=>
UserDataSyncError
.
toUserDataSyncError
(
e
));
}
constructor
(
@
IInstantiationService
instantiationService
:
IInstantiationService
,
@
ISharedProcessService
sharedProcessService
:
ISharedProcessService
)
{
super
();
this
.
channel
=
sharedProcessService
.
getChannel
(
'
userDataAutoSync
'
);
this
.
_register
(
instantiationService
.
createInstance
(
UserDataSyncTrigger
).
onDidTriggerSync
(
source
=>
this
.
triggerAutoSync
([
source
])));
}
triggerAutoSync
(
sources
:
string
[]):
Promise
<
void
>
{
return
this
.
channel
.
call
(
'
triggerAutoSync
'
,
[
sources
]);
}
}
registerSingleton
(
IUserDataAutoSyncService
,
UserDataAutoSyncService
);
src/vs/workbench/workbench.desktop.main.ts
浏览文件 @
a00a441b
...
...
@@ -52,7 +52,6 @@ import 'vs/workbench/services/workspaces/electron-browser/workspacesService';
import
'
vs/workbench/services/workspaces/electron-browser/workspaceEditingService
'
;
import
'
vs/workbench/services/userDataSync/electron-browser/storageKeysSyncRegistryService
'
;
import
'
vs/workbench/services/userDataSync/electron-browser/userDataSyncService
'
;
import
'
vs/workbench/services/userDataSync/electron-browser/userDataAutoSyncService
'
;
import
'
vs/workbench/services/authentication/electron-browser/authenticationTokenService
'
;
import
'
vs/workbench/services/authentication/browser/authenticationService
'
;
import
'
vs/workbench/services/host/electron-browser/desktopHostService
'
;
...
...
@@ -73,9 +72,12 @@ import { ICredentialsService } from 'vs/platform/credentials/common/credentials'
import
{
KeytarCredentialsService
}
from
'
vs/platform/credentials/node/credentialsService
'
;
import
{
TitlebarPart
}
from
'
vs/workbench/electron-browser/parts/titlebar/titlebarPart
'
;
import
{
ITitleService
}
from
'
vs/workbench/services/title/common/titleService
'
;
import
{
IUserDataAutoSyncService
}
from
'
vs/platform/userDataSync/common/userDataSync
'
;
import
{
UserDataAutoSyncService
}
from
'
vs/workbench/contrib/userDataSync/electron-browser/userDataAutoSyncService
'
;
registerSingleton
(
ICredentialsService
,
KeytarCredentialsService
,
true
);
registerSingleton
(
ITitleService
,
TitlebarPart
);
registerSingleton
(
IUserDataAutoSyncService
,
UserDataAutoSyncService
);
//#endregion
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录