Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
6910af0b
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,发现更多精彩内容 >>
提交
6910af0b
编写于
11月 13, 2019
作者:
S
Sandeep Somavarapu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
💄
change labels
上级
60188e27
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
35 addition
and
21 deletion
+35
-21
src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts
...vs/workbench/contrib/userDataSync/browser/userDataSync.ts
+35
-21
未找到文件。
src/vs/workbench/contrib/userDataSync/browser/userDataSync.ts
浏览文件 @
6910af0b
...
...
@@ -127,7 +127,7 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
let
clazz
:
string
|
undefined
;
if
(
this
.
userDataSyncService
.
status
!==
SyncStatus
.
Uninitialized
&&
this
.
configurationService
.
getValue
<
boolean
>
(
UserDataSyncWorkbenchContribution
.
ENABLEMENT_SETTING
)
&&
this
.
authTokenService
.
status
===
AuthTokenStatus
.
Inactive
)
{
badge
=
new
NumberBadge
(
1
,
()
=>
localize
(
'
sign in
'
,
"
Configuration
Sync: Sign in...
"
));
badge
=
new
NumberBadge
(
1
,
()
=>
localize
(
'
sign in
'
,
"
Sync: Sign in...
"
));
}
else
if
(
this
.
userDataSyncService
.
status
===
SyncStatus
.
HasConflicts
)
{
badge
=
new
NumberBadge
(
1
,
()
=>
localize
(
'
resolve conflicts
'
,
"
Resolve Conflicts
"
));
}
else
if
(
this
.
userDataSyncService
.
status
===
SyncStatus
.
Syncing
)
{
...
...
@@ -223,7 +223,7 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
group
:
'
5_sync
'
,
command
:
{
id
:
'
workbench.userData.actions.syncStart
'
,
title
:
localize
(
'
start sync
'
,
"
Configuration
Sync: Turn On
"
)
title
:
localize
(
'
start sync
'
,
"
Sync: Turn On
"
)
},
when
:
ContextKeyExpr
.
and
(
CONTEXT_SYNC_STATE
.
notEqualsTo
(
SyncStatus
.
Uninitialized
),
ContextKeyExpr
.
not
(
`config.
${
UserDataSyncWorkbenchContribution
.
ENABLEMENT_SETTING
}
`
)),
};
...
...
@@ -231,21 +231,28 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
MenuRegistry
.
appendMenuItem
(
MenuId
.
GlobalActivity
,
startSyncMenuItem
);
MenuRegistry
.
appendMenuItem
(
MenuId
.
CommandPalette
,
startSyncMenuItem
);
const
signInMenuItem
:
IMenuItem
=
{
const
signInCommandId
=
'
workbench.userData.actions.login
'
;
const
signInWhenContext
=
ContextKeyExpr
.
and
(
CONTEXT_SYNC_STATE
.
notEqualsTo
(
SyncStatus
.
Uninitialized
),
ContextKeyExpr
.
has
(
`config.
${
UserDataSyncWorkbenchContribution
.
ENABLEMENT_SETTING
}
`
),
CONTEXT_AUTH_TOKEN_STATE
.
isEqualTo
(
AuthTokenStatus
.
Inactive
));
CommandsRegistry
.
registerCommand
(
signInCommandId
,
()
=>
this
.
signIn
());
MenuRegistry
.
appendMenuItem
(
MenuId
.
GlobalActivity
,
{
group
:
'
5_sync
'
,
command
:
{
id
:
'
workbench.userData.actions.login
'
,
title
:
localize
(
'
global activity sign in
'
,
"
Configuration
Sync: Sign in... (1)
"
)
id
:
signInCommandId
,
title
:
localize
(
'
global activity sign in
'
,
"
Sync: Sign in... (1)
"
)
},
when
:
ContextKeyExpr
.
and
(
CONTEXT_SYNC_STATE
.
notEqualsTo
(
SyncStatus
.
Uninitialized
),
ContextKeyExpr
.
has
(
`config.
${
UserDataSyncWorkbenchContribution
.
ENABLEMENT_SETTING
}
`
),
CONTEXT_AUTH_TOKEN_STATE
.
isEqualTo
(
AuthTokenStatus
.
Inactive
)),
};
CommandsRegistry
.
registerCommand
(
signInMenuItem
.
command
.
id
,
()
=>
this
.
signIn
());
MenuRegistry
.
appendMenuItem
(
MenuId
.
GlobalActivity
,
signInMenuItem
);
MenuRegistry
.
appendMenuItem
(
MenuId
.
CommandPalette
,
signInMenuItem
);
when
:
signInWhenContext
,
});
MenuRegistry
.
appendMenuItem
(
MenuId
.
CommandPalette
,
{
command
:
{
id
:
signInCommandId
,
title
:
localize
(
'
sign in
'
,
"
Sync: Sign in...
"
)
},
when
:
signInWhenContext
,
});
const
stopSycCommand
=
{
id
:
'
workbench.userData.actions.stopSync
'
,
title
:
localize
(
'
stop sync
'
,
"
Configuration
Sync: Turn Off
"
)
title
:
localize
(
'
stop sync
'
,
"
Sync: Turn Off
"
)
};
CommandsRegistry
.
registerCommand
(
stopSycCommand
.
id
,
()
=>
this
.
turnOff
());
MenuRegistry
.
appendMenuItem
(
MenuId
.
GlobalActivity
,
{
...
...
@@ -258,31 +265,38 @@ export class UserDataSyncWorkbenchContribution extends Disposable implements IWo
when
:
ContextKeyExpr
.
and
(
CONTEXT_SYNC_STATE
.
notEqualsTo
(
SyncStatus
.
Uninitialized
),
ContextKeyExpr
.
has
(
`config.
${
UserDataSyncWorkbenchContribution
.
ENABLEMENT_SETTING
}
`
)),
});
const
resolveConflictsMenuItem
:
IMenuItem
=
{
const
resolveConflictsCommandId
=
'
workbench.userData.actions.resolveConflicts
'
;
const
resolveConflictsWhenContext
=
CONTEXT_SYNC_STATE
.
isEqualTo
(
SyncStatus
.
HasConflicts
);
CommandsRegistry
.
registerCommand
(
resolveConflictsCommandId
,
()
=>
this
.
handleConflicts
());
MenuRegistry
.
appendMenuItem
(
MenuId
.
GlobalActivity
,
{
group
:
'
5_sync
'
,
command
:
{
id
:
'
sync.resolveConflicts
'
,
title
:
localize
(
'
resolveConflicts
'
,
"
Configuration
Sync: Resolve Conflicts (1)
"
),
id
:
resolveConflictsCommandId
,
title
:
localize
(
'
resolveConflicts
_global
'
,
"
Sync: Resolve Conflicts (1)
"
),
},
when
:
CONTEXT_SYNC_STATE
.
isEqualTo
(
SyncStatus
.
HasConflicts
),
};
CommandsRegistry
.
registerCommand
(
resolveConflictsMenuItem
.
command
.
id
,
()
=>
this
.
handleConflicts
());
MenuRegistry
.
appendMenuItem
(
MenuId
.
GlobalActivity
,
resolveConflictsMenuItem
);
MenuRegistry
.
appendMenuItem
(
MenuId
.
CommandPalette
,
resolveConflictsMenuItem
);
when
:
resolveConflictsWhenContext
,
});
MenuRegistry
.
appendMenuItem
(
MenuId
.
CommandPalette
,
{
command
:
{
id
:
resolveConflictsCommandId
,
title
:
localize
(
'
resolveConflicts
'
,
"
Sync: Resolve Conflicts
"
),
},
when
:
resolveConflictsWhenContext
,
});
const
continueSyncCommandId
=
'
workbench.userData.actions.continueSync
'
;
CommandsRegistry
.
registerCommand
(
continueSyncCommandId
,
()
=>
this
.
continueSync
());
MenuRegistry
.
appendMenuItem
(
MenuId
.
CommandPalette
,
{
command
:
{
id
:
continueSyncCommandId
,
title
:
localize
(
'
continue sync
'
,
"
Configuration
Sync: Continue
"
)
title
:
localize
(
'
continue sync
'
,
"
Sync: Continue
"
)
},
when
:
ContextKeyExpr
.
and
(
CONTEXT_SYNC_STATE
.
isEqualTo
(
SyncStatus
.
HasConflicts
)),
});
MenuRegistry
.
appendMenuItem
(
MenuId
.
EditorTitle
,
{
command
:
{
id
:
continueSyncCommandId
,
title
:
localize
(
'
continue sync
'
,
"
Configuration
Sync: Continue
"
),
title
:
localize
(
'
continue sync
'
,
"
Sync: Continue
"
),
iconLocation
:
{
light
:
SYNC_PUSH_LIGHT_ICON_URI
,
dark
:
SYNC_PUSH_DARK_ICON_URI
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录