Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
25499ff9
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,发现更多精彩内容 >>
提交
25499ff9
编写于
8月 13, 2020
作者:
R
rebornix
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix #101871.
上级
7d08008a
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
25 addition
and
8 deletion
+25
-8
src/vs/workbench/api/browser/mainThreadNotebook.ts
src/vs/workbench/api/browser/mainThreadNotebook.ts
+9
-2
src/vs/workbench/api/common/extHostNotebook.ts
src/vs/workbench/api/common/extHostNotebook.ts
+1
-1
src/vs/workbench/contrib/notebook/browser/notebookPureOutputRenderer.ts
...ch/contrib/notebook/browser/notebookPureOutputRenderer.ts
+1
-1
src/vs/workbench/contrib/notebook/browser/notebookServiceImpl.ts
...workbench/contrib/notebook/browser/notebookServiceImpl.ts
+8
-3
src/vs/workbench/contrib/notebook/browser/view/renderers/codeCell.ts
...bench/contrib/notebook/browser/view/renderers/codeCell.ts
+2
-1
src/vs/workbench/contrib/notebook/common/notebookCommon.ts
src/vs/workbench/contrib/notebook/common/notebookCommon.ts
+1
-0
src/vs/workbench/contrib/notebook/common/notebookService.ts
src/vs/workbench/contrib/notebook/common/notebookService.ts
+3
-0
未找到文件。
src/vs/workbench/api/browser/mainThreadNotebook.ts
浏览文件 @
25499ff9
...
...
@@ -415,7 +415,13 @@ export class MainThreadNotebooks extends Disposable implements MainThreadNoteboo
}
async
$registerNotebookRenderer
(
extension
:
NotebookExtensionDescription
,
type
:
string
,
selectors
:
INotebookMimeTypeSelector
,
preloads
:
UriComponents
[]):
Promise
<
void
>
{
const
renderer
=
new
MainThreadNotebookRenderer
(
this
.
_proxy
,
type
,
extension
.
id
,
URI
.
revive
(
extension
.
location
),
selectors
,
preloads
.
map
(
uri
=>
URI
.
revive
(
uri
)));
const
staticContribution
=
this
.
_notebookService
.
getContributedNotebookOutputRenderers
(
type
);
if
(
!
staticContribution
)
{
throw
new
Error
(
`Notebook renderer for '
${
type
}
' is not statically registered.`
);
}
const
renderer
=
new
MainThreadNotebookRenderer
(
this
.
_proxy
,
type
,
staticContribution
.
displayName
,
extension
.
id
,
URI
.
revive
(
extension
.
location
),
selectors
,
preloads
.
map
(
uri
=>
URI
.
revive
(
uri
)));
this
.
_notebookRenderers
.
set
(
type
,
renderer
);
this
.
_notebookService
.
registerNotebookRenderer
(
type
,
renderer
);
}
...
...
@@ -674,10 +680,11 @@ export class MainThreadNotebookRenderer implements INotebookRendererInfo {
constructor
(
private
readonly
_proxy
:
ExtHostNotebookShape
,
readonly
id
:
string
,
public
displayName
:
string
,
readonly
extensionId
:
ExtensionIdentifier
,
readonly
extensionLocation
:
URI
,
readonly
selectors
:
INotebookMimeTypeSelector
,
readonly
preloads
:
URI
[]
readonly
preloads
:
URI
[]
,
)
{
}
...
...
src/vs/workbench/api/common/extHostNotebook.ts
浏览文件 @
25499ff9
...
...
@@ -964,7 +964,7 @@ export class ExtHostNotebookController implements ExtHostNotebookShape, ExtHostN
filter
:
vscode
.
NotebookOutputSelector
,
renderer
:
vscode
.
NotebookOutputRenderer
):
vscode
.
Disposable
{
if
(
this
.
_notebook
Kernel
s
.
has
(
type
))
{
if
(
this
.
_notebook
OutputRenderer
s
.
has
(
type
))
{
throw
new
Error
(
`Notebook renderer for '
${
type
}
' already registered`
);
}
...
...
src/vs/workbench/contrib/notebook/browser/notebookPureOutputRenderer.ts
浏览文件 @
25499ff9
...
...
@@ -19,7 +19,7 @@ export class PureNotebookOutputRenderer implements INotebookRendererInfo {
public
readonly
preloads
:
URI
[];
constructor
(
public
readonly
id
:
string
,
extension
:
IExtensionDescription
,
entrypoint
:
string
)
{
constructor
(
public
readonly
id
:
string
,
public
readonly
displayName
:
string
,
extension
:
IExtensionDescription
,
entrypoint
:
string
)
{
this
.
extensionId
=
extension
.
identifier
;
this
.
extensionLocation
=
extension
.
extensionLocation
;
this
.
preloads
=
[
joinPath
(
extension
.
extensionLocation
,
entrypoint
)];
...
...
src/vs/workbench/contrib/notebook/browser/notebookServiceImpl.ts
浏览文件 @
25499ff9
...
...
@@ -298,7 +298,7 @@ export class NotebookService extends Disposable implements INotebookService, ICu
}));
if
(
notebookContribution
.
entrypoint
)
{
this
.
_notebookRenderers
.
set
(
notebookContribution
.
viewType
,
new
PureNotebookOutputRenderer
(
notebookContribution
.
viewType
,
extension
.
description
,
notebookContribution
.
entrypoint
));
this
.
_notebookRenderers
.
set
(
notebookContribution
.
viewType
,
new
PureNotebookOutputRenderer
(
notebookContribution
.
viewType
,
notebookContribution
.
displayName
,
extension
.
description
,
notebookContribution
.
entrypoint
));
}
}
}
...
...
@@ -547,6 +547,11 @@ export class NotebookService extends Disposable implements INotebookService, ICu
registerNotebookRenderer
(
id
:
string
,
renderer
:
INotebookRendererInfo
)
{
this
.
_notebookRenderers
.
set
(
id
,
renderer
);
const
staticInfo
=
this
.
notebookRenderersInfoStore
.
get
(
id
);
if
(
staticInfo
)
{
}
}
unregisterNotebookRenderer
(
id
:
string
)
{
...
...
@@ -995,8 +1000,8 @@ export class NotebookService extends Disposable implements INotebookService, ICu
return
this
.
notebookProviderInfoStore
.
get
(
viewType
);
}
getContributedNotebookOutputRenderers
(
mimeType
:
string
):
readonly
NotebookOutputRendererInfo
[]
{
return
this
.
notebookRenderersInfoStore
.
get
ContributedRenderer
(
mime
Type
);
getContributedNotebookOutputRenderers
(
viewType
:
string
):
NotebookOutputRendererInfo
|
undefined
{
return
this
.
notebookRenderersInfoStore
.
get
(
view
Type
);
}
getNotebookProviderResourceRoots
():
URI
[]
{
...
...
src/vs/workbench/contrib/notebook/browser/view/renderers/codeCell.ts
浏览文件 @
25499ff9
...
...
@@ -558,7 +558,8 @@ export class CodeCell extends Disposable {
const
renderInfo
=
this
.
notebookService
.
getRendererInfo
(
renderId
);
if
(
renderInfo
)
{
return
`
${
renderId
}
(
${
renderInfo
.
extensionId
.
value
}
)`
;
const
displayName
=
renderInfo
.
displayName
!==
''
?
renderInfo
.
displayName
:
renderInfo
.
id
;
return
`
${
displayName
}
(
${
renderInfo
.
extensionId
.
value
}
)`
;
}
return
nls
.
localize
(
'
builtinRenderInfo
'
,
"
built-in
"
);
...
...
src/vs/workbench/contrib/notebook/common/notebookCommon.ts
浏览文件 @
25499ff9
...
...
@@ -113,6 +113,7 @@ export interface INotebookMimeTypeSelector {
export
interface
INotebookRendererInfo
{
id
:
string
;
displayName
:
string
;
extensionId
:
ExtensionIdentifier
;
extensionLocation
:
URI
,
preloads
:
URI
[],
...
...
src/vs/workbench/contrib/notebook/common/notebookService.ts
浏览文件 @
25499ff9
...
...
@@ -16,6 +16,7 @@ import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/no
import
{
CancellationToken
}
from
'
vs/base/common/cancellation
'
;
import
{
NotebookCellTextModel
}
from
'
vs/workbench/contrib/notebook/common/model/notebookCellTextModel
'
;
import
{
IDisposable
}
from
'
vs/base/common/lifecycle
'
;
import
{
NotebookOutputRendererInfo
}
from
'
vs/workbench/contrib/notebook/common/notebookOutputRenderer
'
;
export
const
INotebookService
=
createDecorator
<
INotebookService
>
(
'
notebookService
'
);
...
...
@@ -61,7 +62,9 @@ export interface INotebookService {
registerNotebookKernelProvider
(
provider
:
INotebookKernelProvider
):
IDisposable
;
getContributedNotebookKernels
(
viewType
:
string
,
resource
:
URI
):
readonly
INotebookKernelInfo
[];
getContributedNotebookKernels2
(
viewType
:
string
,
resource
:
URI
,
token
:
CancellationToken
):
Promise
<
INotebookKernelInfo2
[]
>
;
getContributedNotebookOutputRenderers
(
id
:
string
):
NotebookOutputRendererInfo
|
undefined
;
getRendererInfo
(
id
:
string
):
INotebookRendererInfo
|
undefined
;
resolveNotebook
(
viewType
:
string
,
uri
:
URI
,
forceReload
:
boolean
,
editorId
?:
string
,
backupId
?:
string
):
Promise
<
NotebookTextModel
|
undefined
>
;
getNotebookTextModel
(
uri
:
URI
):
NotebookTextModel
|
undefined
;
executeNotebook
(
viewType
:
string
,
uri
:
URI
):
Promise
<
void
>
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录