Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
974b4502
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,发现更多精彩内容 >>
提交
974b4502
编写于
8月 06, 2020
作者:
S
Sandeep Somavarapu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix #98675
上级
f5e60cb0
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
34 addition
and
6 deletion
+34
-6
src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts
.../workbench/contrib/preferences/browser/settingsEditor2.ts
+1
-1
src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.ts
...ices/userDataSync/browser/userDataSyncWorkbenchService.ts
+33
-5
未找到文件。
src/vs/workbench/contrib/preferences/browser/settingsEditor2.ts
浏览文件 @
974b4502
...
...
@@ -1465,7 +1465,7 @@ class SyncControls extends Disposable {
return
;
}
if
(
this
.
userDataAutoSyncService
.
isEnabled
())
{
if
(
this
.
userDataAutoSyncService
.
isEnabled
()
||
this
.
userDataSyncService
.
status
!==
SyncStatus
.
Idle
)
{
DOM
.
show
(
this
.
lastSyncedLabel
);
DOM
.
hide
(
this
.
turnOnSyncButton
.
element
);
}
else
{
...
...
src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.ts
浏览文件 @
974b4502
...
...
@@ -17,7 +17,6 @@ import { IQuickInputService, IQuickPickSeparator } from 'vs/platform/quickinput/
import
{
IStorageService
,
IWorkspaceStorageChangeEvent
,
StorageScope
}
from
'
vs/platform/storage/common/storage
'
;
import
{
ILogService
}
from
'
vs/platform/log/common/log
'
;
import
{
IProductService
}
from
'
vs/platform/product/common/productService
'
;
import
{
IConfigurationService
}
from
'
vs/platform/configuration/common/configuration
'
;
import
{
IExtensionService
}
from
'
vs/workbench/services/extensions/common/extensions
'
;
import
{
IWorkbenchEnvironmentService
}
from
'
vs/workbench/services/environment/common/environmentService
'
;
import
{
localize
}
from
'
vs/nls
'
;
...
...
@@ -32,6 +31,7 @@ import { URI } from 'vs/base/common/uri';
import
{
IViewsService
,
ViewContainerLocation
,
IViewDescriptorService
}
from
'
vs/workbench/common/views
'
;
import
{
isNative
}
from
'
vs/base/common/platform
'
;
import
{
IHostService
}
from
'
vs/workbench/services/host/browser/host
'
;
import
{
ILifecycleService
}
from
'
vs/platform/lifecycle/common/lifecycle
'
;
type
UserAccountClassification
=
{
id
:
{
classification
:
'
EndUserPseudonymizedInformation
'
,
purpose
:
'
BusinessInsight
'
};
...
...
@@ -100,7 +100,6 @@ export class UserDataSyncWorkbenchService extends Disposable implements IUserDat
@
ITelemetryService
private
readonly
telemetryService
:
ITelemetryService
,
@
ILogService
private
readonly
logService
:
ILogService
,
@
IProductService
private
readonly
productService
:
IProductService
,
@
IConfigurationService
configurationService
:
IConfigurationService
,
@
IExtensionService
private
readonly
extensionService
:
IExtensionService
,
@
IWorkbenchEnvironmentService
private
readonly
environmentService
:
IWorkbenchEnvironmentService
,
@
INotificationService
private
readonly
notificationService
:
INotificationService
,
...
...
@@ -111,6 +110,7 @@ export class UserDataSyncWorkbenchService extends Disposable implements IUserDat
@
IViewDescriptorService
private
readonly
viewDescriptorService
:
IViewDescriptorService
,
@
IUserDataSyncStoreManagementService
private
readonly
userDataSyncStoreManagementService
:
IUserDataSyncStoreManagementService
,
@
IHostService
private
readonly
hostService
:
IHostService
,
@
ILifecycleService
private
readonly
lifecycleService
:
ILifecycleService
,
)
{
super
();
this
.
_authenticationProviders
=
this
.
userDataSyncStoreManagementService
.
userDataSyncStore
?.
authenticationProviders
||
[];
...
...
@@ -239,6 +239,13 @@ export class UserDataSyncWorkbenchService extends Disposable implements IUserDat
}
async
turnOn
():
Promise
<
void
>
{
if
(
this
.
userDataAutoSyncService
.
isEnabled
())
{
return
;
}
if
(
this
.
userDataSyncService
.
status
!==
SyncStatus
.
Idle
)
{
throw
new
Error
(
'
Cannont turn on sync while syncing
'
);
}
const
picked
=
await
this
.
pick
();
if
(
!
picked
)
{
throw
canceled
();
...
...
@@ -251,7 +258,15 @@ export class UserDataSyncWorkbenchService extends Disposable implements IUserDat
const
syncTitle
=
SYNC_TITLE
;
const
title
=
`
${
syncTitle
}
[(
${
localize
(
'
details
'
,
"
details
"
)}
)](command:
${
SHOW_SYNC_LOG_COMMAND_ID
}
)`
;
await
this
.
syncBeforeTurningOn
(
title
);
const
manualSyncTask
=
await
this
.
userDataSyncService
.
createManualSyncTask
();
const
disposable
=
this
.
lifecycleService
.
onBeforeShutdown
(
e
=>
e
.
veto
(
this
.
onBeforeShutdown
(
manualSyncTask
)));
try
{
await
this
.
syncBeforeTurningOn
(
title
,
manualSyncTask
);
}
finally
{
disposable
.
dispose
();
}
await
this
.
userDataAutoSyncService
.
turnOn
();
this
.
notificationService
.
info
(
localize
(
'
sync turned on
'
,
"
{0} is turned on
"
,
title
));
}
...
...
@@ -260,12 +275,25 @@ export class UserDataSyncWorkbenchService extends Disposable implements IUserDat
return
this
.
userDataAutoSyncService
.
turnOff
(
everywhere
);
}
private
async
syncBeforeTurningOn
(
title
:
string
):
Promise
<
void
>
{
private
async
onBeforeShutdown
(
manualSyncTask
:
IManualSyncTask
):
Promise
<
boolean
>
{
const
result
=
await
this
.
dialogService
.
confirm
({
type
:
'
warning
'
,
message
:
localize
(
'
sync in progress
'
,
"
Settings Sync is being turned on. Would you like to cancel it?
"
),
title
:
localize
(
'
settings sync
'
,
"
Settings Sync
"
),
primaryButton
:
localize
(
'
yes
'
,
"
Yes
"
),
secondaryButton
:
localize
(
'
no
'
,
"
No
"
),
});
if
(
result
.
confirmed
)
{
await
manualSyncTask
.
stop
();
}
return
!
result
.
confirmed
;
}
private
async
syncBeforeTurningOn
(
title
:
string
,
manualSyncTask
:
IManualSyncTask
):
Promise
<
void
>
{
/* Make sure sync started on clean local state */
await
this
.
userDataSyncService
.
resetLocal
();
const
manualSyncTask
=
await
this
.
userDataSyncService
.
createManualSyncTask
();
try
{
let
action
:
FirstTimeSyncAction
=
'
manual
'
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录