Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
9e559490
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,发现更多精彩内容 >>
提交
9e559490
编写于
6月 20, 2019
作者:
P
Peng Lyu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
a single keyboard event can be a keymap
上级
65a01566
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
21 addition
and
5 deletion
+21
-5
src/vs/workbench/services/keybinding/browser/keymapService.ts
...vs/workbench/services/keybinding/browser/keymapService.ts
+21
-5
未找到文件。
src/vs/workbench/services/keybinding/browser/keymapService.ts
浏览文件 @
9e559490
...
...
@@ -14,7 +14,6 @@ import { OS, OperatingSystem, isMacintosh, isWindows, isLinux } from 'vs/base/co
import
{
WindowsKeyboardMapper
}
from
'
vs/workbench/services/keybinding/common/windowsKeyboardMapper
'
;
import
{
MacLinuxFallbackKeyboardMapper
}
from
'
vs/workbench/services/keybinding/common/macLinuxFallbackKeyboardMapper
'
;
import
{
IKeyboardEvent
}
from
'
vs/platform/keybinding/common/keybinding
'
;
import
{
KeyCodeUtils
,
KeyCode
}
from
'
vs/base/common/keyCodes
'
;
import
{
IMacLinuxKeyboardMapping
,
MacLinuxKeyboardMapper
}
from
'
vs/workbench/services/keybinding/common/macLinuxKeyboardMapper
'
;
import
{
StandardKeyboardEvent
}
from
'
vs/base/browser/keyboardEvent
'
;
import
{
URI
}
from
'
vs/base/common/uri
'
;
...
...
@@ -194,12 +193,12 @@ export class BrowserKeyboardMapperFactory {
this
.
_updateKeyboardLayoutAsync
(
this
.
_initialized
);
}
private
_updateKeyboardLayoutAsync
(
initialized
:
boolean
)
{
private
_updateKeyboardLayoutAsync
(
initialized
:
boolean
,
keyboardEvent
?:
IKeyboardEvent
)
{
if
(
!
initialized
)
{
return
;
}
this
.
_getBrowserKeyMapping
().
then
(
keyMap
=>
{
this
.
_getBrowserKeyMapping
(
keyboardEvent
).
then
(
keyMap
=>
{
// might be false positive
if
(
this
.
isKeyMappingActive
(
keyMap
))
{
return
;
...
...
@@ -230,7 +229,7 @@ export class BrowserKeyboardMapperFactory {
return
;
}
this
.
_updateKeyboardLayoutAsync
(
true
);
this
.
_updateKeyboardLayoutAsync
(
true
,
keyboardEvent
);
}
public
setKeyboardLayout
(
layoutName
:
string
)
{
...
...
@@ -331,7 +330,7 @@ export class BrowserKeyboardMapperFactory {
return
true
;
}
private
async
_getBrowserKeyMapping
():
Promise
<
IRawMixedKeyboardMapping
|
null
>
{
private
async
_getBrowserKeyMapping
(
keyboardEvent
?:
IKeyboardEvent
):
Promise
<
IRawMixedKeyboardMapping
|
null
>
{
if
((
navigator
as
any
).
keyboard
)
{
try
{
return
(
navigator
as
any
).
keyboard
.
getLayoutMap
().
then
((
e
:
any
)
=>
{
...
...
@@ -356,6 +355,23 @@ export class BrowserKeyboardMapperFactory {
}
catch
{
// getLayoutMap can throw if invoked from a nested browsing context
}
}
else
if
(
keyboardEvent
&&
!
keyboardEvent
.
shiftKey
&&
!
keyboardEvent
.
altKey
&&
!
keyboardEvent
.
metaKey
&&
!
keyboardEvent
.
metaKey
)
{
let
ret
:
IKeyboardMapping
=
{};
const
standardKeyboardEvent
=
keyboardEvent
as
StandardKeyboardEvent
;
ret
[
standardKeyboardEvent
.
browserEvent
.
code
]
=
{
'
value
'
:
standardKeyboardEvent
.
browserEvent
.
key
,
'
withShift
'
:
''
,
'
withAltGr
'
:
''
,
'
withShiftAltGr
'
:
''
};
const
matchedKeyboardLayout
=
this
.
getMatchedKeymapInfo
(
ret
);
if
(
matchedKeyboardLayout
)
{
return
matchedKeyboardLayout
.
mapping
;
}
return
null
;
}
return
null
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录