Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
670e4300
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,发现更多精彩内容 >>
提交
670e4300
编写于
7月 14, 2020
作者:
S
Sandeep Somavarapu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#100346 improve managing sync views.
- enable only manual sync view and not all
上级
c338a515
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
17 addition
and
16 deletion
+17
-16
src/vs/workbench/contrib/userDataSync/browser/userDataSyncViews.ts
...rkbench/contrib/userDataSync/browser/userDataSyncViews.ts
+4
-4
src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.ts
...ices/userDataSync/browser/userDataSyncWorkbenchService.ts
+11
-10
src/vs/workbench/services/userDataSync/common/userDataSync.ts
...vs/workbench/services/userDataSync/common/userDataSync.ts
+2
-2
未找到文件。
src/vs/workbench/contrib/userDataSync/browser/userDataSyncViews.ts
浏览文件 @
670e4300
...
...
@@ -30,7 +30,7 @@ import { IStorageService } from 'vs/platform/storage/common/storage';
import
{
IWorkspaceContextService
}
from
'
vs/platform/workspace/common/workspace
'
;
import
{
IExtensionService
}
from
'
vs/workbench/services/extensions/common/extensions
'
;
import
{
IAction
,
Action
}
from
'
vs/base/common/actions
'
;
import
{
IUserDataSyncWorkbenchService
,
CONTEXT_SYNC_STATE
,
getSyncAreaLabel
,
CONTEXT_ACCOUNT_STATE
,
AccountStatus
,
CONTEXT_ENABLE_
VIEWS
,
SHOW_SYNC_LOG_COMMAND_ID
,
CONFIGURE_SYNC_COMMAND_ID
,
CONTEXT_SHOW
_MANUAL_SYNC_VIEW
,
IUserDataSyncPreview
,
IUserDataSyncResourceGroup
}
from
'
vs/workbench/services/userDataSync/common/userDataSync
'
;
import
{
IUserDataSyncWorkbenchService
,
CONTEXT_SYNC_STATE
,
getSyncAreaLabel
,
CONTEXT_ACCOUNT_STATE
,
AccountStatus
,
CONTEXT_ENABLE_
ACTIVITY_VIEWS
,
SHOW_SYNC_LOG_COMMAND_ID
,
CONFIGURE_SYNC_COMMAND_ID
,
CONTEXT_ENABLE
_MANUAL_SYNC_VIEW
,
IUserDataSyncPreview
,
IUserDataSyncResourceGroup
}
from
'
vs/workbench/services/userDataSync/common/userDataSync
'
;
import
{
IUserDataSyncMachinesService
,
IUserDataSyncMachine
}
from
'
vs/platform/userDataSync/common/userDataSyncMachines
'
;
import
{
IQuickInputService
}
from
'
vs/platform/quickinput/common/quickInput
'
;
import
{
INotificationService
,
Severity
}
from
'
vs/platform/notification/common/notification
'
;
...
...
@@ -109,7 +109,7 @@ export class UserDataSyncDataViews extends Disposable {
id
,
name
,
ctorDescriptor
:
new
SyncDescriptor
(
TreeViewPane
),
when
:
C
ontextKeyExpr
.
and
(
CONTEXT_ENABLE_VIEWS
,
CONTEXT_SHOW_MANUAL_SYNC_VIEW
)
,
when
:
C
ONTEXT_ENABLE_MANUAL_SYNC_VIEW
,
canToggleVisibility
:
false
,
canMoveView
:
false
,
treeView
,
...
...
@@ -355,7 +355,7 @@ export class UserDataSyncDataViews extends Disposable {
id
,
name
,
ctorDescriptor
:
new
SyncDescriptor
(
TreeViewPane
),
when
:
ContextKeyExpr
.
and
(
CONTEXT_SYNC_STATE
.
notEqualsTo
(
SyncStatus
.
Uninitialized
),
CONTEXT_ACCOUNT_STATE
.
isEqualTo
(
AccountStatus
.
Available
),
CONTEXT_ENABLE_VIEWS
),
when
:
ContextKeyExpr
.
and
(
CONTEXT_SYNC_STATE
.
notEqualsTo
(
SyncStatus
.
Uninitialized
),
CONTEXT_ACCOUNT_STATE
.
isEqualTo
(
AccountStatus
.
Available
),
CONTEXT_ENABLE_
ACTIVITY_
VIEWS
),
canToggleVisibility
:
true
,
canMoveView
:
false
,
treeView
,
...
...
@@ -423,7 +423,7 @@ export class UserDataSyncDataViews extends Disposable {
id
,
name
,
ctorDescriptor
:
new
SyncDescriptor
(
TreeViewPane
),
when
:
ContextKeyExpr
.
and
(
CONTEXT_SYNC_STATE
.
notEqualsTo
(
SyncStatus
.
Uninitialized
),
CONTEXT_ACCOUNT_STATE
.
isEqualTo
(
AccountStatus
.
Available
),
CONTEXT_ENABLE_VIEWS
),
when
:
ContextKeyExpr
.
and
(
CONTEXT_SYNC_STATE
.
notEqualsTo
(
SyncStatus
.
Uninitialized
),
CONTEXT_ACCOUNT_STATE
.
isEqualTo
(
AccountStatus
.
Available
),
CONTEXT_ENABLE_
ACTIVITY_
VIEWS
),
canToggleVisibility
:
true
,
canMoveView
:
false
,
treeView
,
...
...
src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.ts
浏览文件 @
670e4300
...
...
@@ -6,7 +6,7 @@
import
{
IUserDataSyncService
,
IAuthenticationProvider
,
getUserDataSyncStore
,
isAuthenticationProvider
,
IUserDataAutoSyncService
,
SyncResource
,
IResourcePreview
,
ISyncResourcePreview
,
Change
,
IManualSyncTask
}
from
'
vs/platform/userDataSync/common/userDataSync
'
;
import
{
ITelemetryService
}
from
'
vs/platform/telemetry/common/telemetry
'
;
import
{
registerSingleton
}
from
'
vs/platform/instantiation/common/extensions
'
;
import
{
IUserDataSyncWorkbenchService
,
IUserDataSyncAccount
,
AccountStatus
,
CONTEXT_SYNC_ENABLEMENT
,
CONTEXT_SYNC_STATE
,
CONTEXT_ACCOUNT_STATE
,
SHOW_SYNC_LOG_COMMAND_ID
,
getSyncAreaLabel
,
IUserDataSyncPreview
,
IUserDataSyncResourceGroup
,
CONTEXT_
SHOW_MANUAL_SYNC_VIEW
,
MANUAL_SYNC_VIEW_ID
,
CONTEXT_ENABLE
_VIEWS
,
SYNC_VIEW_CONTAINER_ID
}
from
'
vs/workbench/services/userDataSync/common/userDataSync
'
;
import
{
IUserDataSyncWorkbenchService
,
IUserDataSyncAccount
,
AccountStatus
,
CONTEXT_SYNC_ENABLEMENT
,
CONTEXT_SYNC_STATE
,
CONTEXT_ACCOUNT_STATE
,
SHOW_SYNC_LOG_COMMAND_ID
,
getSyncAreaLabel
,
IUserDataSyncPreview
,
IUserDataSyncResourceGroup
,
CONTEXT_
ENABLE_MANUAL_SYNC_VIEW
,
MANUAL_SYNC_VIEW_ID
,
CONTEXT_ENABLE_ACTIVITY
_VIEWS
,
SYNC_VIEW_CONTAINER_ID
}
from
'
vs/workbench/services/userDataSync/common/userDataSync
'
;
import
{
AuthenticationSession
,
AuthenticationSessionsChangeEvent
}
from
'
vs/editor/common/modes
'
;
import
{
Disposable
,
DisposableStore
}
from
'
vs/base/common/lifecycle
'
;
import
{
Emitter
,
Event
}
from
'
vs/base/common/event
'
;
...
...
@@ -80,8 +80,8 @@ export class UserDataSyncWorkbenchService extends Disposable implements IUserDat
private
readonly
syncEnablementContext
:
IContextKey
<
boolean
>
;
private
readonly
syncStatusContext
:
IContextKey
<
string
>
;
private
readonly
accountStatusContext
:
IContextKey
<
string
>
;
private
readonly
showManualSyncView
Context
:
IContextKey
<
boolean
>
;
private
readonly
v
iewsEnablementContext
:
IContextKey
<
boolean
>
;
private
readonly
manualSyncViewEnablement
Context
:
IContextKey
<
boolean
>
;
private
readonly
activityV
iewsEnablementContext
:
IContextKey
<
boolean
>
;
readonly
userDataSyncPreview
:
UserDataSyncPreview
=
this
.
_register
(
new
UserDataSyncPreview
(
this
.
userDataSyncService
));
...
...
@@ -111,8 +111,8 @@ export class UserDataSyncWorkbenchService extends Disposable implements IUserDat
this
.
syncEnablementContext
=
CONTEXT_SYNC_ENABLEMENT
.
bindTo
(
contextKeyService
);
this
.
syncStatusContext
=
CONTEXT_SYNC_STATE
.
bindTo
(
contextKeyService
);
this
.
accountStatusContext
=
CONTEXT_ACCOUNT_STATE
.
bindTo
(
contextKeyService
);
this
.
viewsEnablementContext
=
CONTEXT_ENABLE
_VIEWS
.
bindTo
(
contextKeyService
);
this
.
showManualSyncViewContext
=
CONTEXT_SHOW
_MANUAL_SYNC_VIEW
.
bindTo
(
contextKeyService
);
this
.
activityViewsEnablementContext
=
CONTEXT_ENABLE_ACTIVITY
_VIEWS
.
bindTo
(
contextKeyService
);
this
.
manualSyncViewEnablementContext
=
CONTEXT_ENABLE
_MANUAL_SYNC_VIEW
.
bindTo
(
contextKeyService
);
decorationsService
.
registerDecorationsProvider
(
this
.
userDataSyncPreview
);
...
...
@@ -337,8 +337,8 @@ export class UserDataSyncWorkbenchService extends Disposable implements IUserDat
const
visibleViewContainer
=
this
.
viewsService
.
getVisibleViewContainer
(
ViewContainerLocation
.
Sidebar
);
this
.
userDataSyncPreview
.
setManualSyncPreview
(
task
,
preview
);
this
.
showManualSyncView
Context
.
set
(
true
);
await
this
.
enabl
eSyncViews
();
this
.
manualSyncViewEnablement
Context
.
set
(
true
);
await
this
.
waitForActiv
eSyncViews
();
await
this
.
viewsService
.
openView
(
MANUAL_SYNC_VIEW_ID
);
await
Event
.
toPromise
(
Event
.
filter
(
this
.
userDataSyncPreview
.
onDidChangeChanges
,
e
=>
e
.
length
===
0
));
...
...
@@ -349,6 +349,7 @@ export class UserDataSyncWorkbenchService extends Disposable implements IUserDat
/* Merge to sync globalState changes */
await
task
.
merge
();
this
.
manualSyncViewEnablementContext
.
set
(
false
);
if
(
visibleViewContainer
)
{
this
.
viewsService
.
openViewContainer
(
visibleViewContainer
.
id
);
}
else
{
...
...
@@ -370,12 +371,12 @@ export class UserDataSyncWorkbenchService extends Disposable implements IUserDat
}
async
showSyncActivity
():
Promise
<
void
>
{
await
this
.
enableSyncViews
();
this
.
activityViewsEnablementContext
.
set
(
true
);
await
this
.
waitForActiveSyncViews
();
await
this
.
viewsService
.
openViewContainer
(
SYNC_VIEW_CONTAINER_ID
);
}
private
async
enableSyncViews
():
Promise
<
void
>
{
this
.
viewsEnablementContext
.
set
(
true
);
private
async
waitForActiveSyncViews
():
Promise
<
void
>
{
const
viewContainer
=
this
.
viewDescriptorService
.
getViewContainerById
(
SYNC_VIEW_CONTAINER_ID
);
if
(
viewContainer
)
{
const
model
=
this
.
viewDescriptorService
.
getViewContainerModel
(
viewContainer
);
...
...
src/vs/workbench/services/userDataSync/common/userDataSync.ts
浏览文件 @
670e4300
...
...
@@ -79,8 +79,8 @@ export const enum AccountStatus {
export
const
CONTEXT_SYNC_STATE
=
new
RawContextKey
<
string
>
(
'
syncStatus
'
,
SyncStatus
.
Uninitialized
);
export
const
CONTEXT_SYNC_ENABLEMENT
=
new
RawContextKey
<
boolean
>
(
'
syncEnabled
'
,
false
);
export
const
CONTEXT_ACCOUNT_STATE
=
new
RawContextKey
<
string
>
(
'
userDataSyncAccountStatus
'
,
AccountStatus
.
Uninitialized
);
export
const
CONTEXT_ENABLE_
VIEWS
=
new
RawContextKey
<
boolean
>
(
`showUserDataSync
Views`
,
false
);
export
const
CONTEXT_
SHOW_MANUAL_SYNC_VIEW
=
new
RawContextKey
<
boolean
>
(
`show
ManualSyncView`
,
false
);
export
const
CONTEXT_ENABLE_
ACTIVITY_VIEWS
=
new
RawContextKey
<
boolean
>
(
`enableSyncActivity
Views`
,
false
);
export
const
CONTEXT_
ENABLE_MANUAL_SYNC_VIEW
=
new
RawContextKey
<
boolean
>
(
`enable
ManualSyncView`
,
false
);
// Commands
export
const
CONFIGURE_SYNC_COMMAND_ID
=
'
workbench.userDataSync.actions.configure
'
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录