Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
f030ce94
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,发现更多精彩内容 >>
提交
f030ce94
编写于
9月 24, 2019
作者:
S
Sandeep Somavarapu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Use values util in map
上级
0719e0ae
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
14 addition
and
20 deletion
+14
-20
src/vs/base/common/types.ts
src/vs/base/common/types.ts
+0
-6
src/vs/platform/userDataSync/common/extensionsSync.ts
src/vs/platform/userDataSync/common/extensionsSync.ts
+6
-7
src/vs/workbench/services/userDataSync/common/settingsMergeService.ts
...ench/services/userDataSync/common/settingsMergeService.ts
+8
-7
未找到文件。
src/vs/base/common/types.ts
浏览文件 @
f030ce94
...
...
@@ -207,9 +207,3 @@ export function withNullAsUndefined<T>(x: T | null): T | undefined {
export
function
withUndefinedAsNull
<
T
>
(
x
:
T
|
undefined
):
T
|
null
{
return
typeof
x
===
'
undefined
'
?
null
:
x
;
}
export
function
getSetValues
<
T
>
(
set
:
Set
<
T
>
):
T
[]
{
const
result
:
T
[]
=
[];
set
.
forEach
((
value
)
=>
result
.
push
(
value
));
return
result
;
}
src/vs/platform/userDataSync/common/extensionsSync.ts
浏览文件 @
f030ce94
...
...
@@ -19,7 +19,6 @@ import { startsWith } from 'vs/base/common/strings';
import
{
IFileService
}
from
'
vs/platform/files/common/files
'
;
import
{
Queue
}
from
'
vs/base/common/async
'
;
import
{
IConfigurationService
}
from
'
vs/platform/configuration/common/configuration
'
;
import
{
getSetValues
as
getValuesOfSet
}
from
'
vs/base/common/types
'
;
export
interface
ISyncPreviewResult
{
readonly
added
:
ISyncExtension
[];
...
...
@@ -196,7 +195,7 @@ export class ExtensionsSynchroniser extends Disposable implements ISynchroniser
};
// Remotely removed extension.
for
(
const
key
of
getValuesOfSet
(
baseToRemote
.
removed
))
{
for
(
const
key
of
values
(
baseToRemote
.
removed
))
{
const
e
=
localExtensionsMap
.
get
(
key
);
if
(
e
)
{
removed
.
push
(
e
.
identifier
);
...
...
@@ -204,7 +203,7 @@ export class ExtensionsSynchroniser extends Disposable implements ISynchroniser
}
// Remotely added extension
for
(
const
key
of
getValuesOfSet
(
baseToRemote
.
added
))
{
for
(
const
key
of
values
(
baseToRemote
.
added
))
{
// Got added in local
if
(
baseToLocal
.
added
.
has
(
key
))
{
// Is different from local to remote
...
...
@@ -218,7 +217,7 @@ export class ExtensionsSynchroniser extends Disposable implements ISynchroniser
}
// Remotely updated extensions
for
(
const
key
of
getValuesOfSet
(
baseToRemote
.
updated
))
{
for
(
const
key
of
values
(
baseToRemote
.
updated
))
{
// If updated in local
if
(
baseToLocal
.
updated
.
has
(
key
))
{
// Is different from local to remote
...
...
@@ -230,7 +229,7 @@ export class ExtensionsSynchroniser extends Disposable implements ISynchroniser
}
// Locally added extensions
for
(
const
key
of
getValuesOfSet
(
baseToLocal
.
added
))
{
for
(
const
key
of
values
(
baseToLocal
.
added
))
{
// Not there in remote
if
(
!
baseToRemote
.
added
.
has
(
key
))
{
newRemoteExtensionsMap
.
set
(
key
,
massageSyncExtension
(
localExtensionsMap
.
get
(
key
)
!
,
key
));
...
...
@@ -238,7 +237,7 @@ export class ExtensionsSynchroniser extends Disposable implements ISynchroniser
}
// Locally updated extensions
for
(
const
key
of
getValuesOfSet
(
baseToLocal
.
updated
))
{
for
(
const
key
of
values
(
baseToLocal
.
updated
))
{
// If removed in remote
if
(
baseToRemote
.
removed
.
has
(
key
))
{
continue
;
...
...
@@ -251,7 +250,7 @@ export class ExtensionsSynchroniser extends Disposable implements ISynchroniser
}
// Locally removed extensions
for
(
const
key
of
getValuesOfSet
(
baseToLocal
.
removed
))
{
for
(
const
key
of
values
(
baseToLocal
.
removed
))
{
// If not updated in remote
if
(
!
baseToRemote
.
updated
.
has
(
key
))
{
newRemoteExtensionsMap
.
delete
(
key
);
...
...
src/vs/workbench/services/userDataSync/common/settingsMergeService.ts
浏览文件 @
f030ce94
...
...
@@ -15,6 +15,7 @@ import { IModelService } from 'vs/editor/common/services/modelService';
import
{
Position
}
from
'
vs/editor/common/core/position
'
;
import
{
registerSingleton
}
from
'
vs/platform/instantiation/common/extensions
'
;
import
{
ISettingsMergeService
}
from
'
vs/platform/userDataSync/common/userDataSync
'
;
import
{
values
}
from
'
vs/base/common/map
'
;
class
SettingsMergeService
implements
ISettingsMergeService
{
...
...
@@ -42,7 +43,7 @@ class SettingsMergeService implements ISettingsMergeService {
const
settingsPreviewModel
=
this
.
modelService
.
createModel
(
localContent
,
this
.
modeService
.
create
(
'
jsonc
'
));
// Removed settings in Local
for
(
const
key
of
baseToLocal
.
removed
.
keys
(
))
{
for
(
const
key
of
values
(
baseToLocal
.
removed
))
{
// Got updated in remote
if
(
baseToRemote
.
updated
.
has
(
key
))
{
conflicts
.
add
(
key
);
...
...
@@ -50,7 +51,7 @@ class SettingsMergeService implements ISettingsMergeService {
}
// Removed settings in Remote
for
(
const
key
of
baseToRemote
.
removed
.
keys
(
))
{
for
(
const
key
of
values
(
baseToRemote
.
removed
))
{
if
(
conflicts
.
has
(
key
))
{
continue
;
}
...
...
@@ -63,7 +64,7 @@ class SettingsMergeService implements ISettingsMergeService {
}
// Added settings in Local
for
(
const
key
of
baseToLocal
.
added
.
keys
(
))
{
for
(
const
key
of
values
(
baseToLocal
.
added
))
{
if
(
conflicts
.
has
(
key
))
{
continue
;
}
...
...
@@ -77,7 +78,7 @@ class SettingsMergeService implements ISettingsMergeService {
}
// Added settings in remote
for
(
const
key
of
baseToRemote
.
added
.
keys
(
))
{
for
(
const
key
of
values
(
baseToRemote
.
added
))
{
if
(
conflicts
.
has
(
key
))
{
continue
;
}
...
...
@@ -93,7 +94,7 @@ class SettingsMergeService implements ISettingsMergeService {
}
// Updated settings in Local
for
(
const
key
of
baseToLocal
.
updated
.
keys
(
))
{
for
(
const
key
of
values
(
baseToLocal
.
updated
))
{
if
(
conflicts
.
has
(
key
))
{
continue
;
}
...
...
@@ -107,7 +108,7 @@ class SettingsMergeService implements ISettingsMergeService {
}
// Updated settings in Remote
for
(
const
key
of
baseToRemote
.
updated
.
keys
(
))
{
for
(
const
key
of
values
(
baseToRemote
.
updated
))
{
if
(
conflicts
.
has
(
key
))
{
continue
;
}
...
...
@@ -122,7 +123,7 @@ class SettingsMergeService implements ISettingsMergeService {
}
}
for
(
const
key
of
conflicts
.
keys
(
))
{
for
(
const
key
of
values
(
conflicts
))
{
const
tree
=
parseTree
(
settingsPreviewModel
.
getValue
());
const
valueNode
=
findNodeAtLocation
(
tree
,
[
key
]);
const
eol
=
settingsPreviewModel
.
getEOL
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录