Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
2295b67e
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,发现更多精彩内容 >>
提交
2295b67e
编写于
9月 28, 2017
作者:
M
Martin Aeschlimann
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Regions are not folding correctly in off-side languages. Fixes #35091
上级
93dfa359
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
31 addition
and
13 deletion
+31
-13
src/vs/editor/common/model/indentRanges.ts
src/vs/editor/common/model/indentRanges.ts
+10
-13
src/vs/editor/test/common/model/indentRanges.test.ts
src/vs/editor/test/common/model/indentRanges.test.ts
+21
-0
未找到文件。
src/vs/editor/common/model/indentRanges.ts
浏览文件 @
2295b67e
...
...
@@ -32,7 +32,7 @@ export class IndentRange {
}
}
interface
PreviousRegion
{
indent
:
number
;
line
:
number
;
marker
:
RegExp
;
};
interface
PreviousRegion
{
indent
:
number
;
line
:
number
;
marker
:
boolean
;
};
export
function
computeRanges
(
model
:
ITextModel
,
offSide
:
boolean
,
markers
?:
FoldingMarkers
,
minimumRangeSize
:
number
=
1
):
IndentRange
[]
{
...
...
@@ -44,13 +44,13 @@ export function computeRanges(model: ITextModel, offSide: boolean, markers?: Fol
}
let
previousRegions
:
PreviousRegion
[]
=
[];
previousRegions
.
push
({
indent
:
-
1
,
line
:
model
.
getLineCount
()
+
1
,
marker
:
null
});
// sentinel, to make sure there's at least one entry
previousRegions
.
push
({
indent
:
-
1
,
line
:
model
.
getLineCount
()
+
1
,
marker
:
false
});
// sentinel, to make sure there's at least one entry
for
(
let
line
=
model
.
getLineCount
();
line
>
0
;
line
--
)
{
let
indent
=
model
.
getIndentLevel
(
line
);
let
previous
=
previousRegions
[
previousRegions
.
length
-
1
];
if
(
indent
===
-
1
)
{
if
(
offSide
)
{
if
(
offSide
&&
!
previous
.
marker
)
{
// for offSide languages, empty lines are associated to the next block
previous
.
line
=
line
;
}
...
...
@@ -60,23 +60,20 @@ export function computeRanges(model: ITextModel, offSide: boolean, markers?: Fol
if
(
pattern
&&
(
m
=
model
.
getLineContent
(
line
).
match
(
pattern
)))
{
// folding pattern match
if
(
m
[
1
])
{
// start pattern match
if
(
previous
.
indent
>=
0
&&
!
previous
.
marker
)
{
// discard all regions until the folding pattern
do
{
previousRegions
.
pop
();
previous
=
previousRegions
[
previousRegions
.
length
-
1
];
}
while
(
previous
.
indent
>=
0
&&
!
previous
.
marker
);
// discard all regions until the folding pattern
while
(
previous
.
indent
>=
0
&&
!
previous
.
marker
)
{
previousRegions
.
pop
();
previous
=
previousRegions
[
previousRegions
.
length
-
1
];
}
if
(
previous
.
marker
)
{
// new folding range from pattern, includes the end line
result
.
push
(
new
IndentRange
(
line
,
previous
.
line
,
indent
,
true
));
previous
.
marker
=
null
;
previous
.
marker
=
false
;
previous
.
indent
=
indent
;
previous
.
line
=
line
;
}
}
else
{
// end pattern match
previousRegions
.
push
({
indent
:
-
2
,
line
,
marker
:
pattern
});
previousRegions
.
push
({
indent
:
-
2
,
line
,
marker
:
true
});
}
}
else
{
if
(
previous
.
indent
>
indent
)
{
...
...
@@ -96,7 +93,7 @@ export function computeRanges(model: ITextModel, offSide: boolean, markers?: Fol
previous
.
line
=
line
;
}
else
{
// previous.indent < indent
// new region with a bigger indent
previousRegions
.
push
({
indent
,
line
,
marker
:
null
});
previousRegions
.
push
({
indent
,
line
,
marker
:
false
});
}
}
}
...
...
src/vs/editor/test/common/model/indentRanges.test.ts
浏览文件 @
2295b67e
...
...
@@ -270,4 +270,25 @@ suite('Folding with regions', () => {
/* 6*/
'
return;
'
,
],
[
r
(
1
,
4
,
0
,
true
),
r
(
5
,
6
,
2
)],
false
,
markers
);
});
test
(
'
With off-side
'
,
()
=>
{
assertRanges
([
/* 1*/
'
#region
'
,
/* 2*/
'
'
,
/* 3*/
''
,
/* 4*/
'
#endregion
'
,
/* 5*/
''
,
],
[
r
(
1
,
4
,
0
,
true
)],
true
,
markers
);
});
test
(
'
Nested with off-side
'
,
()
=>
{
assertRanges
([
/* 1*/
'
#region
'
,
/* 2*/
'
'
,
/* 3*/
'
#region
'
,
/* 4*/
''
,
/* 5*/
'
#endregion
'
,
/* 6*/
''
,
/* 7*/
'
#endregion
'
,
/* 8*/
''
,
],
[
r
(
1
,
7
,
0
,
true
),
r
(
3
,
5
,
0
,
true
)],
true
,
markers
);
});
});
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录