Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
7e3d5a0c
V
vscode
项目概览
掘金者说
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
7e3d5a0c
编写于
1月 25, 2021
作者:
R
rebornix
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix #114048. do not update active kernel if kernel is executed.
上级
c7cf663d
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
10 addition
and
0 deletion
+10
-0
src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts
...orkbench/contrib/notebook/browser/notebookEditorWidget.ts
+10
-0
未找到文件。
src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.ts
浏览文件 @
7e3d5a0c
...
@@ -146,6 +146,7 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
...
@@ -146,6 +146,7 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
return
this
.
_notebookViewModel
?.
notebookDocument
;
return
this
.
_notebookViewModel
?.
notebookDocument
;
}
}
private
_activeKernelExecuted
:
boolean
=
false
;
private
_activeKernel
:
INotebookKernelInfo2
|
undefined
=
undefined
;
private
_activeKernel
:
INotebookKernelInfo2
|
undefined
=
undefined
;
private
readonly
_onDidChangeKernel
=
this
.
_register
(
new
Emitter
<
void
>
());
private
readonly
_onDidChangeKernel
=
this
.
_register
(
new
Emitter
<
void
>
());
readonly
onDidChangeKernel
:
Event
<
void
>
=
this
.
_onDidChangeKernel
.
event
;
readonly
onDidChangeKernel
:
Event
<
void
>
=
this
.
_onDidChangeKernel
.
event
;
...
@@ -733,6 +734,8 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
...
@@ -733,6 +734,8 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
this
.
_webview
?.
element
.
remove
();
this
.
_webview
?.
element
.
remove
();
this
.
_webview
=
null
;
this
.
_webview
=
null
;
this
.
_list
.
clear
();
this
.
_list
.
clear
();
this
.
_activeKernel
=
undefined
;
this
.
_activeKernelExecuted
=
false
;
}
}
async
beginComputeContributedKernels
()
{
async
beginComputeContributedKernels
()
{
...
@@ -755,6 +758,11 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
...
@@ -755,6 +758,11 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
return
;
return
;
}
}
if
(
this
.
_activeKernel
!==
undefined
&&
this
.
_activeKernelExecuted
)
{
// kernel already executed, we should not change it automatically
return
;
}
const
provider
=
this
.
notebookService
.
getContributedNotebookProvider
(
this
.
viewModel
.
viewType
)
||
this
.
notebookService
.
getContributedNotebookProviders
(
this
.
viewModel
.
uri
)[
0
];
const
provider
=
this
.
notebookService
.
getContributedNotebookProvider
(
this
.
viewModel
.
viewType
)
||
this
.
notebookService
.
getContributedNotebookProviders
(
this
.
viewModel
.
uri
)[
0
];
const
availableKernels
=
await
this
.
beginComputeContributedKernels
();
const
availableKernels
=
await
this
.
beginComputeContributedKernels
();
...
@@ -1766,6 +1774,7 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
...
@@ -1766,6 +1774,7 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
}
}
await
this
.
_ensureActiveKernel
();
await
this
.
_ensureActiveKernel
();
this
.
_activeKernelExecuted
=
true
;
await
this
.
_activeKernel
?.
executeNotebookCell
!
(
this
.
viewModel
.
uri
,
undefined
);
await
this
.
_activeKernel
?.
executeNotebookCell
!
(
this
.
viewModel
.
uri
,
undefined
);
}
}
...
@@ -1806,6 +1815,7 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
...
@@ -1806,6 +1815,7 @@ export class NotebookEditorWidget extends Disposable implements INotebookEditor
}
}
await
this
.
_ensureActiveKernel
();
await
this
.
_ensureActiveKernel
();
this
.
_activeKernelExecuted
=
true
;
await
this
.
_activeKernel
?.
executeNotebookCell
!
(
this
.
viewModel
.
uri
,
cell
.
handle
);
await
this
.
_activeKernel
?.
executeNotebookCell
!
(
this
.
viewModel
.
uri
,
cell
.
handle
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录