Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
66cd1d8e
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,发现更多精彩内容 >>
提交
66cd1d8e
编写于
2月 21, 2020
作者:
S
Sandeep Somavarapu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix #90624
上级
86abd4e9
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
17 addition
and
23 deletion
+17
-23
src/vs/platform/userDataSync/common/abstractSynchronizer.ts
src/vs/platform/userDataSync/common/abstractSynchronizer.ts
+15
-3
src/vs/platform/userDataSync/common/extensionsSync.ts
src/vs/platform/userDataSync/common/extensionsSync.ts
+1
-6
src/vs/platform/userDataSync/common/globalStateSync.ts
src/vs/platform/userDataSync/common/globalStateSync.ts
+1
-6
src/vs/platform/userDataSync/common/keybindingsSync.ts
src/vs/platform/userDataSync/common/keybindingsSync.ts
+0
-4
src/vs/platform/userDataSync/common/settingsSync.ts
src/vs/platform/userDataSync/common/settingsSync.ts
+0
-4
未找到文件。
src/vs/platform/userDataSync/common/abstractSynchronizer.ts
浏览文件 @
66cd1d8e
...
...
@@ -91,7 +91,7 @@ export abstract class AbstractSynchroniser extends Disposable {
protected
get
enabled
():
boolean
{
return
this
.
userDataSyncEnablementService
.
isResourceEnabled
(
this
.
resourceKey
);
}
async
sync
(
ref
?:
string
):
Promise
<
void
>
{
async
sync
(
ref
?:
string
,
donotUseLastSyncUserData
?:
boolean
):
Promise
<
void
>
{
if
(
!
this
.
enabled
)
{
this
.
logService
.
info
(
`
${
this
.
source
}
: Skipped synchronizing
${
this
.
source
.
toLowerCase
()}
as it is disabled.`
);
return
;
...
...
@@ -108,7 +108,7 @@ export abstract class AbstractSynchroniser extends Disposable {
this
.
logService
.
trace
(
`
${
this
.
source
}
: Started synchronizing
${
this
.
source
.
toLowerCase
()}
...`
);
this
.
setStatus
(
SyncStatus
.
Syncing
);
const
lastSyncUserData
=
await
this
.
getLastSyncUserData
();
const
lastSyncUserData
=
donotUseLastSyncUserData
?
null
:
await
this
.
getLastSyncUserData
();
const
remoteUserData
=
ref
&&
lastSyncUserData
&&
lastSyncUserData
.
ref
===
ref
?
lastSyncUserData
:
await
this
.
getRemoteUserData
(
lastSyncUserData
);
if
(
remoteUserData
.
syncData
&&
remoteUserData
.
syncData
.
version
>
this
.
version
)
{
...
...
@@ -117,7 +117,19 @@ export abstract class AbstractSynchroniser extends Disposable {
throw
new
UserDataSyncError
(
localize
(
'
incompatible
'
,
"
Cannot sync {0} as its version {1} is not compatible with cloud {2}
"
,
this
.
source
,
this
.
version
,
remoteUserData
.
syncData
.
version
),
UserDataSyncErrorCode
.
Incompatible
,
this
.
source
);
}
return
this
.
doSync
(
remoteUserData
,
lastSyncUserData
);
try
{
await
this
.
doSync
(
remoteUserData
,
lastSyncUserData
);
}
catch
(
e
)
{
if
(
e
instanceof
UserDataSyncError
)
{
switch
(
e
.
code
)
{
case
UserDataSyncErrorCode
.
RemotePreconditionFailed
:
// Rejected as there is a new remote version. Syncing again,
this
.
logService
.
info
(
`
${
this
.
source
}
: Failed to synchronize as there is a new remote version available. Synchronizing again...`
);
return
this
.
sync
(
undefined
,
true
);
}
}
throw
e
;
}
}
async
hasPreviouslySynced
():
Promise
<
boolean
>
{
...
...
src/vs/platform/userDataSync/common/extensionsSync.ts
浏览文件 @
66cd1d8e
...
...
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import
{
UserDataSyncError
,
UserDataSyncErrorCode
,
SyncStatus
,
IUserDataSyncStoreService
,
ISyncExtension
,
IUserDataSyncLogService
,
IUserDataSynchroniser
,
SyncSource
,
ResourceKey
,
IUserDataSyncEnablementService
}
from
'
vs/platform/userDataSync/common/userDataSync
'
;
import
{
SyncStatus
,
IUserDataSyncStoreService
,
ISyncExtension
,
IUserDataSyncLogService
,
IUserDataSynchroniser
,
SyncSource
,
ResourceKey
,
IUserDataSyncEnablementService
}
from
'
vs/platform/userDataSync/common/userDataSync
'
;
import
{
Event
}
from
'
vs/base/common/event
'
;
import
{
IEnvironmentService
}
from
'
vs/platform/environment/common/environment
'
;
import
{
IExtensionManagementService
,
IExtensionGalleryService
,
IGlobalExtensionEnablementService
}
from
'
vs/platform/extensionManagement/common/extensionManagement
'
;
...
...
@@ -154,11 +154,6 @@ export class ExtensionsSynchroniser extends AbstractSynchroniser implements IUse
await
this
.
apply
(
previewResult
);
}
catch
(
e
)
{
this
.
setStatus
(
SyncStatus
.
Idle
);
if
(
e
instanceof
UserDataSyncError
&&
e
.
code
===
UserDataSyncErrorCode
.
RemotePreconditionFailed
)
{
// Rejected as there is a new remote version. Syncing again,
this
.
logService
.
info
(
'
Extensions: Failed to synchronize extensions as there is a new remote version available. Synchronizing again...
'
);
return
this
.
sync
();
}
throw
e
;
}
...
...
src/vs/platform/userDataSync/common/globalStateSync.ts
浏览文件 @
66cd1d8e
...
...
@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import
{
UserDataSyncError
,
UserDataSyncErrorCode
,
SyncStatus
,
IUserDataSyncStoreService
,
IUserDataSyncLogService
,
IGlobalState
,
SyncSource
,
IUserDataSynchroniser
,
ResourceKey
,
IUserDataSyncEnablementService
}
from
'
vs/platform/userDataSync/common/userDataSync
'
;
import
{
SyncStatus
,
IUserDataSyncStoreService
,
IUserDataSyncLogService
,
IGlobalState
,
SyncSource
,
IUserDataSynchroniser
,
ResourceKey
,
IUserDataSyncEnablementService
}
from
'
vs/platform/userDataSync/common/userDataSync
'
;
import
{
VSBuffer
}
from
'
vs/base/common/buffer
'
;
import
{
Event
}
from
'
vs/base/common/event
'
;
import
{
IEnvironmentService
}
from
'
vs/platform/environment/common/environment
'
;
...
...
@@ -131,11 +131,6 @@ export class GlobalStateSynchroniser extends AbstractSynchroniser implements IUs
this
.
logService
.
trace
(
'
UI State: Finished synchronizing ui state.
'
);
}
catch
(
e
)
{
this
.
setStatus
(
SyncStatus
.
Idle
);
if
(
e
instanceof
UserDataSyncError
&&
e
.
code
===
UserDataSyncErrorCode
.
RemotePreconditionFailed
)
{
// Rejected as there is a new remote version. Syncing again,
this
.
logService
.
info
(
'
UI State: Failed to synchronize ui state as there is a new remote version available. Synchronizing again...
'
);
return
this
.
sync
();
}
throw
e
;
}
finally
{
this
.
setStatus
(
SyncStatus
.
Idle
);
...
...
src/vs/platform/userDataSync/common/keybindingsSync.ts
浏览文件 @
66cd1d8e
...
...
@@ -180,10 +180,6 @@ export class KeybindingsSynchroniser extends AbstractJsonFileSynchroniser implem
this
.
setStatus
(
SyncStatus
.
Idle
);
if
(
e
instanceof
UserDataSyncError
)
{
switch
(
e
.
code
)
{
case
UserDataSyncErrorCode
.
RemotePreconditionFailed
:
// Rejected as there is a new remote version. Syncing again,
this
.
logService
.
info
(
'
Keybindings: Failed to synchronize keybindings as there is a new remote version available. Synchronizing again...
'
);
return
this
.
sync
();
case
UserDataSyncErrorCode
.
LocalPreconditionFailed
:
// Rejected as there is a new local version. Syncing again.
this
.
logService
.
info
(
'
Keybindings: Failed to synchronize keybindings as there is a new local version available. Synchronizing again...
'
);
...
...
src/vs/platform/userDataSync/common/settingsSync.ts
浏览文件 @
66cd1d8e
...
...
@@ -243,10 +243,6 @@ export class SettingsSynchroniser extends AbstractJsonFileSynchroniser implement
this
.
setStatus
(
SyncStatus
.
Idle
);
if
(
e
instanceof
UserDataSyncError
)
{
switch
(
e
.
code
)
{
case
UserDataSyncErrorCode
.
RemotePreconditionFailed
:
// Rejected as there is a new remote version. Syncing again,
this
.
logService
.
info
(
'
Settings: Failed to synchronize settings as there is a new remote version available. Synchronizing again...
'
);
return
this
.
sync
();
case
UserDataSyncErrorCode
.
LocalPreconditionFailed
:
// Rejected as there is a new local version. Syncing again.
this
.
logService
.
info
(
'
Settings: Failed to synchronize settings as there is a new local version available. Synchronizing again...
'
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录