Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
effcbdd2
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,发现更多精彩内容 >>
提交
effcbdd2
编写于
2月 28, 2018
作者:
A
Alex Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixes Microsoft/monaco-editor#672: Better disposing
上级
017dfed1
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
22 addition
and
3 deletion
+22
-3
src/vs/base/browser/ui/contextview/contextview.ts
src/vs/base/browser/ui/contextview/contextview.ts
+1
-0
src/vs/editor/browser/widget/diffEditorWidget.ts
src/vs/editor/browser/widget/diffEditorWidget.ts
+20
-3
src/vs/editor/contrib/parameterHints/parameterHintsWidget.ts
src/vs/editor/contrib/parameterHints/parameterHintsWidget.ts
+1
-0
未找到文件。
src/vs/base/browser/ui/contextview/contextview.ts
浏览文件 @
effcbdd2
...
...
@@ -128,6 +128,7 @@ export class ContextView {
public
setContainer
(
container
:
HTMLElement
):
void
{
if
(
this
.
$container
)
{
this
.
$container
.
getHTMLElement
().
removeChild
(
this
.
$view
.
getHTMLElement
());
this
.
$container
.
off
(
ContextView
.
BUBBLE_UP_EVENTS
);
this
.
$container
.
off
(
ContextView
.
BUBBLE_DOWN_EVENTS
,
true
);
this
.
$container
=
null
;
...
...
src/vs/editor/browser/widget/diffEditorWidget.ts
浏览文件 @
effcbdd2
...
...
@@ -209,7 +209,7 @@ export class DiffEditorWidget extends Disposable implements editorBrowser.IDiffE
this
.
_editorWorkerService
=
editorWorkerService
;
this
.
_codeEditorService
=
codeEditorService
;
this
.
_contextKeyService
=
contextKeyService
.
createScoped
(
domElement
);
this
.
_contextKeyService
=
this
.
_register
(
contextKeyService
.
createScoped
(
domElement
)
);
this
.
_contextKeyService
.
createKey
(
'
isInDiffEditor
'
,
true
);
this
.
_themeService
=
themeService
;
this
.
_notificationService
=
notificationService
;
...
...
@@ -313,14 +313,14 @@ export class DiffEditorWidget extends Disposable implements editorBrowser.IDiffE
this
.
_setStrategy
(
new
DiffEdtorWidgetInline
(
this
.
_createDataSource
(),
this
.
_enableSplitViewResizing
));
}
this
.
_codeEditorService
.
addDiffEditor
(
this
);
this
.
_register
(
themeService
.
onThemeChange
(
t
=>
{
if
(
this
.
_strategy
&&
this
.
_strategy
.
applyColors
(
t
))
{
this
.
_updateDecorationsRunner
.
schedule
();
}
this
.
_containerDomElement
.
className
=
DiffEditorWidget
.
_getClassName
(
this
.
_themeService
.
getTheme
(),
this
.
_renderSideBySide
);
}));
this
.
_codeEditorService
.
addDiffEditor
(
this
);
}
public
get
ignoreTrimWhitespace
():
boolean
{
...
...
@@ -465,20 +465,37 @@ export class DiffEditorWidget extends Disposable implements editorBrowser.IDiffE
public
dispose
():
void
{
this
.
_codeEditorService
.
removeDiffEditor
(
this
);
if
(
this
.
_beginUpdateDecorationsTimeout
!==
-
1
)
{
window
.
clearTimeout
(
this
.
_beginUpdateDecorationsTimeout
);
this
.
_beginUpdateDecorationsTimeout
=
-
1
;
}
window
.
clearInterval
(
this
.
_measureDomElementToken
);
this
.
_cleanViewZonesAndDecorations
();
this
.
_overviewDomElement
.
removeChild
(
this
.
_originalOverviewRuler
.
getDomNode
());
this
.
_originalOverviewRuler
.
dispose
();
this
.
_overviewDomElement
.
removeChild
(
this
.
_modifiedOverviewRuler
.
getDomNode
());
this
.
_modifiedOverviewRuler
.
dispose
();
this
.
_overviewDomElement
.
removeChild
(
this
.
_overviewViewportDomElement
.
domNode
);
this
.
_containerDomElement
.
removeChild
(
this
.
_overviewDomElement
);
this
.
_containerDomElement
.
removeChild
(
this
.
_originalDomNode
);
this
.
originalEditor
.
dispose
();
this
.
_containerDomElement
.
removeChild
(
this
.
_modifiedDomNode
);
this
.
modifiedEditor
.
dispose
();
this
.
_strategy
.
dispose
();
this
.
_containerDomElement
.
removeChild
(
this
.
_reviewPane
.
domNode
.
domNode
);
this
.
_containerDomElement
.
removeChild
(
this
.
_reviewPane
.
shadow
.
domNode
);
this
.
_containerDomElement
.
removeChild
(
this
.
_reviewPane
.
actionBarContainer
.
domNode
);
this
.
_reviewPane
.
dispose
();
this
.
_domElement
.
removeChild
(
this
.
_containerDomElement
);
this
.
_onDidDispose
.
fire
();
super
.
dispose
();
...
...
src/vs/editor/contrib/parameterHints/parameterHintsWidget.ts
浏览文件 @
effcbdd2
...
...
@@ -498,6 +498,7 @@ export class ParameterHintsWidget implements IContentWidget, IDisposable {
dispose
():
void
{
this
.
disposables
=
dispose
(
this
.
disposables
);
this
.
model
.
dispose
();
this
.
model
=
null
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录