Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
03711748
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,发现更多精彩内容 >>
提交
03711748
编写于
5月 14, 2020
作者:
R
rebornix
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
💄
上级
2d367a50
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
6 addition
and
27 deletion
+6
-27
src/vs/workbench/contrib/notebook/browser/notebookEditor.ts
src/vs/workbench/contrib/notebook/browser/notebookEditor.ts
+6
-5
src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts
...orkbench/contrib/notebook/browser/notebookEditorWidget.ts
+0
-22
未找到文件。
src/vs/workbench/contrib/notebook/browser/notebookEditor.ts
浏览文件 @
03711748
...
...
@@ -124,7 +124,6 @@ export class NotebookEditor extends BaseEditor {
// set a new input, let's hide previous input
this
.
saveEditorViewState
(
this
.
input
as
NotebookEditorInput
);
this
.
_widget
?.
onWillHide
();
this
.
_widget
?.
onBeforeDetached
();
}
}
...
...
@@ -134,7 +133,6 @@ export class NotebookEditor extends BaseEditor {
Event
.
once
(
input
.
onDispose
)(()
=>
{
// make sure the editor widget is removed from the view
const
existingEditorWidgetForInput
=
NotebookRegistry
.
getNotebookEditorWidget
(
this
.
input
as
NotebookEditorInput
);
// this.saveEditorViewState(this.input as NotebookEditorInput);
existingEditorWidgetForInput
?.
getDomNode
().
remove
();
existingEditorWidgetForInput
?.
dispose
();
NotebookRegistry
.
releaseNotebookEditorWidget
(
this
.
input
as
NotebookEditorInput
);
...
...
@@ -145,10 +143,15 @@ export class NotebookEditor extends BaseEditor {
const
viewState
=
this
.
loadTextEditorViewState
(
input
);
const
existingEditorWidgetForInput
=
NotebookRegistry
.
getNotebookEditorWidget
(
input
);
if
(
existingEditorWidgetForInput
)
{
// hide current widget
this
.
_widget
?.
onWillHide
();
this
.
_widget
?.
onBeforeDetached
();
// previous widget is then detached
// set the new one
this
.
_widget
=
existingEditorWidgetForInput
;
}
else
{
// hide current widget
this
.
_widget
?.
onWillHide
();
// create a new widget
this
.
_widget
=
this
.
instantiationService
.
createInstance
(
NotebookEditorWidget
);
this
.
_widget
.
createEditor
();
NotebookRegistry
.
claimNotebookEditorWidget
(
input
,
this
.
_widget
);
...
...
@@ -158,13 +161,11 @@ export class NotebookEditor extends BaseEditor {
this
.
_widget
.
layout
(
this
.
dimension
,
this
.
_rootElement
);
}
this
.
_widget
.
onBeforeAttached
();
this
.
_widget
.
setModel
(
model
.
notebook
,
viewState
,
options
);
}
clearInput
():
void
{
this
.
_widget
?.
onWillHide
();
this
.
_widget
?.
onBeforeDetached
();
this
.
_widget
=
undefined
;
super
.
clearInput
();
}
...
...
src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts
浏览文件 @
03711748
...
...
@@ -92,9 +92,6 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
protected
readonly
_contributions
:
{
[
key
:
string
]:
INotebookEditorContribution
;
};
private
scrollBeyondLastLine
:
boolean
;
private
readonly
memento
:
Memento
;
private
_attachedEditorCount
:
number
;
private
readonly
_onDidChangeAttached
:
Emitter
<
void
>
=
this
.
_register
(
new
Emitter
<
void
>
());
public
readonly
onDidChangeAttached
:
Event
<
void
>
=
this
.
_onDidChangeAttached
.
event
;
constructor
(
...
...
@@ -108,7 +105,6 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
super
();
this
.
memento
=
new
Memento
(
NotebookEditorWidget
.
ID
,
storageService
);
this
.
_attachedEditorCount
=
0
;
this
.
outputRenderer
=
new
OutputRenderer
(
this
,
this
.
instantiationService
);
this
.
_contributions
=
{};
this
.
scrollBeyondLastLine
=
this
.
configurationService
.
getValue
<
boolean
>
(
'
editor.scrollBeyondLastLine
'
);
...
...
@@ -123,24 +119,6 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
});
}
public
onBeforeAttached
():
void
{
this
.
_attachedEditorCount
++
;
if
(
this
.
_attachedEditorCount
===
1
)
{
this
.
_onDidChangeAttached
.
fire
(
undefined
);
}
}
public
onBeforeDetached
():
void
{
this
.
_attachedEditorCount
--
;
if
(
this
.
_attachedEditorCount
===
0
)
{
this
.
_onDidChangeAttached
.
fire
(
undefined
);
}
}
public
isAttachedToEditor
():
boolean
{
return
this
.
_attachedEditorCount
>
0
;
}
private
readonly
_onDidChangeModel
=
new
Emitter
<
void
>
();
readonly
onDidChangeModel
:
Event
<
void
>
=
this
.
_onDidChangeModel
.
event
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录