Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
254e716f
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,发现更多精彩内容 >>
提交
254e716f
编写于
5月 14, 2020
作者:
R
rebornix
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
EditorInput/NotebookTextModel is N/1 mapping.
上级
03711748
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
8 addition
and
21 deletion
+8
-21
src/vs/workbench/contrib/notebook/browser/notebook.contribution.ts
...rkbench/contrib/notebook/browser/notebook.contribution.ts
+5
-3
src/vs/workbench/contrib/notebook/browser/notebookEditorInput.ts
...workbench/contrib/notebook/browser/notebookEditorInput.ts
+3
-18
未找到文件。
src/vs/workbench/contrib/notebook/browser/notebook.contribution.ts
浏览文件 @
254e716f
...
@@ -94,7 +94,9 @@ Registry.as<IEditorInputFactoryRegistry>(EditorInputExtensions.EditorInputFactor
...
@@ -94,7 +94,9 @@ Registry.as<IEditorInputFactoryRegistry>(EditorInputExtensions.EditorInputFactor
return
undefined
;
return
undefined
;
}
}
const
input
=
NotebookEditorInput
.
getOrCreate
(
instantiationService
,
resource
,
name
,
viewType
);
// if we have two editors open with the same resource (in different editor groups), we should then create two different
// editor inputs, instead of `getOrCreate`.
const
input
=
NotebookEditorInput
.
create
(
instantiationService
,
resource
,
name
,
viewType
);
if
(
typeof
data
.
group
===
'
number
'
)
{
if
(
typeof
data
.
group
===
'
number
'
)
{
input
.
updateGroup
(
data
.
group
);
input
.
updateGroup
(
data
.
group
);
}
}
...
@@ -245,7 +247,7 @@ export class NotebookContribution extends Disposable implements IWorkbenchContri
...
@@ -245,7 +247,7 @@ export class NotebookContribution extends Disposable implements IWorkbenchContri
const
name
=
basename
(
data
.
notebook
);
const
name
=
basename
(
data
.
notebook
);
let
input
=
this
.
_resourceMapping
.
get
(
data
.
notebook
);
let
input
=
this
.
_resourceMapping
.
get
(
data
.
notebook
);
if
(
!
input
||
input
.
isDisposed
())
{
if
(
!
input
||
input
.
isDisposed
())
{
input
=
NotebookEditorInput
.
getOrC
reate
(
this
.
instantiationService
,
data
.
notebook
,
name
,
info
.
id
);
input
=
NotebookEditorInput
.
c
reate
(
this
.
instantiationService
,
data
.
notebook
,
name
,
info
.
id
);
this
.
_resourceMapping
.
set
(
data
.
notebook
,
input
);
this
.
_resourceMapping
.
set
(
data
.
notebook
,
input
);
}
}
...
@@ -261,7 +263,7 @@ export class NotebookContribution extends Disposable implements IWorkbenchContri
...
@@ -261,7 +263,7 @@ export class NotebookContribution extends Disposable implements IWorkbenchContri
return
undefined
;
return
undefined
;
}
}
const
input
=
NotebookEditorInput
.
getOrC
reate
(
this
.
instantiationService
,
resource
,
originalInput
.
getName
(),
info
.
id
);
const
input
=
NotebookEditorInput
.
c
reate
(
this
.
instantiationService
,
resource
,
originalInput
.
getName
(),
info
.
id
);
input
.
updateGroup
(
group
.
id
);
input
.
updateGroup
(
group
.
id
);
this
.
_resourceMapping
.
set
(
resource
,
input
);
this
.
_resourceMapping
.
set
(
resource
,
input
);
...
...
src/vs/workbench/contrib/notebook/browser/notebookEditorInput.ts
浏览文件 @
254e716f
...
@@ -14,23 +14,8 @@ import { IFileDialogService } from 'vs/platform/dialogs/common/dialogs';
...
@@ -14,23 +14,8 @@ import { IFileDialogService } from 'vs/platform/dialogs/common/dialogs';
let
NOTEBOOK_EDITOR_INPUT_HANDLE
=
0
;
let
NOTEBOOK_EDITOR_INPUT_HANDLE
=
0
;
export
class
NotebookEditorInput
extends
EditorInput
{
export
class
NotebookEditorInput
extends
EditorInput
{
static
create
(
instantiationService
:
IInstantiationService
,
resource
:
URI
,
name
:
string
,
viewType
:
string
|
undefined
)
{
private
static
readonly
_instances
=
new
Map
<
string
,
NotebookEditorInput
>
();
return
instantiationService
.
createInstance
(
NotebookEditorInput
,
resource
,
name
,
viewType
);
static
getOrCreate
(
instantiationService
:
IInstantiationService
,
resource
:
URI
,
name
:
string
,
viewType
:
string
|
undefined
)
{
const
key
=
resource
.
toString
()
+
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
'
;
static
readonly
ID
:
string
=
'
workbench.input.notebook
'
;
...
@@ -132,7 +117,7 @@ export class NotebookEditorInput extends EditorInput {
...
@@ -132,7 +117,7 @@ export class NotebookEditorInput extends EditorInput {
}
}
_move
(
group
:
GroupIdentifier
,
newResource
:
URI
):
{
editor
:
IEditorInput
}
|
undefined
{
_move
(
group
:
GroupIdentifier
,
newResource
:
URI
):
{
editor
:
IEditorInput
}
|
undefined
{
const
editorInput
=
NotebookEditorInput
.
getOrC
reate
(
this
.
instantiationService
,
newResource
,
basename
(
newResource
),
this
.
viewType
);
const
editorInput
=
NotebookEditorInput
.
c
reate
(
this
.
instantiationService
,
newResource
,
basename
(
newResource
),
this
.
viewType
);
return
{
editor
:
editorInput
};
return
{
editor
:
editorInput
};
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录