Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
2dd76931
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,发现更多精彩内容 >>
提交
2dd76931
编写于
1月 03, 2019
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
make sure to await showing of results, #65809
上级
08510a5b
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
11 addition
and
12 deletion
+11
-12
src/vs/editor/contrib/goToDefinition/goToDefinitionCommands.ts
...s/editor/contrib/goToDefinition/goToDefinitionCommands.ts
+11
-12
未找到文件。
src/vs/editor/contrib/goToDefinition/goToDefinitionCommands.ts
浏览文件 @
2dd76931
...
...
@@ -59,7 +59,7 @@ export class DefinitionAction extends EditorAction {
const
model
=
editor
.
getModel
();
const
pos
=
editor
.
getPosition
();
const
definitionPromise
=
this
.
_getTargetLocationForPosition
(
model
,
pos
,
CancellationToken
.
None
).
then
(
references
=>
{
const
definitionPromise
=
this
.
_getTargetLocationForPosition
(
model
,
pos
,
CancellationToken
.
None
).
then
(
async
references
=>
{
if
(
model
.
isDisposed
()
||
editor
.
getModel
()
!==
model
)
{
// new model, no more model
...
...
@@ -98,11 +98,11 @@ export class DefinitionAction extends EditorAction {
}
else
if
(
result
.
length
===
1
&&
idxOfCurrent
!==
-
1
)
{
// only the position at which we are -> adjust selection
let
[
current
]
=
result
;
this
.
_openReference
(
editor
,
editorService
,
current
,
false
);
return
this
.
_openReference
(
editor
,
editorService
,
current
,
false
).
then
(()
=>
undefined
);
}
else
{
// handle multile results
this
.
_onResult
(
editorService
,
editor
,
new
ReferencesModel
(
result
));
return
this
.
_onResult
(
editorService
,
editor
,
new
ReferencesModel
(
result
));
}
},
(
err
)
=>
{
...
...
@@ -128,7 +128,7 @@ export class DefinitionAction extends EditorAction {
return
model
.
references
.
length
>
1
&&
nls
.
localize
(
'
meta.title
'
,
"
– {0} definitions
"
,
model
.
references
.
length
);
}
private
_onResult
(
editorService
:
ICodeEditorService
,
editor
:
ICodeEditor
,
model
:
ReferencesModel
)
{
private
async
_onResult
(
editorService
:
ICodeEditorService
,
editor
:
ICodeEditor
,
model
:
ReferencesModel
):
Promise
<
void
>
{
const
msg
=
model
.
getAriaMessage
();
alert
(
msg
);
...
...
@@ -136,14 +136,13 @@ export class DefinitionAction extends EditorAction {
if
(
this
.
_configuration
.
openInPeek
)
{
this
.
_openInPeek
(
editorService
,
editor
,
model
);
}
else
{
let
next
=
model
.
nearestReference
(
editor
.
getModel
().
uri
,
editor
.
getPosition
());
this
.
_openReference
(
editor
,
editorService
,
next
,
this
.
_configuration
.
openToSide
).
then
(
editor
=>
{
if
(
editor
&&
model
.
references
.
length
>
1
)
{
this
.
_openInPeek
(
editorService
,
editor
,
model
);
}
else
{
model
.
dispose
();
}
});
const
next
=
model
.
nearestReference
(
editor
.
getModel
().
uri
,
editor
.
getPosition
());
const
targetEditor
=
await
this
.
_openReference
(
editor
,
editorService
,
next
,
this
.
_configuration
.
openToSide
);
if
(
targetEditor
&&
model
.
references
.
length
>
1
)
{
this
.
_openInPeek
(
editorService
,
targetEditor
,
model
);
}
else
{
model
.
dispose
();
}
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录