Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
88d66caf
V
vscode
项目概览
掘金者说
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
88d66caf
编写于
1月 22, 2021
作者:
R
rebornix
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix #114782
上级
ed72c64b
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
64 addition
and
17 deletion
+64
-17
src/vs/workbench/contrib/notebook/browser/notebook.contribution.ts
...rkbench/contrib/notebook/browser/notebook.contribution.ts
+62
-17
src/vs/workbench/contrib/notebook/common/notebookEditorModelResolverService.ts
...rib/notebook/common/notebookEditorModelResolverService.ts
+2
-0
未找到文件。
src/vs/workbench/contrib/notebook/browser/notebook.contribution.ts
浏览文件 @
88d66caf
...
...
@@ -336,25 +336,70 @@ export class NotebookContribution extends Disposable implements IWorkbenchContri
return
undefined
;
}
if
(
id
&&
originalInput
instanceof
NotebookEditorInput
)
{
// Run reopen with ...
if
(
id
)
{
// from the editor tab context menu
if
(
originalInput
instanceof
NotebookEditorInput
)
{
if
(
originalInput
.
viewType
===
id
)
{
// reopen with the same type
return
undefined
;
}
else
{
return
{
override
:
(
async
()
=>
{
const
notebookInput
=
NotebookEditorInput
.
create
(
this
.
instantiationService
,
originalInput
.
resource
,
originalInput
.
getName
(),
id
);
await
group
.
replaceEditors
([{
editor
:
originalInput
,
replacement
:
notebookInput
}]);
if
(
group
.
activeEditorPane
?.
input
===
notebookInput
)
{
return
group
.
activeEditorPane
;
const
originalEditorIndex
=
group
.
getIndexOfEditor
(
originalInput
);
await
group
.
closeEditor
(
originalInput
);
originalInput
.
dispose
();
const
newEditor
=
await
group
.
openEditor
(
notebookInput
,
{
...
options
,
index
:
originalEditorIndex
,
override
:
false
});
if
(
newEditor
)
{
return
newEditor
;
}
else
{
return
undefined
;
}
})()
};
}
}
else
{
// from the file explorer
const
existingEditors
=
this
.
editorService
.
findEditors
(
originalInput
.
resource
,
group
).
filter
(
editor
=>
editor
instanceof
NotebookEditorInput
)
as
NotebookEditorInput
[];
if
(
existingEditors
.
length
)
{
// there are notebook editors with the same resource
if
(
existingEditors
.
find
(
editor
=>
editor
.
viewType
===
id
))
{
return
{
override
:
this
.
editorService
.
openEditor
(
existingEditors
.
find
(
editor
=>
editor
.
viewType
===
id
)
!
,
options
,
group
)
};
}
else
{
return
{
override
:
(
async
()
=>
{
const
firstEditor
=
existingEditors
[
0
]
!
;
const
originalEditorIndex
=
group
.
getIndexOfEditor
(
firstEditor
);
await
group
.
closeEditor
(
firstEditor
);
firstEditor
.
dispose
();
const
notebookInput
=
NotebookEditorInput
.
create
(
this
.
instantiationService
,
originalInput
.
resource
!
,
originalInput
.
getName
(),
id
);
const
newEditor
=
await
group
.
openEditor
(
notebookInput
,
{
...
options
,
index
:
originalEditorIndex
,
override
:
false
});
if
(
newEditor
)
{
return
newEditor
;
}
else
{
return
undefined
;
}
})()
};
}
}
}
}
// Click on the editor tab
if
(
id
===
undefined
&&
originalInput
instanceof
NotebookEditorInput
)
{
const
existingEditors
=
this
.
editorService
.
findEditors
(
originalInput
.
resource
,
group
).
filter
(
editor
=>
editor
instanceof
NotebookEditorInput
&&
editor
===
originalInput
);
if
(
existingEditors
.
length
)
{
// same
return
undefined
;
}
}
if
(
originalInput
instanceof
NotebookDiffEditorInput
)
{
...
...
src/vs/workbench/contrib/notebook/common/notebookEditorModelResolverService.ts
浏览文件 @
88d66caf
...
...
@@ -62,6 +62,8 @@ export class NotebookModelResolverService implements INotebookEditorModelResolve
async
resolve
(
resource
:
URI
,
viewType
?:
string
):
Promise
<
IReference
<
INotebookEditorModel
>>
{
console
.
log
(
resource
,
viewType
);
if
(
resource
.
scheme
===
CellUri
.
scheme
)
{
throw
new
Error
(
`CANNOT open a cell-uri as notebook. Tried with
${
resource
.
toString
()}
`
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录