Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
708c9f3a
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,发现更多精彩内容 >>
提交
708c9f3a
编写于
3月 29, 2017
作者:
A
Alex Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixes #23513: Toggle Sidebar Visibility and Go to Line display same key mapping in Arabic keyboard
上级
20be55f7
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
63 addition
and
29 deletion
+63
-29
src/vs/workbench/services/keybinding/common/windowsKeyboardMapper.ts
...bench/services/keybinding/common/windowsKeyboardMapper.ts
+23
-29
src/vs/workbench/services/keybinding/test/windowsKeyboardMapper.test.ts
...ch/services/keybinding/test/windowsKeyboardMapper.test.ts
+40
-0
未找到文件。
src/vs/workbench/services/keybinding/common/windowsKeyboardMapper.ts
浏览文件 @
708c9f3a
...
...
@@ -73,10 +73,10 @@ const NATIVE_KEY_CODE_TO_KEY_CODE: { [nativeKeyCode: string]: KeyCode; } = _getN
export
interface
IScanCodeMapping
{
scanCode
:
ScanCode
;
keyCode
:
KeyCode
;
value
:
number
;
withShift
:
number
;
withAltGr
:
number
;
withShiftAltGr
:
number
;
value
:
string
;
withShift
:
string
;
withAltGr
:
string
;
withShiftAltGr
:
string
;
}
export
class
WindowsNativeResolvedKeybinding
extends
ResolvedKeybinding
{
...
...
@@ -259,9 +259,9 @@ export class WindowsNativeResolvedKeybinding extends ResolvedKeybinding {
return
result
;
}
private
static
getProducedCharCode
(
kb
:
ScanCodeBinding
,
mapping
:
IScanCodeMapping
):
number
{
private
static
getProducedCharCode
(
kb
:
ScanCodeBinding
,
mapping
:
IScanCodeMapping
):
string
{
if
(
!
mapping
)
{
return
0
;
return
null
;
}
if
(
kb
.
ctrlKey
&&
kb
.
shiftKey
&&
kb
.
altKey
)
{
return
mapping
.
withShiftAltGr
;
...
...
@@ -276,15 +276,11 @@ export class WindowsNativeResolvedKeybinding extends ResolvedKeybinding {
}
public
static
getProducedChar
(
kb
:
ScanCodeBinding
,
mapping
:
IScanCodeMapping
):
string
{
const
char
Code
=
this
.
getProducedCharCode
(
kb
,
mapping
);
if
(
char
Code
===
0
)
{
const
char
=
this
.
getProducedCharCode
(
kb
,
mapping
);
if
(
char
===
null
||
char
.
length
===
0
)
{
return
'
---
'
;
}
if
(
charCode
>=
CharCode
.
U_Combining_Grave_Accent
&&
charCode
<=
CharCode
.
U_Combining_Latin_Small_Letter_X
)
{
// combining
return
'
U+
'
+
charCode
.
toString
(
16
);
}
return
'
'
+
String
.
fromCharCode
(
charCode
)
+
'
'
;
return
'
'
+
char
+
'
'
;
}
}
...
...
@@ -323,10 +319,10 @@ export class WindowsKeyboardMapper implements IKeyboardMapper {
}
const
rawMapping
=
rawMappings
[
strCode
];
const
value
=
WindowsKeyboardMapper
.
_getCharCode
(
rawMapping
.
value
)
;
const
withShift
=
WindowsKeyboardMapper
.
_getCharCode
(
rawMapping
.
withShift
)
;
const
withAltGr
=
WindowsKeyboardMapper
.
_getCharCode
(
rawMapping
.
withAltGr
)
;
const
withShiftAltGr
=
WindowsKeyboardMapper
.
_getCharCode
(
rawMapping
.
withShiftAltGr
)
;
const
value
=
rawMapping
.
value
;
const
withShift
=
rawMapping
.
withShift
;
const
withAltGr
=
rawMapping
.
withAltGr
;
const
withShiftAltGr
=
rawMapping
.
withShiftAltGr
;
const
keyCode
=
NATIVE_KEY_CODE_TO_KEY_CODE
[
rawMapping
.
vkey
]
||
KeyCode
.
Unknown
;
const
mapping
:
IScanCodeMapping
=
{
...
...
@@ -341,12 +337,17 @@ export class WindowsKeyboardMapper implements IKeyboardMapper {
if
(
keyCode
!==
KeyCode
.
Unknown
)
{
this
.
_keyCodeExists
[
keyCode
]
=
true
;
if
(
value
>=
CharCode
.
a
&&
value
<=
CharCode
.
z
)
{
this
.
_keyCodeToLabel
[
keyCode
]
=
String
.
fromCharCode
(
CharCode
.
A
+
(
value
-
CharCode
.
a
));
}
else
if
(
value
)
{
this
.
_keyCodeToLabel
[
keyCode
]
=
String
.
fromCharCode
(
value
);
}
else
{
if
(
value
.
length
===
0
)
{
this
.
_keyCodeToLabel
[
keyCode
]
=
null
;
}
else
if
(
value
.
length
===
1
)
{
const
charCode
=
value
.
charCodeAt
(
0
);
if
(
charCode
>=
CharCode
.
a
&&
charCode
<=
CharCode
.
z
)
{
this
.
_keyCodeToLabel
[
keyCode
]
=
String
.
fromCharCode
(
CharCode
.
A
+
(
charCode
-
CharCode
.
a
));
}
else
{
this
.
_keyCodeToLabel
[
keyCode
]
=
value
;
}
}
else
{
this
.
_keyCodeToLabel
[
keyCode
]
=
value
;
}
}
this
.
_scanCodeToKeyCode
[
scanCode
]
=
keyCode
;
...
...
@@ -417,13 +418,6 @@ export class WindowsKeyboardMapper implements IKeyboardMapper {
return
str
;
}
private
static
_getCharCode
(
char
:
string
):
number
{
if
(
char
.
length
===
0
)
{
return
0
;
}
return
char
.
charCodeAt
(
0
);
}
public
getUILabelForKeyCode
(
keyCode
:
KeyCode
):
string
{
return
this
.
_getLabelForKeyCode
(
keyCode
);
}
...
...
src/vs/workbench/services/keybinding/test/windowsKeyboardMapper.test.ts
浏览文件 @
708c9f3a
...
...
@@ -509,3 +509,43 @@ suite('keyboardMapper - WINDOWS en_us', () => {
);
});
});
suite
(
'
misc
'
,
()
=>
{
test
(
'
issue #23513: Toggle Sidebar Visibility and Go to Line display same key mapping in Arabic keyboard
'
,
()
=>
{
const
mapper
=
new
WindowsKeyboardMapper
({
'
KeyB
'
:
{
'
vkey
'
:
'
VK_B
'
,
'
value
'
:
'
لا
'
,
'
withShift
'
:
'
لآ
'
,
'
withAltGr
'
:
''
,
'
withShiftAltGr
'
:
''
},
'
KeyG
'
:
{
'
vkey
'
:
'
VK_G
'
,
'
value
'
:
'
ل
'
,
'
withShift
'
:
'
لأ
'
,
'
withAltGr
'
:
''
,
'
withShiftAltGr
'
:
''
}
});
_assertResolveKeybinding
(
mapper
,
KeyMod
.
CtrlCmd
|
KeyCode
.
KEY_B
,
[{
label
:
'
Ctrl+لا
'
,
ariaLabel
:
'
Control+لا
'
,
HTMLLabel
:
[
_simpleHTMLLabel
([
'
Ctrl
'
,
'
لا
'
])],
electronAccelerator
:
'
Ctrl+B
'
,
userSettingsLabel
:
'
ctrl+b
'
,
isWYSIWYG
:
false
,
isChord
:
false
,
hasCtrlModifier
:
true
,
hasShiftModifier
:
false
,
hasAltModifier
:
false
,
hasMetaModifier
:
false
,
dispatchParts
:
[
'
ctrl+B
'
,
null
],
}]
);
});
});
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录