Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
b232ee55
V
vscode
项目概览
掘金者说
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
b232ee55
编写于
11月 24, 2015
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Goto definition acts too early in some cases (fixes #189)
上级
a34c71df
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
16 addition
and
6 deletion
+16
-6
src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.ts
...editor/contrib/goToDeclaration/browser/goToDeclaration.ts
+16
-6
未找到文件。
src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.ts
浏览文件 @
b232ee55
...
...
@@ -239,7 +239,8 @@ class GotoDefinitionWithMouseEditorContribution implements EditorCommon.IEditorC
private
decorations
:
string
[];
private
currentWordUnderMouse
:
EditorCommon
.
IWordAtPosition
;
private
throttler
:
Async
.
Throttler
;
private
lastMouseEvent
:
EditorBrowser
.
IMouseEvent
;
private
lastMouseMoveEvent
:
EditorBrowser
.
IMouseEvent
;
private
hasTriggerKeyOnMouseDown
:
boolean
;
constructor
(
editor
:
EditorBrowser
.
ICodeEditor
,
@
IRequestService
requestService
:
IRequestService
,
@
IMessageService
messageService
:
IMessageService
,
@
IEditorService
editorService
:
IEditorService
)
{
this
.
editorService
=
editorService
;
...
...
@@ -252,6 +253,7 @@ class GotoDefinitionWithMouseEditorContribution implements EditorCommon.IEditorC
this
.
editor
=
editor
;
this
.
throttler
=
new
Async
.
Throttler
();
this
.
toUnhook
.
push
(
this
.
editor
.
addListener
(
EditorCommon
.
EventType
.
MouseDown
,
(
e
:
EditorBrowser
.
IMouseEvent
)
=>
this
.
onEditorMouseDown
(
e
)));
this
.
toUnhook
.
push
(
this
.
editor
.
addListener
(
EditorCommon
.
EventType
.
MouseUp
,
(
e
:
EditorBrowser
.
IMouseEvent
)
=>
this
.
onEditorMouseUp
(
e
)));
this
.
toUnhook
.
push
(
this
.
editor
.
addListener
(
EditorCommon
.
EventType
.
MouseMove
,
(
e
:
EditorBrowser
.
IMouseEvent
)
=>
this
.
onEditorMouseMove
(
e
)));
this
.
toUnhook
.
push
(
this
.
editor
.
addListener
(
EditorCommon
.
EventType
.
KeyDown
,
(
e
:
Keyboard
.
StandardKeyboardEvent
)
=>
this
.
onEditorKeyDown
(
e
)));
...
...
@@ -263,7 +265,7 @@ class GotoDefinitionWithMouseEditorContribution implements EditorCommon.IEditorC
}
private
onEditorMouseMove
(
mouseEvent
:
EditorBrowser
.
IMouseEvent
,
withKey
?:
Keyboard
.
StandardKeyboardEvent
):
void
{
this
.
lastMouseEvent
=
mouseEvent
;
this
.
lastMouse
Move
Event
=
mouseEvent
;
this
.
startFindDefinition
(
mouseEvent
,
withKey
);
}
...
...
@@ -410,20 +412,28 @@ class GotoDefinitionWithMouseEditorContribution implements EditorCommon.IEditorC
}
private
onEditorKeyDown
(
e
:
Keyboard
.
StandardKeyboardEvent
):
void
{
if
(
e
.
keyCode
===
GotoDefinitionWithMouseEditorContribution
.
TRIGGER_KEY_VALUE
&&
this
.
lastMouseEvent
)
{
this
.
startFindDefinition
(
this
.
lastMouseEvent
,
e
);
if
(
e
.
keyCode
===
GotoDefinitionWithMouseEditorContribution
.
TRIGGER_KEY_VALUE
&&
this
.
lastMouse
Move
Event
)
{
this
.
startFindDefinition
(
this
.
lastMouse
Move
Event
,
e
);
}
else
if
(
e
[
GotoDefinitionWithMouseEditorContribution
.
TRIGGER_MODIFIER
])
{
this
.
removeDecorations
();
// remove decorations if user holds another key with ctrl/cmd to prevent accident goto declaration
}
}
private
resetHandler
():
void
{
this
.
lastMouseEvent
=
null
;
this
.
lastMouse
Move
Event
=
null
;
this
.
removeDecorations
();
}
private
onEditorMouseDown
(
mouseEvent
:
EditorBrowser
.
IMouseEvent
):
void
{
// We need to record if we had the trigger key on mouse down because someone might select something in the editor
// holding the mouse down and then while mouse is down start to press Ctrl/Cmd to start a copy operation and then
// release the mouse button without wanting to do the navigation.
// With this flag we prevent goto definition if the mouse was down before the trigger key was pressed.
this
.
hasTriggerKeyOnMouseDown
=
!!
mouseEvent
.
event
[
GotoDefinitionWithMouseEditorContribution
.
TRIGGER_MODIFIER
];
}
private
onEditorMouseUp
(
mouseEvent
:
EditorBrowser
.
IMouseEvent
):
void
{
if
(
this
.
isEnabled
(
mouseEvent
))
{
if
(
this
.
isEnabled
(
mouseEvent
)
&&
this
.
hasTriggerKeyOnMouseDown
)
{
this
.
gotoDefinition
(
mouseEvent
.
target
,
mouseEvent
.
event
.
altKey
).
done
(()
=>
{
this
.
removeDecorations
();
},
(
error
:
Error
)
=>
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录