Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
e9333810
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,发现更多精彩内容 >>
提交
e9333810
编写于
3月 09, 2020
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix cycling dependency, more rich cell-options
上级
82ecf895
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
20 addition
and
21 deletion
+20
-21
src/vs/workbench/contrib/notebook/browser/notebook.contribution.ts
...rkbench/contrib/notebook/browser/notebook.contribution.ts
+3
-18
src/vs/workbench/contrib/notebook/browser/notebookEditor.ts
src/vs/workbench/contrib/notebook/browser/notebookEditor.ts
+17
-3
未找到文件。
src/vs/workbench/contrib/notebook/browser/notebook.contribution.ts
浏览文件 @
e9333810
...
...
@@ -13,8 +13,8 @@ import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
import
{
Registry
}
from
'
vs/platform/registry/common/platform
'
;
import
{
EditorDescriptor
,
Extensions
as
EditorExtensions
,
IEditorRegistry
}
from
'
vs/workbench/browser/editor
'
;
import
{
Extensions
as
WorkbenchExtensions
,
IWorkbenchContribution
,
IWorkbenchContributionsRegistry
}
from
'
vs/workbench/common/contributions
'
;
import
{
IEditorInput
,
IEditorInputFactoryRegistry
,
Extensions
as
EditorInputExtensions
,
IEditorInputFactory
,
EditorInput
,
EditorOptions
}
from
'
vs/workbench/common/editor
'
;
import
{
NotebookEditor
}
from
'
vs/workbench/contrib/notebook/browser/notebookEditor
'
;
import
{
IEditorInput
,
IEditorInputFactoryRegistry
,
Extensions
as
EditorInputExtensions
,
IEditorInputFactory
,
EditorInput
}
from
'
vs/workbench/common/editor
'
;
import
{
NotebookEditor
,
NotebookEditorOptions
}
from
'
vs/workbench/contrib/notebook/browser/notebookEditor
'
;
import
{
NotebookEditorInput
}
from
'
vs/workbench/contrib/notebook/browser/notebookEditorInput
'
;
import
{
INotebookService
,
NotebookService
}
from
'
vs/workbench/contrib/notebook/browser/notebookService
'
;
import
{
IEditorGroup
}
from
'
vs/workbench/services/editor/common/editorGroupsService
'
;
...
...
@@ -86,21 +86,6 @@ Registry.as<IEditorInputFactoryRegistry>(EditorInputExtensions.EditorInputFactor
}
);
export
class
NotebookEditorOptions
extends
EditorOptions
{
readonly
cellUri
?:
URI
;
constructor
(
options
:
IEditorOptions
&
{
cellUri
?:
URI
|
undefined
})
{
super
();
this
.
overwrite
(
options
);
this
.
cellUri
=
options
.
cellUri
;
}
with
(
options
:
Partial
<
NotebookEditorOptions
>
):
NotebookEditorOptions
{
return
new
NotebookEditorOptions
({
...
this
,
...
options
});
}
}
export
class
NotebookContribution
implements
IWorkbenchContribution
{
private
_resourceMapping
=
new
ResourceMap
<
NotebookEditorInput
>
();
...
...
@@ -132,7 +117,7 @@ export class NotebookContribution implements IWorkbenchContribution {
const
name
=
basename
(
data
.
notebook
);
const
input
=
this
.
instantiationService
.
createInstance
(
NotebookEditorInput
,
data
.
notebook
,
name
,
data
.
viewType
);
this
.
_resourceMapping
.
set
(
resource
,
input
);
return
{
override
:
this
.
editorService
.
openEditor
(
input
,
new
NotebookEditorOptions
({
...
options
,
forceReload
:
true
,
cell
Uri
:
resource
}),
group
)
};
return
{
override
:
this
.
editorService
.
openEditor
(
input
,
new
NotebookEditorOptions
({
...
options
,
forceReload
:
true
,
cell
Options
:
{
resource
,
options
}
}),
group
)
};
}
const
notebookProviders
=
this
.
notebookService
.
getContributedNotebookProviders
(
resource
);
...
...
src/vs/workbench/contrib/notebook/browser/notebookEditor.ts
浏览文件 @
e9333810
...
...
@@ -40,13 +40,27 @@ import { NotebookFindWidget } from 'vs/workbench/contrib/notebook/browser/contri
import
{
NotebookViewModel
,
INotebookEditorViewState
,
IModelDecorationsChangeAccessor
}
from
'
vs/workbench/contrib/notebook/browser/viewModel/notebookViewModel
'
;
import
{
IEditorGroupView
}
from
'
vs/workbench/browser/parts/editor/editor
'
;
import
{
CellViewModel
}
from
'
vs/workbench/contrib/notebook/browser/viewModel/notebookCellViewModel
'
;
import
{
NotebookEditorOptions
}
from
'
vs/workbench/contrib/notebook/browser/notebook.contribution
'
;
const
$
=
DOM
.
$
;
const
NOTEBOOK_EDITOR_VIEW_STATE_PREFERENCE_KEY
=
'
NotebookEditorViewState
'
;
export
const
NOTEBOOK_EDITOR_FOCUSED
=
new
RawContextKey
<
boolean
>
(
'
notebookEditorFocused
'
,
false
);
export
class
NotebookEditorOptions
extends
EditorOptions
{
readonly
cellOptions
?:
IResourceEditorInput
;
constructor
(
options
:
Partial
<
NotebookEditorOptions
>
)
{
super
();
this
.
overwrite
(
options
);
this
.
cellOptions
=
options
.
cellOptions
;
}
with
(
options
:
Partial
<
NotebookEditorOptions
>
):
NotebookEditorOptions
{
return
new
NotebookEditorOptions
({
...
this
,
...
options
});
}
}
export
class
NotebookCodeEditors
implements
ICompositeCodeEditor
{
private
readonly
_disposables
=
new
DisposableStore
();
...
...
@@ -300,8 +314,8 @@ export class NotebookEditor extends BaseEditor implements INotebookEditor, Noteb
}
if
(
options
instanceof
NotebookEditorOptions
)
{
if
(
options
.
cell
Uri
)
{
this
.
control
?.
activate
(
{
resource
:
options
.
cellUri
}
);
if
(
options
.
cell
Options
)
{
this
.
control
?.
activate
(
options
.
cellOptions
);
}
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录