Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
bfe5b4c9
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,体验更适合开发者的 AI 搜索 >>
提交
bfe5b4c9
编写于
2月 26, 2019
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
make sure outline requests are cancelled when changing providers, #69147
上级
fbf2f8ac
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
34 addition
and
4 deletion
+34
-4
src/vs/editor/contrib/documentSymbols/outlineModel.ts
src/vs/editor/contrib/documentSymbols/outlineModel.ts
+9
-3
src/vs/editor/contrib/documentSymbols/test/outlineModel.test.ts
.../editor/contrib/documentSymbols/test/outlineModel.test.ts
+25
-1
未找到文件。
src/vs/editor/contrib/documentSymbols/outlineModel.ts
浏览文件 @
bfe5b4c9
...
...
@@ -264,7 +264,11 @@ export class OutlineModel extends TreeElement {
});
}
static
_create
(
textModel
:
ITextModel
,
token
:
CancellationToken
):
Promise
<
OutlineModel
>
{
private
static
_create
(
textModel
:
ITextModel
,
token
:
CancellationToken
):
Promise
<
OutlineModel
>
{
let
chainedToken
=
new
CancellationTokenSource
();
let
listener
=
DocumentSymbolProviderRegistry
.
onDidChange
(()
=>
chainedToken
.
cancel
());
token
.
onCancellationRequested
(()
=>
chainedToken
.
cancel
());
let
result
=
new
OutlineModel
(
textModel
);
let
promises
=
DocumentSymbolProviderRegistry
.
ordered
(
textModel
).
map
((
provider
,
index
)
=>
{
...
...
@@ -272,7 +276,7 @@ export class OutlineModel extends TreeElement {
let
id
=
TreeElement
.
findId
(
`provider_
${
index
}
`
,
result
);
let
group
=
new
OutlineGroup
(
id
,
result
,
provider
,
index
);
return
Promise
.
resolve
(
provider
.
provideDocumentSymbols
(
result
.
textModel
,
token
)).
then
(
result
=>
{
return
Promise
.
resolve
(
provider
.
provideDocumentSymbols
(
result
.
textModel
,
chainedToken
.
token
)).
then
(
result
=>
{
for
(
const
info
of
result
||
[])
{
OutlineModel
.
_makeOutlineElement
(
info
,
group
);
}
...
...
@@ -289,7 +293,9 @@ export class OutlineModel extends TreeElement {
});
});
return
Promise
.
all
(
promises
).
then
(()
=>
result
.
_compact
());
return
Promise
.
all
(
promises
)
.
then
(()
=>
result
.
_compact
())
.
finally
(()
=>
listener
.
dispose
());
}
private
static
_makeOutlineElement
(
info
:
DocumentSymbol
,
container
:
OutlineGroup
|
OutlineElement
):
void
{
...
...
src/vs/editor/contrib/documentSymbols/test/outlineModel.test.ts
浏览文件 @
bfe5b4c9
...
...
@@ -46,7 +46,7 @@ suite('OutlineModel', function () {
let
isCancelled
=
false
;
let
reg
=
DocumentSymbolProviderRegistry
.
register
({
pattern
:
'
**/path.foo
'
},
{
provideDocumentSymbols
(
d
,
token
)
{
provideDocumentSymbols
(
_
d
,
token
)
{
return
new
Promise
(
resolve
=>
{
token
.
onCancellationRequested
(
_
=>
{
isCancelled
=
true
;
...
...
@@ -183,4 +183,28 @@ suite('OutlineModel', function () {
assert
.
equal
(
model
.
children
[
'
g2
'
]
!
.
children
[
'
c2
'
].
children
[
'
c2.2
'
].
marker
!
.
count
,
1
);
});
test
(
'
"Cannot read property
\'
adapter
\'
of undefined" #69147
'
,
async
function
()
{
let
model
=
TextModel
.
createFromString
(
'
foo
'
,
undefined
,
undefined
,
URI
.
file
(
'
/fome/path.foo
'
));
let
reg1
=
DocumentSymbolProviderRegistry
.
register
({
pattern
:
'
**/path.foo
'
},
{
provideDocumentSymbols
(
_model
,
token
)
{
assert
.
equal
(
token
.
isCancellationRequested
,
true
);
return
[];
}
});
let
reg2
=
DocumentSymbolProviderRegistry
.
register
({
pattern
:
'
**/path.foo
'
},
{
provideDocumentSymbols
(
_model
,
token
)
{
assert
.
equal
(
token
.
isCancellationRequested
,
false
);
reg1
.
dispose
();
assert
.
equal
(
token
.
isCancellationRequested
,
true
);
return
[];
}
});
await
OutlineModel
.
create
(
model
,
CancellationToken
.
None
);
reg1
.
dispose
();
reg2
.
dispose
();
});
});
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录