Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
2392bf40
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,发现更多精彩内容 >>
提交
2392bf40
编写于
7月 17, 2020
作者:
R
rebornix
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
model changes are always sent to ext host.
上级
7251526c
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
25 addition
and
27 deletion
+25
-27
src/vs/workbench/api/browser/mainThreadNotebook.ts
src/vs/workbench/api/browser/mainThreadNotebook.ts
+5
-5
src/vs/workbench/contrib/notebook/common/model/notebookTextModel.ts
...kbench/contrib/notebook/common/model/notebookTextModel.ts
+15
-17
src/vs/workbench/contrib/notebook/test/notebookTextModel.test.ts
...workbench/contrib/notebook/test/notebookTextModel.test.ts
+5
-5
未找到文件。
src/vs/workbench/api/browser/mainThreadNotebook.ts
浏览文件 @
2392bf40
...
...
@@ -55,14 +55,14 @@ export class MainThreadNotebookDocument extends Disposable {
}));
}
async
applyEdit
(
modelVersionId
:
number
,
edits
:
ICellEditOperation
[],
emitToExtHost
:
boolean
,
synchronous
:
boolean
):
Promise
<
boolean
>
{
async
applyEdit
(
modelVersionId
:
number
,
edits
:
ICellEditOperation
[],
synchronous
:
boolean
):
Promise
<
boolean
>
{
await
this
.
notebookService
.
transformEditsOutputs
(
this
.
textModel
,
edits
);
if
(
synchronous
)
{
return
this
.
_textModel
.
$applyEdit
(
modelVersionId
,
edits
,
emitToExtHost
,
synchronous
);
return
this
.
_textModel
.
$applyEdit
(
modelVersionId
,
edits
,
synchronous
);
}
else
{
return
new
Promise
(
resolve
=>
{
this
.
_register
(
DOM
.
scheduleAtNextAnimationFrame
(()
=>
{
const
ret
=
this
.
_textModel
.
$applyEdit
(
modelVersionId
,
edits
,
emitToExtHost
,
true
);
const
ret
=
this
.
_textModel
.
$applyEdit
(
modelVersionId
,
edits
,
true
);
resolve
(
ret
);
}));
});
...
...
@@ -594,7 +594,7 @@ export class MainThreadNotebookController implements IMainNotebookController {
await
mainthreadNotebook
.
applyEdit
(
mainthreadNotebook
.
textModel
.
versionId
,
[
{
editType
:
CellEditType
.
Delete
,
count
:
mainthreadNotebook
.
textModel
.
cells
.
length
,
index
:
0
},
{
editType
:
CellEditType
.
Insert
,
index
:
0
,
cells
:
data
.
cells
}
],
true
,
false
);
],
false
);
}
return
mainthreadNotebook
.
textModel
;
}
...
...
@@ -653,7 +653,7 @@ export class MainThreadNotebookController implements IMainNotebookController {
let
mainthreadNotebook
=
this
.
_mapping
.
get
(
URI
.
from
(
resource
).
toString
());
if
(
mainthreadNotebook
)
{
return
await
mainthreadNotebook
.
applyEdit
(
modelVersionId
,
edits
,
true
,
true
);
return
await
mainthreadNotebook
.
applyEdit
(
modelVersionId
,
edits
,
true
);
}
return
false
;
...
...
src/vs/workbench/contrib/notebook/common/model/notebookTextModel.ts
浏览文件 @
2392bf40
...
...
@@ -172,7 +172,7 @@ export class NotebookTextModel extends Disposable implements INotebookTextModel
this
.
_increaseVersionId
();
}
$applyEdit
(
modelVersionId
:
number
,
rawEdits
:
ICellEditOperation
[],
emitToExtHost
:
boolean
,
synchronous
:
boolean
):
boolean
{
$applyEdit
(
modelVersionId
:
number
,
rawEdits
:
ICellEditOperation
[],
synchronous
:
boolean
):
boolean
{
if
(
modelVersionId
!==
this
.
_versionId
)
{
return
false
;
}
...
...
@@ -233,22 +233,20 @@ export class NotebookTextModel extends Disposable implements INotebookTextModel
return
[
diff
.
start
,
diff
.
deleteCount
,
diff
.
toInsert
]
as
[
number
,
number
,
NotebookCellTextModel
[]];
});
if
(
emitToExtHost
)
{
this
.
_onDidModelChangeProxy
.
fire
({
kind
:
NotebookCellsChangeType
.
ModelChange
,
versionId
:
this
.
_versionId
,
changes
:
diffs
.
map
(
diff
=>
[
diff
[
0
],
diff
[
1
],
diff
[
2
].
map
(
cell
=>
({
handle
:
cell
.
handle
,
uri
:
cell
.
uri
,
source
:
cell
.
textBuffer
.
getLinesContent
(),
eol
:
cell
.
textBuffer
.
getEOL
(),
language
:
cell
.
language
,
cellKind
:
cell
.
cellKind
,
outputs
:
cell
.
outputs
,
metadata
:
cell
.
metadata
}))]
as
[
number
,
number
,
IMainCellDto
[]])
});
}
this
.
_onDidModelChangeProxy
.
fire
({
kind
:
NotebookCellsChangeType
.
ModelChange
,
versionId
:
this
.
_versionId
,
changes
:
diffs
.
map
(
diff
=>
[
diff
[
0
],
diff
[
1
],
diff
[
2
].
map
(
cell
=>
({
handle
:
cell
.
handle
,
uri
:
cell
.
uri
,
source
:
cell
.
textBuffer
.
getLinesContent
(),
eol
:
cell
.
textBuffer
.
getEOL
(),
language
:
cell
.
language
,
cellKind
:
cell
.
cellKind
,
outputs
:
cell
.
outputs
,
metadata
:
cell
.
metadata
}))]
as
[
number
,
number
,
IMainCellDto
[]])
});
const
undoDiff
=
diffs
.
map
(
diff
=>
{
const
deletedCells
=
this
.
cells
.
slice
(
diff
[
0
],
diff
[
0
]
+
diff
[
1
]);
...
...
src/vs/workbench/contrib/notebook/test/notebookTextModel.test.ts
浏览文件 @
2392bf40
...
...
@@ -32,7 +32,7 @@ suite('NotebookTextModel', () => {
textModel
.
$applyEdit
(
textModel
.
versionId
,
[
{
editType
:
CellEditType
.
Insert
,
index
:
1
,
cells
:
[
new
TestCell
(
viewModel
.
viewType
,
5
,
[
'
var e = 5;
'
],
'
javascript
'
,
CellKind
.
Code
,
[],
textModelService
)]
},
{
editType
:
CellEditType
.
Insert
,
index
:
3
,
cells
:
[
new
TestCell
(
viewModel
.
viewType
,
6
,
[
'
var f = 6;
'
],
'
javascript
'
,
CellKind
.
Code
,
[],
textModelService
)]
},
],
true
,
true
);
],
true
);
assert
.
equal
(
textModel
.
cells
.
length
,
6
);
...
...
@@ -57,7 +57,7 @@ suite('NotebookTextModel', () => {
textModel
.
$applyEdit
(
textModel
.
versionId
,
[
{
editType
:
CellEditType
.
Insert
,
index
:
1
,
cells
:
[
new
TestCell
(
viewModel
.
viewType
,
5
,
[
'
var e = 5;
'
],
'
javascript
'
,
CellKind
.
Code
,
[],
textModelService
)]
},
{
editType
:
CellEditType
.
Insert
,
index
:
1
,
cells
:
[
new
TestCell
(
viewModel
.
viewType
,
6
,
[
'
var f = 6;
'
],
'
javascript
'
,
CellKind
.
Code
,
[],
textModelService
)]
},
],
true
,
true
);
],
true
);
assert
.
equal
(
textModel
.
cells
.
length
,
6
);
...
...
@@ -82,7 +82,7 @@ suite('NotebookTextModel', () => {
textModel
.
$applyEdit
(
textModel
.
versionId
,
[
{
editType
:
CellEditType
.
Delete
,
index
:
1
,
count
:
1
},
{
editType
:
CellEditType
.
Delete
,
index
:
3
,
count
:
1
},
],
true
,
true
);
],
true
);
assert
.
equal
(
textModel
.
cells
[
0
].
getValue
(),
'
var a = 1;
'
);
assert
.
equal
(
textModel
.
cells
[
1
].
getValue
(),
'
var c = 3;
'
);
...
...
@@ -105,7 +105,7 @@ suite('NotebookTextModel', () => {
textModel
.
$applyEdit
(
textModel
.
versionId
,
[
{
editType
:
CellEditType
.
Delete
,
index
:
1
,
count
:
1
},
{
editType
:
CellEditType
.
Insert
,
index
:
3
,
cells
:
[
new
TestCell
(
viewModel
.
viewType
,
5
,
[
'
var e = 5;
'
],
'
javascript
'
,
CellKind
.
Code
,
[],
textModelService
)]
},
],
true
,
true
);
],
true
);
assert
.
equal
(
textModel
.
cells
.
length
,
4
);
...
...
@@ -130,7 +130,7 @@ suite('NotebookTextModel', () => {
textModel
.
$applyEdit
(
textModel
.
versionId
,
[
{
editType
:
CellEditType
.
Delete
,
index
:
1
,
count
:
1
},
{
editType
:
CellEditType
.
Insert
,
index
:
1
,
cells
:
[
new
TestCell
(
viewModel
.
viewType
,
5
,
[
'
var e = 5;
'
],
'
javascript
'
,
CellKind
.
Code
,
[],
textModelService
)]
},
],
true
,
true
);
],
true
);
assert
.
equal
(
textModel
.
cells
.
length
,
4
);
assert
.
equal
(
textModel
.
cells
[
0
].
getValue
(),
'
var a = 1;
'
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录