Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
057c1f14
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,发现更多精彩内容 >>
提交
057c1f14
编写于
7月 30, 2020
作者:
R
Rob Lourens
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix cell cancellation with kernel in provider
上级
94317e38
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
17 addition
and
1 deletion
+17
-1
src/vs/workbench/api/browser/mainThreadNotebook.ts
src/vs/workbench/api/browser/mainThreadNotebook.ts
+4
-1
src/vs/workbench/api/common/extHost.protocol.ts
src/vs/workbench/api/common/extHost.protocol.ts
+1
-0
src/vs/workbench/api/common/extHostNotebook.ts
src/vs/workbench/api/common/extHostNotebook.ts
+8
-0
src/vs/workbench/contrib/notebook/browser/notebookServiceImpl.ts
...workbench/contrib/notebook/browser/notebookServiceImpl.ts
+3
-0
src/vs/workbench/contrib/notebook/common/notebookCommon.ts
src/vs/workbench/contrib/notebook/common/notebookCommon.ts
+1
-0
未找到文件。
src/vs/workbench/api/browser/mainThreadNotebook.ts
浏览文件 @
057c1f14
...
...
@@ -547,7 +547,10 @@ export class MainThreadNotebooks extends Disposable implements MainThreadNoteboo
},
executeNotebook
:
(
uri
:
URI
,
kernelId
:
string
,
cellHandle
:
number
|
undefined
)
=>
{
return
that
.
_proxy
.
$executeNotebookKernelFromProvider
(
handle
,
uri
,
kernelId
,
cellHandle
);
}
},
cancelNotebook
:
(
uri
:
URI
,
kernelId
:
string
,
cellHandle
:
number
|
undefined
)
=>
{
return
that
.
_proxy
.
$cancelNotebookKernelFromProvider
(
handle
,
uri
,
kernelId
,
cellHandle
);
},
});
this
.
_notebookKernelProviders
.
set
(
handle
,
{
extension
,
...
...
src/vs/workbench/api/common/extHost.protocol.ts
浏览文件 @
057c1f14
...
...
@@ -1622,6 +1622,7 @@ export interface ExtHostNotebookShape {
$executeNotebookByAttachedKernel
(
viewType
:
string
,
uri
:
UriComponents
,
cellHandle
:
number
|
undefined
):
Promise
<
void
>
;
$cancelNotebookByAttachedKernel
(
viewType
:
string
,
uri
:
UriComponents
,
cellHandle
:
number
|
undefined
):
Promise
<
void
>
;
$executeNotebookKernelFromProvider
(
handle
:
number
,
uri
:
UriComponents
,
kernelId
:
string
,
cellHandle
:
number
|
undefined
):
Promise
<
void
>
;
$cancelNotebookKernelFromProvider
(
handle
:
number
,
uri
:
UriComponents
,
kernelId
:
string
,
cellHandle
:
number
|
undefined
):
Promise
<
void
>
;
$executeNotebook2
(
kernelId
:
string
,
viewType
:
string
,
uri
:
UriComponents
,
cellHandle
:
number
|
undefined
):
Promise
<
void
>
;
$saveNotebook
(
viewType
:
string
,
uri
:
UriComponents
,
token
:
CancellationToken
):
Promise
<
boolean
>
;
$saveNotebookAs
(
viewType
:
string
,
uri
:
UriComponents
,
target
:
UriComponents
,
token
:
CancellationToken
):
Promise
<
boolean
>
;
...
...
src/vs/workbench/api/common/extHostNotebook.ts
浏览文件 @
057c1f14
...
...
@@ -1294,6 +1294,14 @@ export class ExtHostNotebookController implements ExtHostNotebookShape, ExtHostN
});
}
async
$cancelNotebookKernelFromProvider
(
handle
:
number
,
uri
:
UriComponents
,
kernelId
:
string
,
cellHandle
:
number
|
undefined
):
Promise
<
void
>
{
await
this
.
_withAdapter
(
handle
,
uri
,
async
(
adapter
,
document
)
=>
{
let
cell
=
cellHandle
!==
undefined
?
document
.
getCell
(
cellHandle
)
:
undefined
;
return
adapter
.
cancelNotebook
(
kernelId
,
document
,
cell
);
});
}
async
$executeNotebook2
(
kernelId
:
string
,
viewType
:
string
,
uri
:
UriComponents
,
cellHandle
:
number
|
undefined
):
Promise
<
void
>
{
let
document
=
this
.
_documents
.
get
(
URI
.
revive
(
uri
).
toString
());
...
...
src/vs/workbench/contrib/notebook/browser/notebookServiceImpl.ts
浏览文件 @
057c1f14
...
...
@@ -404,6 +404,9 @@ export class NotebookService extends Disposable implements INotebookService, ICu
},
executeNotebookCell
:
async
(
uri
:
URI
,
handle
:
number
|
undefined
)
=>
{
return
provider
.
executeNotebook
(
uri
,
dto
.
id
,
handle
);
},
cancelNotebookCell
:
(
uri
:
URI
,
handle
:
number
|
undefined
):
Promise
<
void
>
=>
{
return
provider
.
cancelNotebook
(
uri
,
dto
.
id
,
handle
);
}
};
});
...
...
src/vs/workbench/contrib/notebook/common/notebookCommon.ts
浏览文件 @
057c1f14
...
...
@@ -672,4 +672,5 @@ export interface INotebookKernelProvider {
provideKernels
(
uri
:
URI
,
token
:
CancellationToken
):
Promise
<
INotebookKernelInfoDto2
[]
>
;
resolveKernel
(
editorId
:
string
,
uri
:
UriComponents
,
kernelId
:
string
,
token
:
CancellationToken
):
Promise
<
void
>
;
executeNotebook
(
uri
:
URI
,
kernelId
:
string
,
handle
:
number
|
undefined
):
Promise
<
void
>
;
cancelNotebook
(
uri
:
URI
,
kernelId
:
string
,
handle
:
number
|
undefined
):
Promise
<
void
>
;
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录