Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
be44e409
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,发现更多精彩内容 >>
提交
be44e409
编写于
7月 16, 2020
作者:
R
rebornix
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
avoid conflict between new and legacy kernel
上级
05144a3d
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
6 addition
and
6 deletion
+6
-6
extensions/vscode-notebook-tests/src/notebook.test.ts
extensions/vscode-notebook-tests/src/notebook.test.ts
+1
-1
src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts
...orkbench/contrib/notebook/browser/notebookEditorWidget.ts
+4
-4
src/vs/workbench/contrib/notebook/common/notebookCommon.ts
src/vs/workbench/contrib/notebook/common/notebookCommon.ts
+1
-1
未找到文件。
extensions/vscode-notebook-tests/src/notebook.test.ts
浏览文件 @
be44e409
...
...
@@ -125,7 +125,7 @@ suite('Notebook API tests', () => {
await
firstEditorClose
;
});
test
(
'
editor open/close event
'
,
async
function
()
{
test
(
'
editor open/close event
2
'
,
async
function
()
{
const
resource
=
vscode
.
Uri
.
file
(
join
(
vscode
.
workspace
.
rootPath
||
''
,
'
./first.vsctestnb
'
));
let
count
=
0
;
const
disposables
:
vscode
.
Disposable
[]
=
[];
...
...
src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts
浏览文件 @
be44e409
...
...
@@ -1151,8 +1151,8 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
if
(
this
.
_activeKernel
)
{
// TODO@rebornix temp any cast, should be removed once we remove legacy kernel support
if
((
this
.
_activeKernel
as
any
).
executeNotebook
)
{
await
(
this
.
_activeKernel
as
INotebookKernelInfo2
).
executeNotebook
(
this
.
_notebookViewModel
!
.
uri
,
undefined
,
tokenSource
.
token
);
if
((
this
.
_activeKernel
as
INotebookKernelInfo2
).
executeNotebookCell
)
{
await
(
this
.
_activeKernel
as
INotebookKernelInfo2
).
executeNotebook
Cell
!
(
this
.
_notebookViewModel
!
.
uri
,
undefined
,
tokenSource
.
token
);
}
else
{
await
this
.
notebookService
.
executeNotebook2
(
this
.
_notebookViewModel
!
.
viewType
,
this
.
_notebookViewModel
!
.
uri
,
this
.
_activeKernel
.
id
,
tokenSource
.
token
);
}
...
...
@@ -1206,8 +1206,8 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
if
(
this
.
_activeKernel
)
{
// TODO@rebornix temp any cast, should be removed once we remove legacy kernel support
if
((
this
.
_activeKernel
as
any
).
executeNotebook
)
{
await
(
this
.
_activeKernel
as
INotebookKernelInfo2
).
executeNotebook
(
this
.
_notebookViewModel
!
.
uri
,
cell
.
handle
,
tokenSource
.
token
);
if
((
this
.
_activeKernel
as
INotebookKernelInfo2
).
executeNotebookCell
)
{
await
(
this
.
_activeKernel
as
INotebookKernelInfo2
).
executeNotebook
Cell
!
(
this
.
_notebookViewModel
!
.
uri
,
cell
.
handle
,
tokenSource
.
token
);
}
else
{
return
await
this
.
notebookService
.
executeNotebookCell2
(
viewType
,
notebookUri
,
cell
.
handle
,
this
.
_activeKernel
.
id
,
tokenSource
.
token
);
...
...
src/vs/workbench/contrib/notebook/common/notebookCommon.ts
浏览文件 @
be44e409
...
...
@@ -648,7 +648,7 @@ export interface INotebookKernelInfoDto2 {
export
interface
INotebookKernelInfo2
extends
INotebookKernelInfoDto2
{
resolve
(
uri
:
URI
,
editorId
:
string
):
Promise
<
void
>
;
executeNotebook
(
uri
:
URI
,
handle
:
number
|
undefined
,
token
:
CancellationToken
):
Promise
<
void
>
;
executeNotebook
Cell
?
(
uri
:
URI
,
handle
:
number
|
undefined
,
token
:
CancellationToken
):
Promise
<
void
>
;
}
export
interface
INotebookKernelProvider
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录