Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
0955c0e7
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,发现更多精彩内容 >>
未验证
提交
0955c0e7
编写于
7月 23, 2020
作者:
C
Connor Peet
提交者:
GitHub
7月 23, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
notebooks: initial implementation of 'pure' output renderers (#103125)
上级
df15db21
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
79 addition
and
6 deletion
+79
-6
src/vs/workbench/contrib/notebook/browser/extensionPoint.ts
src/vs/workbench/contrib/notebook/browser/extensionPoint.ts
+8
-2
src/vs/workbench/contrib/notebook/browser/notebookPureOutputRenderer.ts
...ch/contrib/notebook/browser/notebookPureOutputRenderer.ts
+49
-0
src/vs/workbench/contrib/notebook/browser/notebookServiceImpl.ts
...workbench/contrib/notebook/browser/notebookServiceImpl.ts
+8
-3
src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts
...ontrib/notebook/browser/view/renderers/webviewPreloads.ts
+14
-1
未找到文件。
src/vs/workbench/contrib/notebook/browser/extensionPoint.ts
浏览文件 @
0955c0e7
...
...
@@ -27,12 +27,14 @@ namespace NotebookRendererContribution {
export
const
viewType
=
'
viewType
'
;
export
const
displayName
=
'
displayName
'
;
export
const
mimeTypes
=
'
mimeTypes
'
;
export
const
entrypoint
=
'
entrypoint
'
;
}
interface
INotebookRendererContribution
{
export
interface
INotebookRendererContribution
{
readonly
[
NotebookRendererContribution
.
viewType
]:
string
;
readonly
[
NotebookRendererContribution
.
displayName
]:
string
;
readonly
[
NotebookRendererContribution
.
mimeTypes
]?:
readonly
string
[];
readonly
[
NotebookRendererContribution
.
entrypoint
]?:
string
;
}
const
notebookProviderContribution
:
IJSONSchema
=
{
...
...
@@ -115,7 +117,11 @@ const notebookRendererContribution: IJSONSchema = {
items
:
{
type
:
'
string
'
}
}
},
[
NotebookRendererContribution
.
entrypoint
]:
{
type
:
'
string
'
,
description
:
nls
.
localize
(
'
contributes.notebook.renderer.entrypoint
'
,
'
File to load in the webview to render the extension.
'
),
},
}
}
};
...
...
src/vs/workbench/contrib/notebook/browser/notebookPureOutputRenderer.ts
0 → 100644
浏览文件 @
0955c0e7
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import
{
URI
,
UriComponents
}
from
'
vs/base/common/uri
'
;
import
{
INotebookRendererInfo
,
IOutputRenderResponse
,
IOutputRenderRequest
}
from
'
vs/workbench/contrib/notebook/common/notebookCommon
'
;
import
{
ExtensionIdentifier
,
IExtensionDescription
}
from
'
vs/platform/extensions/common/extensions
'
;
import
{
joinPath
}
from
'
vs/base/common/resources
'
;
/**
* A 'stub' output renderer used when the contribution has an `entrypoint`
* property. Include the entrypoint as its reload and renders an empty string.
*/
export
class
PureNotebookOutputRenderer
implements
INotebookRendererInfo
{
public
readonly
extensionId
:
ExtensionIdentifier
;
public
readonly
extensionLocation
:
URI
;
public
readonly
preloads
:
URI
[];
constructor
(
public
readonly
id
:
string
,
extension
:
IExtensionDescription
,
entrypoint
:
string
)
{
this
.
extensionId
=
extension
.
identifier
;
this
.
extensionLocation
=
extension
.
extensionLocation
;
this
.
preloads
=
[
joinPath
(
extension
.
extensionLocation
,
entrypoint
)];
}
public
render
(
uri
:
URI
,
request
:
IOutputRenderRequest
<
UriComponents
>
):
Promise
<
IOutputRenderResponse
<
UriComponents
>
|
undefined
>
{
return
this
.
render2
(
uri
,
request
);
}
public
render2
<
T
>
(
_uri
:
URI
,
request
:
IOutputRenderRequest
<
T
>
):
Promise
<
IOutputRenderResponse
<
T
>
|
undefined
>
{
return
Promise
.
resolve
({
items
:
request
.
items
.
map
(
cellInfo
=>
({
key
:
cellInfo
.
key
,
outputs
:
cellInfo
.
outputs
.
map
(
output
=>
({
index
:
output
.
index
,
outputId
:
output
.
outputId
,
mimeType
:
output
.
mimeType
,
handlerId
:
this
.
id
,
// todo@connor4312: temp approach exploring this API:
transformedOutput
:
`<script class="vscode-pure-data" type="application/json">
${
JSON
.
stringify
({
mimeType
:
output
.
mimeType
,
output
:
output
.
output
})}
</script>`
}))
}))
});
}
}
src/vs/workbench/contrib/notebook/browser/notebookServiceImpl.ts
浏览文件 @
0955c0e7
...
...
@@ -31,6 +31,7 @@ import { generateUuid } from 'vs/base/common/uuid';
import
{
flatten
}
from
'
vs/base/common/arrays
'
;
import
{
IInstantiationService
}
from
'
vs/platform/instantiation/common/instantiation
'
;
import
{
NotebookKernelProviderAssociationRegistry
,
updateNotebookKernelProvideAssociationSchema
,
NotebookViewTypesExtensionRegistry
}
from
'
vs/workbench/contrib/notebook/browser/notebookKernelAssociation
'
;
import
{
PureNotebookOutputRenderer
}
from
'
vs/workbench/contrib/notebook/browser/notebookPureOutputRenderer
'
;
function
MODEL_ID
(
resource
:
URI
):
string
{
return
resource
.
toString
();
...
...
@@ -287,8 +288,12 @@ export class NotebookService extends Disposable implements INotebookService, ICu
this
.
notebookRenderersInfoStore
.
add
(
new
NotebookOutputRendererInfo
({
id
:
notebookContribution
.
viewType
,
displayName
:
notebookContribution
.
displayName
,
mimeTypes
:
notebookContribution
.
mimeTypes
||
[]
mimeTypes
:
notebookContribution
.
mimeTypes
||
[]
,
}));
if
(
notebookContribution
.
entrypoint
)
{
this
.
_notebookRenderers
.
set
(
notebookContribution
.
viewType
,
new
PureNotebookOutputRenderer
(
notebookContribution
.
viewType
,
extension
.
description
,
notebookContribution
.
entrypoint
));
}
}
}
...
...
@@ -690,7 +695,7 @@ export class NotebookService extends Disposable implements INotebookService, ICu
let
orderMimeTypes
:
IOrderedMimeType
[]
=
[];
sorted
.
forEach
(
mimeType
=>
{
let
handlers
=
this
.
findBestMatchedRenderer
(
mimeType
);
let
handlers
=
this
.
_
findBestMatchedRenderer
(
mimeType
);
if
(
handlers
.
length
)
{
const
handler
=
handlers
[
0
];
...
...
@@ -734,7 +739,7 @@ export class NotebookService extends Disposable implements INotebookService, ICu
};
}
findBestMatchedRenderer
(
mimeType
:
string
):
readonly
NotebookOutputRendererInfo
[]
{
private
_
findBestMatchedRenderer
(
mimeType
:
string
):
readonly
NotebookOutputRendererInfo
[]
{
return
this
.
notebookRenderersInfoStore
.
getContributedRenderer
(
mimeType
);
}
...
...
src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.ts
浏览文件 @
0955c0e7
...
...
@@ -261,6 +261,8 @@ function webviewPreloads() {
interface
ICreateCellInfo
{
outputId
:
string
;
output
?:
unknown
;
mimeType
?:
string
;
element
:
HTMLElement
;
}
...
...
@@ -374,10 +376,21 @@ function webviewPreloads() {
outputNode
.
innerHTML
=
content
;
cellOutputContainer
.
appendChild
(
outputNode
);
let
pureData
:
{
mimeType
:
string
,
output
:
unknown
}
|
undefined
;
const
outputScript
=
cellOutputContainer
.
querySelector
(
'
script.vscode-pure-data
'
);
if
(
outputScript
)
{
try
{
pureData
=
JSON
.
parse
(
outputScript
.
innerHTML
);
}
catch
{
}
}
// eval
domEval
(
outputNode
);
resizeObserve
(
outputNode
,
outputId
);
onDidCreateOutput
.
fire
([
data
.
apiNamespace
,
{
element
:
outputNode
,
outputId
}]);
onDidCreateOutput
.
fire
([
data
.
apiNamespace
,
{
element
:
outputNode
,
output
:
pureData
?.
output
,
mimeType
:
pureData
?.
mimeType
,
outputId
}]);
vscode
.
postMessage
({
__vscode_notebook_message
:
true
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录