Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
6c6fcb73
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,发现更多精彩内容 >>
提交
6c6fcb73
编写于
3月 27, 2019
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix #71195
上级
732f6661
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
25 addition
and
12 deletion
+25
-12
src/vs/editor/common/config/commonEditorConfig.ts
src/vs/editor/common/config/commonEditorConfig.ts
+2
-2
src/vs/editor/contrib/goToDefinition/goToDefinitionCommands.ts
...s/editor/contrib/goToDefinition/goToDefinitionCommands.ts
+10
-8
src/vs/editor/contrib/referenceSearch/referencesModel.ts
src/vs/editor/contrib/referenceSearch/referencesModel.ts
+13
-2
未找到文件。
src/vs/editor/common/config/commonEditorConfig.ts
浏览文件 @
6c6fcb73
...
...
@@ -835,8 +835,8 @@ const editorConfiguration: IConfigurationNode = {
default
:
EDITOR_DEFAULTS
.
contribInfo
.
gotoLocation
.
multiple
,
enumDescriptions
:
[
nls
.
localize
(
'
editor.gotoLocation.multiple.peek
'
,
'
Show peek view of the results (default)
'
),
nls
.
localize
(
'
editor.gotoLocation.multiple.gotoAndPeek
'
,
'
Go to the
first
result and show a peek view
'
),
nls
.
localize
(
'
editor.gotoLocation.multiple.goto
'
,
'
Go to the
first
result and ignore others
'
)
nls
.
localize
(
'
editor.gotoLocation.multiple.gotoAndPeek
'
,
'
Go to the
primary
result and show a peek view
'
),
nls
.
localize
(
'
editor.gotoLocation.multiple.goto
'
,
'
Go to the
primary
result and ignore others
'
)
]
},
'
editor.selectionHighlight
'
:
{
...
...
src/vs/editor/contrib/goToDefinition/goToDefinitionCommands.ts
浏览文件 @
6c6fcb73
...
...
@@ -133,15 +133,17 @@ export class DefinitionAction extends EditorAction {
const
{
gotoLocation
}
=
editor
.
getConfiguration
().
contribInfo
;
if
(
this
.
_configuration
.
openInPeek
||
(
gotoLocation
.
multiple
===
'
peek
'
&&
model
.
references
.
length
>
1
))
{
this
.
_openInPeek
(
editorService
,
editor
,
model
);
}
else
if
(
editor
.
hasModel
())
{
const
next
=
model
.
nearestReference
(
editor
.
getModel
().
uri
,
editor
.
getPosition
());
if
(
next
)
{
const
targetEditor
=
await
this
.
_openReference
(
editor
,
editorService
,
next
,
this
.
_configuration
.
openToSide
);
if
(
targetEditor
&&
model
.
references
.
length
>
1
&&
gotoLocation
.
multiple
===
'
gotoAndPeek
'
)
{
this
.
_openInPeek
(
editorService
,
targetEditor
,
model
);
}
else
{
model
.
dispose
();
}
const
next
=
model
.
firstReference
();
if
(
!
next
)
{
return
;
}
const
targetEditor
=
await
this
.
_openReference
(
editor
,
editorService
,
next
,
this
.
_configuration
.
openToSide
);
if
(
targetEditor
&&
model
.
references
.
length
>
1
&&
gotoLocation
.
multiple
===
'
gotoAndPeek
'
)
{
this
.
_openInPeek
(
editorService
,
targetEditor
,
model
);
}
else
{
model
.
dispose
();
}
}
}
...
...
src/vs/editor/contrib/referenceSearch/referencesModel.ts
浏览文件 @
6c6fcb73
...
...
@@ -23,7 +23,8 @@ export class OneReference {
constructor
(
readonly
parent
:
FileReferences
,
private
_range
:
IRange
private
_range
:
IRange
,
readonly
isProviderFirst
:
boolean
)
{
this
.
id
=
defaultGenerator
.
nextId
();
}
...
...
@@ -173,6 +174,7 @@ export class ReferencesModel implements IDisposable {
constructor
(
references
:
LocationLink
[])
{
this
.
_disposables
=
[];
// grouping and sorting
const
[
providersFirst
]
=
references
;
references
.
sort
(
ReferencesModel
.
_compareReferences
);
let
current
:
FileReferences
|
undefined
;
...
...
@@ -187,7 +189,7 @@ export class ReferencesModel implements IDisposable {
if
(
current
.
children
.
length
===
0
||
!
Range
.
equalsRange
(
ref
.
range
,
current
.
children
[
current
.
children
.
length
-
1
].
range
))
{
let
oneRef
=
new
OneReference
(
current
,
ref
.
targetSelectionRange
||
ref
.
range
);
let
oneRef
=
new
OneReference
(
current
,
ref
.
targetSelectionRange
||
ref
.
range
,
providersFirst
===
ref
);
this
.
_disposables
.
push
(
oneRef
.
onRefChanged
((
e
)
=>
this
.
_onDidChangeReferenceRange
.
fire
(
e
)));
this
.
references
.
push
(
oneRef
);
current
.
children
.
push
(
oneRef
);
...
...
@@ -267,6 +269,15 @@ export class ReferencesModel implements IDisposable {
return
undefined
;
}
firstReference
():
OneReference
|
undefined
{
for
(
const
ref
of
this
.
references
)
{
if
(
ref
.
isProviderFirst
)
{
return
ref
;
}
}
return
this
.
references
[
0
];
}
dispose
():
void
{
dispose
(
this
.
groups
);
dispose
(
this
.
_disposables
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录