Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
3719898c
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,发现更多精彩内容 >>
未验证
提交
3719898c
编写于
4月 28, 2021
作者:
R
rebornix
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'notebook/dev' into main
上级
bf7d8da5
8420e94d
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
21 addition
and
12 deletion
+21
-12
src/vs/vscode.proposed.d.ts
src/vs/vscode.proposed.d.ts
+14
-8
src/vs/workbench/contrib/notebook/common/model/notebookTextModel.ts
...kbench/contrib/notebook/common/model/notebookTextModel.ts
+4
-1
src/vs/workbench/contrib/notebook/test/notebookEditorKernelManager.test.ts
...contrib/notebook/test/notebookEditorKernelManager.test.ts
+1
-1
src/vs/workbench/contrib/notebook/test/notebookKernelService.test.ts
...bench/contrib/notebook/test/notebookKernelService.test.ts
+2
-2
未找到文件。
src/vs/vscode.proposed.d.ts
浏览文件 @
3719898c
...
...
@@ -1554,18 +1554,24 @@ declare module 'vscode' {
readonly
id
:
string
;
/**
* The selector allows to narrow down on specific notebook types or
* instances.
*
* For instance `{ viewType: 'notebook.test' }` selects all notebook
* documents of the type `notebook.test`, whereas `{ pattern: '/my/file/test.nb' }`
* selects only the notebook with the path `/my/file/test.nb`.
* The notebook view type this controller is for.
*/
readonly
viewType
:
string
;
/**
* An array of language identifiers that are supported by this
* controller. When falsy all languages are supported.
* controller. Any language identifier from [`getLanguages`](#languages.getLanguages)
* is possible. When falsy all languages are supported.
*
* Samples:
* ```js
* // support JavaScript and TypeScript
* myController.supportedLanguages = ['javascript', 'typescript']
*
* // support all languages
* myController.supportedLanguages = undefined; // falsy
* myController.supportedLanguages = []; // falsy
* ```
*/
supportedLanguages
?:
string
[];
...
...
@@ -1674,7 +1680,7 @@ declare module 'vscode' {
* Creates a new notebook controller.
*
* @param id Extension-unique identifier of the controller
* @param
selector A notebook selector to narrow down notebook type or path
* @param
viewType A notebook type for which this controller is for.
* @param label The label of the controller
* @param handler
* @param preloads
...
...
src/vs/workbench/contrib/notebook/common/model/notebookTextModel.ts
浏览文件 @
3719898c
...
...
@@ -18,7 +18,7 @@ import { IModelService } from 'vs/editor/common/services/modelService';
import
{
Schemas
}
from
'
vs/base/common/network
'
;
import
{
isEqual
}
from
'
vs/base/common/resources
'
;
import
{
IModeService
}
from
'
vs/editor/common/services/modeService
'
;
import
{
ITextModel
}
from
'
vs/editor/common/model
'
;
import
{
IText
Buffer
,
IText
Model
}
from
'
vs/editor/common/model
'
;
import
{
TextModel
}
from
'
vs/editor/common/model/textModel
'
;
...
...
@@ -513,6 +513,9 @@ export class NotebookTextModel extends Disposable implements INotebookTextModel
if
(
textModel
&&
textModel
instanceof
TextModel
)
{
cell
.
textModel
=
textModel
;
cell
.
language
=
cellDto
.
language
;
if
(
!
cell
.
textModel
.
equalsTextBuffer
(
cell
.
textBuffer
as
ITextBuffer
))
{
cell
.
textModel
.
setValue
(
cellDto
.
source
);
}
}
const
dirtyStateListener
=
cell
.
onDidChangeContent
(()
=>
{
this
.
_increaseVersionIdForCellContentChange
();
...
...
src/vs/workbench/contrib/notebook/test/notebookEditorKernelManager.test.ts
浏览文件 @
3719898c
...
...
@@ -59,7 +59,7 @@ suite('NotebookEditorKernelManager', () => {
await
withTestNotebook
(
[],
async
(
viewModel
)
=>
{
const
kernelManager
=
instantiationService
.
createInstance
(
NotebookEditorKernelManager
,
{
activeKernel
:
undefined
,
viewModel
}
);
const
kernelManager
=
instantiationService
.
createInstance
(
NotebookEditorKernelManager
);
const
cell
=
viewModel
.
createCell
(
1
,
'
var c = 3
'
,
'
javascript
'
,
CellKind
.
Code
,
{},
[],
true
);
await
assertThrowsAsync
(
async
()
=>
await
kernelManager
.
executeNotebookCell
(
cell
));
...
...
src/vs/workbench/contrib/notebook/test/notebookKernelService.test.ts
浏览文件 @
3719898c
...
...
@@ -140,7 +140,7 @@ suite('NotebookKernelService', () => {
{
// open as jupyter -> bind event
const
p1
=
Event
.
toPromise
(
kernelService
.
onDidChangeNotebookKernelBinding
);
const
d1
=
instantiationService
.
createInstance
(
NotebookTextModel
,
jupyter
.
viewType
,
jupyter
.
uri
,
[],
{});
const
d1
=
instantiationService
.
createInstance
(
NotebookTextModel
,
jupyter
.
viewType
,
jupyter
.
uri
,
[],
{}
,
{}
);
onDidAddNotebookDocument
.
fire
(
d1
);
const
event
=
await
p1
;
assert
.
strictEqual
(
event
.
newKernel
,
jupyterKernel
.
id
);
...
...
@@ -148,7 +148,7 @@ suite('NotebookKernelService', () => {
{
// RE-open as dotnet -> bind event
const
p2
=
Event
.
toPromise
(
kernelService
.
onDidChangeNotebookKernelBinding
);
const
d2
=
instantiationService
.
createInstance
(
NotebookTextModel
,
dotnet
.
viewType
,
dotnet
.
uri
,
[],
{});
const
d2
=
instantiationService
.
createInstance
(
NotebookTextModel
,
dotnet
.
viewType
,
dotnet
.
uri
,
[],
{}
,
{}
);
onDidAddNotebookDocument
.
fire
(
d2
);
const
event2
=
await
p2
;
assert
.
strictEqual
(
event2
.
newKernel
,
dotnetKernel
.
id
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录