Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
af452a4f
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,发现更多精彩内容 >>
未验证
提交
af452a4f
编写于
4月 16, 2020
作者:
M
Miguel Solorio
提交者:
GitHub
4月 16, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' into misolori/fold-icon-themeable
上级
8bfcffb8
f31af7f9
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
19 addition
and
10 deletion
+19
-10
src/vs/editor/contrib/quickAccess/gotoSymbolQuickAccess.ts
src/vs/editor/contrib/quickAccess/gotoSymbolQuickAccess.ts
+19
-10
未找到文件。
src/vs/editor/contrib/quickAccess/gotoSymbolQuickAccess.ts
浏览文件 @
af452a4f
...
@@ -42,10 +42,7 @@ export abstract class AbstractGotoSymbolQuickAccessProvider extends AbstractEdit
...
@@ -42,10 +42,7 @@ export abstract class AbstractGotoSymbolQuickAccessProvider extends AbstractEdit
}
}
protected
provideWithoutTextEditor
(
picker
:
IQuickPick
<
IGotoSymbolQuickPickItem
>
):
IDisposable
{
protected
provideWithoutTextEditor
(
picker
:
IQuickPick
<
IGotoSymbolQuickPickItem
>
):
IDisposable
{
const
label
=
localize
(
'
cannotRunGotoSymbolWithoutEditor
'
,
"
To go to a symbol, first open a text editor with symbol information.
"
);
this
.
provideLabelPick
(
picker
,
localize
(
'
cannotRunGotoSymbolWithoutEditor
'
,
"
To go to a symbol, first open a text editor with symbol information.
"
));
picker
.
items
=
[{
label
,
index
:
0
,
kind
:
SymbolKind
.
String
}];
picker
.
ariaLabel
=
label
;
return
Disposable
.
None
;
return
Disposable
.
None
;
}
}
...
@@ -71,9 +68,7 @@ export abstract class AbstractGotoSymbolQuickAccessProvider extends AbstractEdit
...
@@ -71,9 +68,7 @@ export abstract class AbstractGotoSymbolQuickAccessProvider extends AbstractEdit
const
disposables
=
new
DisposableStore
();
const
disposables
=
new
DisposableStore
();
// Generic pick for not having any symbol information
// Generic pick for not having any symbol information
const
label
=
localize
(
'
cannotRunGotoSymbolWithoutSymbolProvider
'
,
"
The active text editor does not provide symbol information.
"
);
this
.
provideLabelPick
(
picker
,
localize
(
'
cannotRunGotoSymbolWithoutSymbolProvider
'
,
"
The active text editor does not provide symbol information.
"
));
picker
.
items
=
[{
label
,
index
:
0
,
kind
:
SymbolKind
.
String
}];
picker
.
ariaLabel
=
label
;
// Wait for changes to the registry and see if eventually
// Wait for changes to the registry and see if eventually
// we do get symbols. This can happen if the picker is opened
// we do get symbols. This can happen if the picker is opened
...
@@ -92,6 +87,11 @@ export abstract class AbstractGotoSymbolQuickAccessProvider extends AbstractEdit
...
@@ -92,6 +87,11 @@ export abstract class AbstractGotoSymbolQuickAccessProvider extends AbstractEdit
return
disposables
;
return
disposables
;
}
}
private
provideLabelPick
(
picker
:
IQuickPick
<
IGotoSymbolQuickPickItem
>
,
label
:
string
):
void
{
picker
.
items
=
[{
label
,
index
:
0
,
kind
:
SymbolKind
.
String
}];
picker
.
ariaLabel
=
label
;
}
protected
async
waitForLanguageSymbolRegistry
(
model
:
ITextModel
,
disposables
:
DisposableStore
):
Promise
<
boolean
>
{
protected
async
waitForLanguageSymbolRegistry
(
model
:
ITextModel
,
disposables
:
DisposableStore
):
Promise
<
boolean
>
{
if
(
DocumentSymbolProviderRegistry
.
has
(
model
))
{
if
(
DocumentSymbolProviderRegistry
.
has
(
model
))
{
return
true
;
return
true
;
...
@@ -157,12 +157,21 @@ export abstract class AbstractGotoSymbolQuickAccessProvider extends AbstractEdit
...
@@ -157,12 +157,21 @@ export abstract class AbstractGotoSymbolQuickAccessProvider extends AbstractEdit
// Collect symbol picks
// Collect symbol picks
picker
.
busy
=
true
;
picker
.
busy
=
true
;
try
{
try
{
const
items
=
await
this
.
doGetSymbolPicks
(
symbolsPromise
,
prepareQuery
(
picker
.
value
.
substr
(
AbstractGotoSymbolQuickAccessProvider
.
PREFIX
.
length
).
trim
()),
undefined
,
picksCts
.
token
);
const
query
=
prepareQuery
(
picker
.
value
.
substr
(
AbstractGotoSymbolQuickAccessProvider
.
PREFIX
.
length
).
trim
());
const
items
=
await
this
.
doGetSymbolPicks
(
symbolsPromise
,
query
,
undefined
,
picksCts
.
token
);
if
(
token
.
isCancellationRequested
)
{
if
(
token
.
isCancellationRequested
)
{
return
;
return
;
}
}
picker
.
items
=
items
;
if
(
items
.
length
>
0
)
{
picker
.
items
=
items
;
}
else
{
if
(
query
.
original
.
length
>
0
)
{
this
.
provideLabelPick
(
picker
,
localize
(
'
noMatchingSymbolResults
'
,
"
No matching editor symbols
"
));
}
else
{
this
.
provideLabelPick
(
picker
,
localize
(
'
noSymbolResults
'
,
"
No editor symbols
"
));
}
}
}
finally
{
}
finally
{
if
(
!
token
.
isCancellationRequested
)
{
if
(
!
token
.
isCancellationRequested
)
{
picker
.
busy
=
false
;
picker
.
busy
=
false
;
...
@@ -359,7 +368,7 @@ export abstract class AbstractGotoSymbolQuickAccessProvider extends AbstractEdit
...
@@ -359,7 +368,7 @@ export abstract class AbstractGotoSymbolQuickAccessProvider extends AbstractEdit
// Update last separator with number of symbols we found for kind
// Update last separator with number of symbols we found for kind
updateLastSeparatorLabel
();
updateLastSeparatorLabel
();
}
else
{
}
else
if
(
sortedFilteredSymbolPicks
.
length
>
0
)
{
symbolPicks
=
[
symbolPicks
=
[
{
label
:
localize
(
'
symbols
'
,
"
symbols ({0})
"
,
filteredSymbolPicks
.
length
),
type
:
'
separator
'
},
{
label
:
localize
(
'
symbols
'
,
"
symbols ({0})
"
,
filteredSymbolPicks
.
length
),
type
:
'
separator
'
},
...
sortedFilteredSymbolPicks
...
sortedFilteredSymbolPicks
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录