Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
0e82f118
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,发现更多精彩内容 >>
提交
0e82f118
编写于
4月 20, 2020
作者:
R
rebornix
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
index based folding
上级
6e2d4c93
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
22 addition
and
37 deletion
+22
-37
src/vs/workbench/contrib/notebook/browser/contrib/fold/folding.ts
...orkbench/contrib/notebook/browser/contrib/fold/folding.ts
+3
-2
src/vs/workbench/contrib/notebook/browser/viewModel/foldingModel.ts
...kbench/contrib/notebook/browser/viewModel/foldingModel.ts
+3
-2
src/vs/workbench/contrib/notebook/browser/viewModel/markdownCellViewModel.ts
...ntrib/notebook/browser/viewModel/markdownCellViewModel.ts
+1
-1
src/vs/workbench/contrib/notebook/browser/viewModel/notebookViewModel.ts
...h/contrib/notebook/browser/viewModel/notebookViewModel.ts
+8
-21
src/vs/workbench/contrib/notebook/test/notebookFolding.test.ts
...s/workbench/contrib/notebook/test/notebookFolding.test.ts
+7
-11
未找到文件。
src/vs/workbench/contrib/notebook/browser/contrib/fold/folding.ts
浏览文件 @
0e82f118
...
@@ -45,13 +45,14 @@ export class FoldingController extends Disposable {
...
@@ -45,13 +45,14 @@ export class FoldingController extends Disposable {
// folding icon
// folding icon
const
cellViewModel
=
e
.
target
;
const
cellViewModel
=
e
.
target
;
const
state
=
viewModel
.
getFoldingState
(
cellViewModel
);
const
modelIndex
=
viewModel
.
getCellIndex
(
cellViewModel
);
const
state
=
viewModel
.
getFoldingState
(
modelIndex
);
if
(
state
===
CellFoldingState
.
None
)
{
if
(
state
===
CellFoldingState
.
None
)
{
return
;
return
;
}
}
viewModel
.
setFoldingState
(
cellViewModel
,
state
===
CellFoldingState
.
Collapsed
?
CellFoldingState
.
Expanded
:
CellFoldingState
.
Collapsed
);
viewModel
.
setFoldingState
(
modelIndex
,
state
===
CellFoldingState
.
Collapsed
?
CellFoldingState
.
Expanded
:
CellFoldingState
.
Collapsed
);
}
}
return
;
return
;
...
...
src/vs/workbench/contrib/notebook/browser/viewModel/foldingModel.ts
浏览文件 @
0e82f118
...
@@ -165,6 +165,7 @@ export enum CellFoldingState {
...
@@ -165,6 +165,7 @@ export enum CellFoldingState {
export
interface
FoldingRegionDelegate
{
export
interface
FoldingRegionDelegate
{
onDidFoldingRegionChanged
:
Event
<
void
>
;
onDidFoldingRegionChanged
:
Event
<
void
>
;
getFoldingStartIndex
(
cell
:
CellViewModel
):
number
;
getCellIndex
(
cell
:
CellViewModel
):
number
;
getFoldingState
(
cell
:
CellViewModel
):
CellFoldingState
;
getFoldingStartIndex
(
index
:
number
):
number
;
getFoldingState
(
index
:
number
):
CellFoldingState
;
}
}
src/vs/workbench/contrib/notebook/browser/viewModel/markdownCellViewModel.ts
浏览文件 @
0e82f118
...
@@ -39,7 +39,7 @@ export class MarkdownCellViewModel extends BaseCellViewModel implements ICellVie
...
@@ -39,7 +39,7 @@ export class MarkdownCellViewModel extends BaseCellViewModel implements ICellVie
readonly
onDidChangeLayout
=
this
.
_onDidChangeLayout
.
event
;
readonly
onDidChangeLayout
=
this
.
_onDidChangeLayout
.
event
;
get
foldingState
()
{
get
foldingState
()
{
return
this
.
foldingDelegate
.
getFoldingState
(
this
);
return
this
.
foldingDelegate
.
getFoldingState
(
this
.
foldingDelegate
.
getCellIndex
(
this
)
);
}
}
constructor
(
constructor
(
...
...
src/vs/workbench/contrib/notebook/browser/viewModel/notebookViewModel.ts
浏览文件 @
0e82f118
...
@@ -251,43 +251,30 @@ export class NotebookViewModel extends Disposable implements FoldingRegionDelega
...
@@ -251,43 +251,30 @@ export class NotebookViewModel extends Disposable implements FoldingRegionDelega
this
.
_updateFoldingRanges
();
this
.
_updateFoldingRanges
();
}));
}));
}
}
getFoldingStartIndex
(
cell
:
CellViewModel
):
number
{
const
modelIndex
=
this
.
viewCells
.
indexOf
(
cell
);
if
(
modelIndex
<
0
)
{
return
-
1
;
}
const
range
=
this
.
_foldingModel
.
regions
.
findRange
(
modelIndex
+
1
);
getFoldingStartIndex
(
index
:
number
):
number
{
const
range
=
this
.
_foldingModel
.
regions
.
findRange
(
index
+
1
);
const
startIndex
=
this
.
_foldingModel
.
regions
.
getStartLineNumber
(
range
)
-
1
;
const
startIndex
=
this
.
_foldingModel
.
regions
.
getStartLineNumber
(
range
)
-
1
;
return
startIndex
;
return
startIndex
;
}
}
getFoldingState
(
cell
:
CellViewModel
):
CellFoldingState
{
getFoldingState
(
index
:
number
):
CellFoldingState
{
const
modelIndex
=
this
.
viewCells
.
indexOf
(
cell
);
const
range
=
this
.
_foldingModel
.
regions
.
findRange
(
index
+
1
);
if
(
modelIndex
<
0
)
{
return
-
1
;
}
const
range
=
this
.
_foldingModel
.
regions
.
findRange
(
modelIndex
+
1
);
const
startIndex
=
this
.
_foldingModel
.
regions
.
getStartLineNumber
(
range
)
-
1
;
const
startIndex
=
this
.
_foldingModel
.
regions
.
getStartLineNumber
(
range
)
-
1
;
if
(
startIndex
!==
modelI
ndex
)
{
if
(
startIndex
!==
i
ndex
)
{
return
CellFoldingState
.
None
;
return
CellFoldingState
.
None
;
}
}
return
this
.
_foldingModel
.
regions
.
isCollapsed
(
range
)
?
CellFoldingState
.
Collapsed
:
CellFoldingState
.
Expanded
;
return
this
.
_foldingModel
.
regions
.
isCollapsed
(
range
)
?
CellFoldingState
.
Collapsed
:
CellFoldingState
.
Expanded
;
}
}
setFoldingState
(
cell
:
CellViewModel
,
state
:
CellFoldingState
):
void
{
setFoldingState
(
index
:
number
,
state
:
CellFoldingState
):
void
{
const
modelIndex
=
this
.
viewCells
.
indexOf
(
cell
);
if
(
modelIndex
<
0
)
{
return
;
}
const
range
=
this
.
_foldingModel
.
regions
.
findRange
(
modelI
ndex
+
1
);
const
range
=
this
.
_foldingModel
.
regions
.
findRange
(
i
ndex
+
1
);
const
startIndex
=
this
.
_foldingModel
.
regions
.
getStartLineNumber
(
range
)
-
1
;
const
startIndex
=
this
.
_foldingModel
.
regions
.
getStartLineNumber
(
range
)
-
1
;
if
(
startIndex
!==
modelI
ndex
)
{
if
(
startIndex
!==
i
ndex
)
{
return
;
return
;
}
}
...
...
src/vs/workbench/contrib/notebook/test/notebookFolding.test.ts
浏览文件 @
0e82f118
...
@@ -10,7 +10,6 @@ import { withTestNotebook, TestCell } from 'vs/workbench/contrib/notebook/test/t
...
@@ -10,7 +10,6 @@ import { withTestNotebook, TestCell } from 'vs/workbench/contrib/notebook/test/t
import
{
IBulkEditService
}
from
'
vs/editor/browser/services/bulkEditService
'
;
import
{
IBulkEditService
}
from
'
vs/editor/browser/services/bulkEditService
'
;
import
{
IUndoRedoService
}
from
'
vs/platform/undoRedo/common/undoRedo
'
;
import
{
IUndoRedoService
}
from
'
vs/platform/undoRedo/common/undoRedo
'
;
import
{
FoldingModel
,
CellFoldingState
}
from
'
vs/workbench/contrib/notebook/browser/viewModel/foldingModel
'
;
import
{
FoldingModel
,
CellFoldingState
}
from
'
vs/workbench/contrib/notebook/browser/viewModel/foldingModel
'
;
import
{
CellViewModel
}
from
'
vs/workbench/contrib/notebook/browser/viewModel/notebookViewModel
'
;
suite
(
'
Notebook Folding
'
,
()
=>
{
suite
(
'
Notebook Folding
'
,
()
=>
{
const
instantiationService
=
new
TestInstantiationService
();
const
instantiationService
=
new
TestInstantiationService
();
...
@@ -96,8 +95,7 @@ suite('Notebook Folding', () => {
...
@@ -96,8 +95,7 @@ suite('Notebook Folding', () => {
[[
'
var e = 7;
'
],
'
markdown
'
,
CellKind
.
Markdown
,
[],
{}],
[[
'
var e = 7;
'
],
'
markdown
'
,
CellKind
.
Markdown
,
[],
{}],
],
],
(
editor
,
viewModel
)
=>
{
(
editor
,
viewModel
)
=>
{
const
firstCell
=
viewModel
.
viewCells
[
0
]
as
CellViewModel
;
viewModel
.
setFoldingState
(
0
,
CellFoldingState
.
Collapsed
);
viewModel
.
setFoldingState
(
firstCell
,
CellFoldingState
.
Collapsed
);
assert
.
deepEqual
(
viewModel
.
getHiddenRanges
(),
[
assert
.
deepEqual
(
viewModel
.
getHiddenRanges
(),
[
{
start
:
1
,
length
:
6
}
{
start
:
1
,
length
:
6
}
]);
]);
...
@@ -118,8 +116,7 @@ suite('Notebook Folding', () => {
...
@@ -118,8 +116,7 @@ suite('Notebook Folding', () => {
[[
'
var e = 7;
'
],
'
markdown
'
,
CellKind
.
Markdown
,
[],
{}],
[[
'
var e = 7;
'
],
'
markdown
'
,
CellKind
.
Markdown
,
[],
{}],
],
],
(
editor
,
viewModel
)
=>
{
(
editor
,
viewModel
)
=>
{
const
thirdCell
=
viewModel
.
viewCells
[
2
]
as
CellViewModel
;
viewModel
.
setFoldingState
(
2
,
CellFoldingState
.
Collapsed
);
viewModel
.
setFoldingState
(
thirdCell
,
CellFoldingState
.
Collapsed
);
assert
.
deepEqual
(
viewModel
.
getHiddenRanges
(),
[
assert
.
deepEqual
(
viewModel
.
getHiddenRanges
(),
[
{
start
:
3
,
length
:
2
}
{
start
:
3
,
length
:
2
}
]);
]);
...
@@ -140,8 +137,7 @@ suite('Notebook Folding', () => {
...
@@ -140,8 +137,7 @@ suite('Notebook Folding', () => {
[[
'
var e = 7;
'
],
'
markdown
'
,
CellKind
.
Markdown
,
[],
{}],
[[
'
var e = 7;
'
],
'
markdown
'
,
CellKind
.
Markdown
,
[],
{}],
],
],
(
editor
,
viewModel
)
=>
{
(
editor
,
viewModel
)
=>
{
const
thirdCell
=
viewModel
.
viewCells
[
2
]
as
CellViewModel
;
viewModel
.
setFoldingState
(
2
,
CellFoldingState
.
Collapsed
);
viewModel
.
setFoldingState
(
thirdCell
,
CellFoldingState
.
Collapsed
);
assert
.
deepEqual
(
viewModel
.
getHiddenRanges
(),
[
assert
.
deepEqual
(
viewModel
.
getHiddenRanges
(),
[
{
start
:
3
,
length
:
4
}
{
start
:
3
,
length
:
4
}
]);
]);
...
@@ -164,19 +160,19 @@ suite('Notebook Folding', () => {
...
@@ -164,19 +160,19 @@ suite('Notebook Folding', () => {
[[
'
var e = 7;
'
],
'
markdown
'
,
CellKind
.
Markdown
,
[],
{}],
[[
'
var e = 7;
'
],
'
markdown
'
,
CellKind
.
Markdown
,
[],
{}],
],
],
(
editor
,
viewModel
)
=>
{
(
editor
,
viewModel
)
=>
{
viewModel
.
setFoldingState
(
viewModel
.
viewCells
[
0
]
as
CellViewModel
,
CellFoldingState
.
Collapsed
);
viewModel
.
setFoldingState
(
0
,
CellFoldingState
.
Collapsed
);
assert
.
deepEqual
(
viewModel
.
getHiddenRanges
(),
[
assert
.
deepEqual
(
viewModel
.
getHiddenRanges
(),
[
{
start
:
1
,
length
:
1
}
{
start
:
1
,
length
:
1
}
]);
]);
viewModel
.
setFoldingState
(
viewModel
.
viewCells
[
5
]
as
CellViewModel
,
CellFoldingState
.
Collapsed
);
viewModel
.
setFoldingState
(
5
,
CellFoldingState
.
Collapsed
);
viewModel
.
setFoldingState
(
viewModel
.
viewCells
[
2
]
as
CellViewModel
,
CellFoldingState
.
Collapsed
);
viewModel
.
setFoldingState
(
2
,
CellFoldingState
.
Collapsed
);
assert
.
deepEqual
(
viewModel
.
getHiddenRanges
(),
[
assert
.
deepEqual
(
viewModel
.
getHiddenRanges
(),
[
{
start
:
1
,
length
:
1
},
{
start
:
1
,
length
:
1
},
{
start
:
3
,
length
:
4
}
{
start
:
3
,
length
:
4
}
]);
]);
viewModel
.
setFoldingState
(
viewModel
.
viewCells
[
2
]
as
CellViewModel
,
CellFoldingState
.
Expanded
);
viewModel
.
setFoldingState
(
2
,
CellFoldingState
.
Expanded
);
assert
.
deepEqual
(
viewModel
.
getHiddenRanges
(),
[
assert
.
deepEqual
(
viewModel
.
getHiddenRanges
(),
[
{
start
:
1
,
length
:
1
},
{
start
:
1
,
length
:
1
},
{
start
:
6
,
length
:
1
}
{
start
:
6
,
length
:
1
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录