Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
37518cae
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,发现更多精彩内容 >>
提交
37518cae
编写于
6月 13, 2019
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
dispose code lens model(s) only after having resolved the current model, #75105
上级
b8e43cc7
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
19 addition
and
9 deletion
+19
-9
src/vs/editor/contrib/codelens/codelensController.ts
src/vs/editor/contrib/codelens/codelensController.ts
+19
-9
未找到文件。
src/vs/editor/contrib/codelens/codelensController.ts
浏览文件 @
37518cae
...
...
@@ -5,7 +5,7 @@
import
{
CancelablePromise
,
RunOnceScheduler
,
createCancelablePromise
,
disposableTimeout
}
from
'
vs/base/common/async
'
;
import
{
onUnexpectedError
,
onUnexpectedExternalError
}
from
'
vs/base/common/errors
'
;
import
{
toDisposable
,
DisposableStore
,
MutableDisposabl
e
}
from
'
vs/base/common/lifecycle
'
;
import
{
toDisposable
,
DisposableStore
,
dispos
e
}
from
'
vs/base/common/lifecycle
'
;
import
{
StableEditorScrollState
}
from
'
vs/editor/browser/core/editorState
'
;
import
*
as
editorBrowser
from
'
vs/editor/browser/editorBrowser
'
;
import
{
registerEditorContribution
}
from
'
vs/editor/browser/editorExtensions
'
;
...
...
@@ -28,7 +28,8 @@ export class CodeLensContribution implements editorCommon.IEditorContribution {
private
readonly
_localToDispose
=
new
DisposableStore
();
private
_lenses
:
CodeLensWidget
[]
=
[];
private
_currentFindCodeLensSymbolsPromise
:
CancelablePromise
<
CodeLensModel
>
|
undefined
;
private
readonly
_currentCodeLensModel
=
new
MutableDisposable
<
CodeLensModel
>
();
private
_oldCodeLensModels
=
new
DisposableStore
();
private
_currentCodeLensModel
:
CodeLensModel
|
undefined
;
private
_modelChangeCounter
:
number
=
0
;
private
_currentResolveCodeLensSymbolsPromise
:
CancelablePromise
<
any
>
|
undefined
;
private
_detectVisibleLenses
:
RunOnceScheduler
;
...
...
@@ -57,7 +58,8 @@ export class CodeLensContribution implements editorCommon.IEditorContribution {
dispose
():
void
{
this
.
_localDispose
();
this
.
_globalToDispose
.
dispose
();
this
.
_currentCodeLensModel
.
dispose
();
this
.
_oldCodeLensModels
.
dispose
();
dispose
(
this
.
_currentCodeLensModel
);
}
private
_localDispose
():
void
{
...
...
@@ -71,7 +73,8 @@ export class CodeLensContribution implements editorCommon.IEditorContribution {
this
.
_currentResolveCodeLensSymbolsPromise
=
undefined
;
}
this
.
_localToDispose
.
clear
();
this
.
_currentCodeLensModel
.
clear
();
this
.
_oldCodeLensModels
.
clear
();
dispose
(
this
.
_currentCodeLensModel
);
}
getId
():
string
{
...
...
@@ -132,7 +135,10 @@ export class CodeLensContribution implements editorCommon.IEditorContribution {
this
.
_currentFindCodeLensSymbolsPromise
.
then
(
result
=>
{
if
(
counterValue
===
this
.
_modelChangeCounter
)
{
// only the last one wins
this
.
_currentCodeLensModel
.
value
=
result
;
if
(
this
.
_currentCodeLensModel
)
{
this
.
_oldCodeLensModels
.
add
(
this
.
_currentCodeLensModel
);
}
this
.
_currentCodeLensModel
=
result
;
// cache model to reduce flicker
this
.
_codeLensCache
.
put
(
model
,
result
);
...
...
@@ -342,16 +348,20 @@ export class CodeLensContribution implements editorCommon.IEditorContribution {
});
return
Promise
.
all
(
promises
).
then
(()
=>
{
lenses
[
i
].
updateCommands
(
resolvedSymbols
);
if
(
!
token
.
isCancellationRequested
)
{
lenses
[
i
].
updateCommands
(
resolvedSymbols
);
}
});
});
return
Promise
.
all
(
promises
);
});
this
.
_currentResolveCodeLensSymbolsPromise
.
catch
(
err
=>
{
onUnexpectedError
(
err
);
}).
finally
(()
=>
{
this
.
_currentResolveCodeLensSymbolsPromise
.
then
(()
=>
{
this
.
_oldCodeLensModels
.
clear
();
// dispose old models once we have updated the UI with the current model
this
.
_currentResolveCodeLensSymbolsPromise
=
undefined
;
},
err
=>
{
onUnexpectedError
(
err
);
// can also be cancellation!
this
.
_currentResolveCodeLensSymbolsPromise
=
undefined
;
});
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录