Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
6f8fd621
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,发现更多精彩内容 >>
提交
6f8fd621
编写于
2月 14, 2020
作者:
R
rebornix
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Errorless
上级
7de343c2
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
19 addition
and
24 deletion
+19
-24
src/vs/workbench/api/common/extHostNotebook.ts
src/vs/workbench/api/common/extHostNotebook.ts
+15
-20
src/vs/workbench/contrib/notebook/browser/notebookRegistry.ts
...vs/workbench/contrib/notebook/browser/notebookRegistry.ts
+2
-2
src/vs/workbench/contrib/notebook/browser/output/outputRenderer.ts
...rkbench/contrib/notebook/browser/output/outputRenderer.ts
+2
-2
未找到文件。
src/vs/workbench/api/common/extHostNotebook.ts
浏览文件 @
6f8fd621
...
...
@@ -4,7 +4,7 @@
*--------------------------------------------------------------------------------------------*/
import
*
as
vscode
from
'
vscode
'
;
import
{
ExtHostNotebookShape
,
IMainContext
,
MainThreadNotebookShape
,
MainContext
,
MainThreadDocumentsShape
}
from
'
vs/workbench/api/common/extHost.protocol
'
;
import
{
ExtHostNotebookShape
,
IMainContext
,
MainThreadNotebookShape
,
MainContext
}
from
'
vs/workbench/api/common/extHost.protocol
'
;
import
{
IExtensionDescription
}
from
'
vs/platform/extensions/common/extensions
'
;
import
{
Disposable
as
VSCodeDisposable
}
from
'
./extHostTypes
'
;
import
{
URI
}
from
'
vs/base/common/uri
'
;
...
...
@@ -69,17 +69,17 @@ export class ExtHostCell implements vscode.NotebookCell {
}
}
const
standardTransforms
=
[
'
application/json
'
,
'
application/javascript
'
,
'
text/html
'
,
'
image/svg+xml
'
,
'
text/markdown
'
,
'
image/svg+xml
'
,
'
image/png
'
,
'
image/jpeg
'
,
'
text/plain
'
];
//
const standardTransforms = [
//
'application/json',
//
'application/javascript',
//
'text/html',
//
'image/svg+xml',
//
'text/markdown',
//
'image/svg+xml',
//
'image/png',
//
'image/jpeg',
//
'text/plain'
//
];
export
class
ExtHostNotebookDocument
implements
vscode
.
NotebookDocument
{
private
static
_handlePool
:
number
=
0
;
...
...
@@ -258,12 +258,10 @@ export class ExtHostNotebookEditor implements vscode.NotebookEditor {
private
_viewColumn
:
vscode
.
ViewColumn
|
undefined
;
constructor
(
private
viewType
:
string
,
private
readonly
_proxy
:
MainThreadNotebookShape
,
viewType
:
string
,
readonly
id
:
string
,
public
uri
:
URI
,
public
document
:
ExtHostNotebookDocument
,
private
readonly
documentsProxy
:
MainThreadDocumentsShape
,
private
_documentsAndEditors
:
ExtHostDocumentsAndEditors
)
{
let
regex
=
new
RegExp
(
`notebook\\+
${
viewType
}
-(\\d+)-(\\d+)`
);
...
...
@@ -375,7 +373,6 @@ export class ExtHostNotebookController implements ExtHostNotebookShape, ExtHostN
private
static
_handlePool
:
number
=
0
;
private
readonly
_proxy
:
MainThreadNotebookShape
;
private
readonly
_documentsProxy
:
MainThreadDocumentsShape
;
private
readonly
_notebookProviders
=
new
Map
<
string
,
{
readonly
provider
:
vscode
.
NotebookProvider
,
readonly
extension
:
IExtensionDescription
}
>
();
private
readonly
_documents
=
new
Map
<
string
,
ExtHostNotebookDocument
>
();
private
readonly
_editors
=
new
Map
<
string
,
ExtHostNotebookEditor
>
();
...
...
@@ -384,8 +381,6 @@ export class ExtHostNotebookController implements ExtHostNotebookShape, ExtHostN
constructor
(
mainContext
:
IMainContext
,
private
_documentsAndEditors
:
ExtHostDocumentsAndEditors
)
{
this
.
_proxy
=
mainContext
.
getProxy
(
MainContext
.
MainThreadNotebook
);
this
.
_documentsProxy
=
mainContext
.
getProxy
(
MainContext
.
MainThreadDocuments
);
}
private
_activeNotebookDocument
:
ExtHostNotebookDocument
|
undefined
;
...
...
@@ -453,11 +448,11 @@ export class ExtHostNotebookController implements ExtHostNotebookShape, ExtHostN
let
editor
=
new
ExtHostNotebookEditor
(
viewType
,
this
.
_proxy
,
//
this._proxy,
`
${
ExtHostNotebookController
.
_handlePool
++
}
`
,
uri
,
this
.
_documents
.
get
(
URI
.
revive
(
uri
).
toString
())
!
,
this
.
_documentsProxy
,
//
this._documentsProxy,
this
.
_documentsAndEditors
);
...
...
src/vs/workbench/contrib/notebook/browser/notebookRegistry.ts
浏览文件 @
6f8fd621
...
...
@@ -21,7 +21,7 @@ export namespace NotebookRegistry {
}
}
export
function
registerOutputTransform
<
Services
extends
BrandedService
[]
>
(
id
:
string
,
types
:
string
[],
ctor
:
{
new
(
handle
r
:
INotebookEditor
,
...
services
:
Services
):
IOutputTransformContribution
}):
void
{
export
function
registerOutputTransform
<
Services
extends
BrandedService
[]
>
(
id
:
string
,
types
:
string
[],
ctor
:
{
new
(
edito
r
:
INotebookEditor
,
...
services
:
Services
):
IOutputTransformContribution
}):
void
{
NotebookRegistryImpl
.
INSTANCE
.
registerOutputTransform
(
id
,
types
,
ctor
);
}
...
...
@@ -35,7 +35,7 @@ class NotebookRegistryImpl {
this
.
outputTransforms
=
[];
}
public
registerOutputTransform
<
Services
extends
BrandedService
[]
>
(
id
:
string
,
types
:
string
[],
ctor
:
{
new
(
handle
r
:
INotebookEditor
,
...
services
:
Services
):
IOutputTransformContribution
}):
void
{
public
registerOutputTransform
<
Services
extends
BrandedService
[]
>
(
id
:
string
,
types
:
string
[],
ctor
:
{
new
(
edito
r
:
INotebookEditor
,
...
services
:
Services
):
IOutputTransformContribution
}):
void
{
this
.
outputTransforms
.
push
({
id
:
id
,
types
:
types
,
ctor
:
ctor
as
IOutputTransformCtor
});
}
...
...
src/vs/workbench/contrib/notebook/browser/output/outputRenderer.ts
浏览文件 @
6f8fd621
...
...
@@ -14,7 +14,7 @@ export class OutputRenderer {
protected
readonly
_mimeTypeMapping
:
{
[
key
:
string
]:
IOutputTransformContribution
;
};
constructor
(
private
readonly
notebookHandle
r
:
INotebookEditor
,
notebookEdito
r
:
INotebookEditor
,
private
readonly
instantiationService
:
IInstantiationService
)
{
this
.
_contributions
=
{};
...
...
@@ -24,7 +24,7 @@ export class OutputRenderer {
for
(
const
desc
of
contributions
)
{
try
{
const
contribution
=
this
.
instantiationService
.
createInstance
(
desc
.
ctor
,
notebook
Handle
r
);
const
contribution
=
this
.
instantiationService
.
createInstance
(
desc
.
ctor
,
notebook
Edito
r
);
this
.
_contributions
[
desc
.
id
]
=
contribution
;
desc
.
types
.
forEach
(
mimeType
=>
{
this
.
_mimeTypeMapping
[
mimeType
]
=
contribution
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录