Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
93b38d72
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,发现更多精彩内容 >>
提交
93b38d72
编写于
4月 29, 2020
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
cache and re-use editor input object, #96402
上级
0d9a8737
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
23 addition
and
3 deletion
+23
-3
src/vs/workbench/contrib/notebook/browser/notebook.contribution.ts
...rkbench/contrib/notebook/browser/notebook.contribution.ts
+3
-3
src/vs/workbench/contrib/notebook/browser/notebookEditorInput.ts
...workbench/contrib/notebook/browser/notebookEditorInput.ts
+20
-0
未找到文件。
src/vs/workbench/contrib/notebook/browser/notebook.contribution.ts
浏览文件 @
93b38d72
...
...
@@ -87,7 +87,7 @@ Registry.as<IEditorInputFactoryRegistry>(EditorInputExtensions.EditorInputFactor
if
(
!
data
||
!
URI
.
isUri
(
resource
)
||
typeof
name
!==
'
string
'
||
typeof
viewType
!==
'
string
'
)
{
return
undefined
;
}
return
instantiationService
.
createInstance
(
NotebookEditorInput
,
resource
,
name
,
viewType
);
return
NotebookEditorInput
.
getOrCreate
(
instantiationService
,
resource
,
name
,
viewType
);
}
}
);
...
...
@@ -190,7 +190,7 @@ export class NotebookContribution implements IWorkbenchContribution {
const
info
=
id
===
undefined
?
infos
[
0
]
:
(
infos
.
find
(
info
=>
info
.
id
===
id
)
||
infos
[
0
]);
// cell-uri -> open (container) notebook
const
name
=
basename
(
data
.
notebook
);
const
input
=
this
.
instantiationService
.
createInstance
(
NotebookEditorInput
,
data
.
notebook
,
name
,
info
.
id
);
const
input
=
NotebookEditorInput
.
getOrCreate
(
this
.
instantiationService
,
data
.
notebook
,
name
,
info
.
id
);
this
.
_resourceMapping
.
set
(
resource
,
input
);
return
{
override
:
this
.
editorService
.
openEditor
(
input
,
new
NotebookEditorOptions
({
...
options
,
forceReload
:
true
,
cellOptions
:
{
resource
,
options
}
}),
group
)
};
}
...
...
@@ -203,7 +203,7 @@ export class NotebookContribution implements IWorkbenchContribution {
return
undefined
;
}
const
input
=
this
.
instantiationService
.
createInstance
(
NotebookEditorInput
,
resource
,
originalInput
.
getName
(),
info
.
id
);
const
input
=
NotebookEditorInput
.
getOrCreate
(
this
.
instantiationService
,
resource
,
originalInput
.
getName
(),
info
.
id
);
this
.
_resourceMapping
.
set
(
resource
,
input
);
return
{
override
:
this
.
editorService
.
openEditor
(
input
,
options
,
group
)
};
...
...
src/vs/workbench/contrib/notebook/browser/notebookEditorInput.ts
浏览文件 @
93b38d72
...
...
@@ -12,6 +12,7 @@ import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/no
import
{
NotebookCellTextModel
}
from
'
vs/workbench/contrib/notebook/common/model/notebookCellTextModel
'
;
import
{
isEqual
}
from
'
vs/base/common/resources
'
;
import
{
IWorkingCopyService
,
IWorkingCopy
,
WorkingCopyCapabilities
,
IWorkingCopyBackup
}
from
'
vs/workbench/services/workingCopy/common/workingCopyService
'
;
import
{
IInstantiationService
}
from
'
vs/platform/instantiation/common/instantiation
'
;
export
class
NotebookEditorModel
extends
EditorModel
{
private
_dirty
=
false
;
...
...
@@ -91,6 +92,25 @@ export class NotebookEditorModel extends EditorModel {
}
export
class
NotebookEditorInput
extends
EditorInput
{
private
static
readonly
_instances
=
new
Map
<
string
,
NotebookEditorInput
>
();
static
getOrCreate
(
instantiationService
:
IInstantiationService
,
resource
:
URI
,
name
:
string
,
viewType
:
string
|
undefined
)
{
const
key
=
name
+
viewType
;
let
input
=
NotebookEditorInput
.
_instances
.
get
(
key
);
if
(
!
input
)
{
input
=
instantiationService
.
createInstance
(
class
extends
NotebookEditorInput
{
dispose
()
{
NotebookEditorInput
.
_instances
.
delete
(
key
);
super
.
dispose
();
}
},
resource
,
name
,
viewType
);
NotebookEditorInput
.
_instances
.
set
(
key
,
input
);
}
return
input
;
}
static
readonly
ID
:
string
=
'
workbench.input.notebook
'
;
private
promise
:
Promise
<
NotebookEditorModel
>
|
null
=
null
;
private
textModel
:
NotebookEditorModel
|
null
=
null
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录