Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
76801c7c
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,发现更多精彩内容 >>
提交
76801c7c
编写于
11月 28, 2019
作者:
S
Sandeep Somavarapu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
improve merge by ignoring negared commands
上级
80ca1300
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
50 addition
and
3 deletion
+50
-3
src/vs/workbench/services/keybinding/common/keybindingsMerge.ts
.../workbench/services/keybinding/common/keybindingsMerge.ts
+7
-3
src/vs/workbench/services/keybinding/test/electron-browser/keybindingsMerge.test.ts
...keybinding/test/electron-browser/keybindingsMerge.test.ts
+43
-0
未找到文件。
src/vs/workbench/services/keybinding/common/keybindingsMerge.ts
浏览文件 @
76801c7c
...
...
@@ -124,7 +124,9 @@ export class KeybindingsMergeService implements IKeybindingsMergeService {
continue
;
}
const
keybindings
=
remoteByCommand
.
get
(
command
)
!
;
if
(
keybindings
.
some
(({
normalized
})
=>
keybindingsMergeResult
.
conflicts
.
has
(
normalized
.
key
)))
{
// Ignore negated commands
if
(
keybindings
.
some
(({
normalized
})
=>
normalized
.
command
!==
`-
${
command
}
`
&&
keybindingsMergeResult
.
conflicts
.
has
(
normalized
.
key
)))
{
commandsMergeResult
.
conflicts
.
add
(
command
);
continue
;
}
mergeContent
=
this
.
addKeybindings
(
mergeContent
,
eol
,
keybindings
.
map
(({
keybinding
})
=>
keybinding
));
...
...
@@ -136,13 +138,15 @@ export class KeybindingsMergeService implements IKeybindingsMergeService {
continue
;
}
const
keybindings
=
remoteByCommand
.
get
(
command
)
!
;
if
(
keybindings
.
some
(({
normalized
})
=>
keybindingsMergeResult
.
conflicts
.
has
(
normalized
.
key
)))
{
// Ignore negated commands
if
(
keybindings
.
some
(({
normalized
})
=>
normalized
.
command
!==
`-
${
command
}
`
&&
keybindingsMergeResult
.
conflicts
.
has
(
normalized
.
key
)))
{
commandsMergeResult
.
conflicts
.
add
(
command
);
continue
;
}
mergeContent
=
this
.
updateKeybindings
(
mergeContent
,
eol
,
command
,
keybindings
.
map
(({
keybinding
})
=>
keybinding
));
}
const
hasConflicts
=
commandsMergeResult
.
conflicts
.
size
>
0
||
keybindingsMergeResult
.
conflicts
.
size
>
0
;
const
hasConflicts
=
commandsMergeResult
.
conflicts
.
size
>
0
;
if
(
hasConflicts
)
{
mergeContent
=
`<<<<<<< local
${
eol
}
`
+
mergeContent
...
...
src/vs/workbench/services/keybinding/test/electron-browser/keybindingsMerge.test.ts
浏览文件 @
76801c7c
...
...
@@ -408,6 +408,49 @@ suite('KeybindingsMerge - No Conflicts', () => {
assert
.
equal
(
actual
.
mergeContent
,
expected
);
});
test
(
'
merge when local and remote has moved forwareded with conflicts
'
,
async
()
=>
{
const
baseContent
=
stringify
([
{
key
:
'
alt+d
'
,
command
:
'
a
'
,
when
:
'
editorTextFocus && !editorReadonly
'
},
{
key
:
'
ctrl+c
'
,
command
:
'
-a
'
},
{
key
:
'
cmd+e
'
,
command
:
'
d
'
},
{
key
:
'
alt+a
'
,
command
:
'
f
'
},
{
key
:
'
alt+d
'
,
command
:
'
-f
'
},
{
key
:
'
cmd+d
'
,
command
:
'
c
'
,
when
:
'
context1
'
},
{
key
:
'
cmd+c
'
,
command
:
'
-c
'
},
]);
const
localContent
=
stringify
([
{
key
:
'
alt+d
'
,
command
:
'
-f
'
},
{
key
:
'
cmd+e
'
,
command
:
'
d
'
},
{
key
:
'
cmd+c
'
,
command
:
'
-c
'
},
{
key
:
'
cmd+d
'
,
command
:
'
c
'
,
when
:
'
context1
'
},
{
key
:
'
alt+a
'
,
command
:
'
f
'
},
{
key
:
'
alt+e
'
,
command
:
'
e
'
},
]);
const
remoteContent
=
stringify
([
{
key
:
'
alt+a
'
,
command
:
'
f
'
},
{
key
:
'
cmd+c
'
,
command
:
'
-c
'
},
{
key
:
'
cmd+d
'
,
command
:
'
d
'
},
{
key
:
'
alt+d
'
,
command
:
'
-f
'
},
{
key
:
'
alt+c
'
,
command
:
'
c
'
,
when
:
'
context1
'
},
{
key
:
'
alt+g
'
,
command
:
'
g
'
,
when
:
'
context2
'
},
]);
const
expected
=
stringify
([
{
key
:
'
alt+d
'
,
command
:
'
-f
'
},
{
key
:
'
cmd+d
'
,
command
:
'
d
'
},
{
key
:
'
cmd+c
'
,
command
:
'
-c
'
},
{
key
:
'
alt+c
'
,
command
:
'
c
'
,
when
:
'
context1
'
},
{
key
:
'
alt+a
'
,
command
:
'
f
'
},
{
key
:
'
alt+e
'
,
command
:
'
e
'
},
{
key
:
'
alt+g
'
,
command
:
'
g
'
,
when
:
'
context2
'
},
]);
//'[\n\t{\n\t\t"key": "alt+d",\n\t\t"command": "-f"\n\t},\n\t{\n\t\t"key": "cmd+d",\n\t\t"command": "d"\n\t},\n\t{\n\t\t"key": "cmd+c",\n\t\t"command": "-c"\n\t},\n\t{\n\t\t"key": "cmd+d",\n\t\t"command": "c",\n\t\t"when": "context1"\n\t},\n\t{\n\t\t"key": "alt+a",\n\t\t"command": "f"\n\t},\n\t{\n\t\t"key": "alt+e",\n\t\t"command": "e"\n\t},\n\t{\n\t\t"key": "alt+g",\n\t\t"command": "g",\n\t\t"when": "context2"\n\t}\n]'
//'[\n\t{\n\t\t"key": "alt+d",\n\t\t"command": "-f"\n\t},\n\t{\n\t\t"key": "cmd+d",\n\t\t"command": "d"\n\t},\n\t{\n\t\t"key": "cmd+c",\n\t\t"command": "-c"\n\t},\n\t{\n\t\t"key": "alt+c",\n\t\t"command": "c",\n\t\t"when": "context1"\n\t},\n\t{\n\t\t"key": "alt+a",\n\t\t"command": "f"\n\t},\n\t{\n\t\t"key": "alt+e",\n\t\t"command": "e"\n\t},\n\t{\n\t\t"key": "alt+g",\n\t\t"command": "g",\n\t\t"when": "context2"\n\t}\n]'
const
actual
=
await
testObject
.
merge
(
localContent
,
remoteContent
,
baseContent
);
assert
.
ok
(
actual
.
hasChanges
);
assert
.
ok
(
!
actual
.
hasConflicts
);
assert
.
equal
(
actual
.
mergeContent
,
expected
);
});
});
suite
(
'
KeybindingsMerge - Conflicts
'
,
()
=>
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录