Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
7f3f074d
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,发现更多精彩内容 >>
提交
7f3f074d
编写于
3月 24, 2020
作者:
S
Sandeep Somavarapu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix merging
上级
e149709f
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
9 addition
and
9 deletion
+9
-9
src/vs/platform/userDataSync/common/globalStateMerge.ts
src/vs/platform/userDataSync/common/globalStateMerge.ts
+6
-6
src/vs/platform/userDataSync/common/globalStateSync.ts
src/vs/platform/userDataSync/common/globalStateSync.ts
+3
-3
未找到文件。
src/vs/platform/userDataSync/common/globalStateMerge.ts
浏览文件 @
7f3f074d
...
...
@@ -53,19 +53,19 @@ export function merge(localStorage: IStringDictionary<IStorageValue>, remoteStor
}
}
// Updated in
Remote
for
(
const
key
of
values
(
baseTo
Remote
.
updated
))
{
// Updated in
local
for
(
const
key
of
values
(
baseTo
Local
.
updated
))
{
if
(
!
baseToRemote
.
updated
.
has
(
key
)
||
!
baseToRemote
.
removed
.
has
(
key
))
{
const
remoteValue
=
remote
[
key
];
const
localValue
=
localStorage
[
key
];
if
(
localValue
.
version
>=
remoteValue
.
version
)
{
remote
[
key
]
=
remote
Value
;
remote
[
key
]
=
local
Value
;
}
}
}
// Removed in
remote
for
(
const
key
of
values
(
baseTo
Remote
.
removed
))
{
// Removed in
local
for
(
const
key
of
values
(
baseTo
Local
.
removed
))
{
if
(
!
baseToRemote
.
updated
.
has
(
key
))
{
const
remoteValue
=
remote
[
key
];
const
storageKey
=
storageKeys
.
filter
(
storageKey
=>
storageKey
.
key
===
key
)[
0
];
...
...
@@ -75,7 +75,7 @@ export function merge(localStorage: IStringDictionary<IStorageValue>, remoteStor
}
}
return
{
local
,
remote
:
areSame
(
remote
,
remoteStorage
)
?
null
:
remote
Storage
};
return
{
local
,
remote
:
areSame
(
remote
,
remoteStorage
)
?
null
:
remote
};
}
function
compare
(
from
:
IStringDictionary
<
any
>
,
to
:
IStringDictionary
<
any
>
):
{
added
:
Set
<
string
>
,
removed
:
Set
<
string
>
,
updated
:
Set
<
string
>
}
{
...
...
src/vs/platform/userDataSync/common/globalStateSync.ts
浏览文件 @
7f3f074d
...
...
@@ -163,7 +163,7 @@ export class GlobalStateSynchroniser extends AbstractSynchroniser implements IUs
private
async
getPreview
(
remoteUserData
:
IRemoteUserData
,
lastSyncUserData
:
IRemoteUserData
|
null
):
Promise
<
ISyncPreviewResult
>
{
const
remoteGlobalState
:
IGlobalState
=
remoteUserData
.
syncData
?
JSON
.
parse
(
remoteUserData
.
syncData
.
content
)
:
null
;
const
lastSyncGlobalState
=
lastSyncUserData
&&
lastSyncUserData
.
syncData
?
JSON
.
parse
(
lastSyncUserData
.
syncData
.
content
)
:
null
;
const
lastSyncGlobalState
:
IGlobalState
=
lastSyncUserData
&&
lastSyncUserData
.
syncData
?
JSON
.
parse
(
lastSyncUserData
.
syncData
.
content
)
:
null
;
const
localGloablState
=
await
this
.
getLocalGlobalState
();
...
...
@@ -173,7 +173,7 @@ export class GlobalStateSynchroniser extends AbstractSynchroniser implements IUs
this
.
logService
.
trace
(
`
${
this
.
syncResourceLogLabel
}
: Remote ui state does not exist. Synchronizing ui state for the first time.`
);
}
const
{
local
,
remote
}
=
merge
(
localGloablState
.
storage
,
remoteGlobalState
.
storage
,
lastSyncGlobalState
,
this
.
storageKeysSyncRegistryService
.
storageKeys
);
const
{
local
,
remote
}
=
merge
(
localGloablState
.
storage
,
remoteGlobalState
.
storage
,
lastSyncGlobalState
?
lastSyncGlobalState
.
storage
:
null
,
this
.
storageKeysSyncRegistryService
.
storageKeys
);
return
{
local
,
remote
,
remoteUserData
,
localUserData
:
localGloablState
,
lastSyncUserData
};
}
...
...
@@ -198,7 +198,7 @@ export class GlobalStateSynchroniser extends AbstractSynchroniser implements IUs
if
(
hasRemoteChanged
)
{
// update remote
this
.
logService
.
trace
(
`
${
this
.
syncResourceLogLabel
}
: Updating remote ui state...`
);
const
content
=
JSON
.
stringify
(
remote
);
const
content
=
JSON
.
stringify
(
<
IGlobalState
>
{
storage
:
remote
}
);
remoteUserData
=
await
this
.
updateRemoteUserData
(
content
,
forcePush
?
null
:
remoteUserData
.
ref
);
this
.
logService
.
info
(
`
${
this
.
syncResourceLogLabel
}
: Updated remote ui state`
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录