Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
abd5a763
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,发现更多精彩内容 >>
提交
abd5a763
编写于
9月 20, 2017
作者:
M
Martin Aeschlimann
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Test offSide indentRanges (for #3353)
上级
de68414a
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
41 addition
and
21 deletion
+41
-21
src/vs/editor/common/model/indentRanges.ts
src/vs/editor/common/model/indentRanges.ts
+2
-5
src/vs/editor/common/model/textModelWithTokens.ts
src/vs/editor/common/model/textModelWithTokens.ts
+3
-1
src/vs/editor/test/common/model/indentRanges.test.ts
src/vs/editor/test/common/model/indentRanges.test.ts
+36
-15
未找到文件。
src/vs/editor/common/model/indentRanges.ts
浏览文件 @
abd5a763
...
...
@@ -5,8 +5,7 @@
'
use strict
'
;
import
{
ITokenizedModel
}
from
'
vs/editor/common/editorCommon
'
;
import
{
LanguageConfigurationRegistry
}
from
'
vs/editor/common/modes/languageConfigurationRegistry
'
;
import
{
IModel
}
from
'
vs/editor/common/editorCommon
'
;
export
class
IndentRange
{
_indentRangeBrand
:
void
;
...
...
@@ -30,11 +29,9 @@ export class IndentRange {
}
}
export
function
computeRanges
(
model
:
I
TokenizedModel
,
minimumRangeSize
:
number
=
1
):
IndentRange
[]
{
export
function
computeRanges
(
model
:
I
Model
,
offSide
:
boolean
,
minimumRangeSize
:
number
=
1
):
IndentRange
[]
{
let
result
:
IndentRange
[]
=
[];
let
foldingRules
=
LanguageConfigurationRegistry
.
getFoldingRules
(
model
.
getLanguageIdentifier
().
id
);
let
offSide
=
foldingRules
&&
foldingRules
.
indendationBasedFolding
&&
foldingRules
.
indendationBasedFolding
.
offSide
;
let
previousRegions
:
{
indent
:
number
,
line
:
number
}[]
=
[];
previousRegions
.
push
({
indent
:
-
1
,
line
:
model
.
getLineCount
()
+
1
});
// sentinel, to make sure there's at least one entry
...
...
src/vs/editor/common/model/textModelWithTokens.ts
浏览文件 @
abd5a763
...
...
@@ -843,7 +843,9 @@ export class TextModelWithTokens extends TextModel implements editorCommon.IToke
private
_getIndentRanges
():
IndentRange
[]
{
if
(
!
this
.
_indentRanges
)
{
this
.
_indentRanges
=
computeRanges
(
this
);
let
foldingRules
=
LanguageConfigurationRegistry
.
getFoldingRules
(
this
.
_languageIdentifier
.
id
);
let
offSide
=
foldingRules
&&
foldingRules
.
indendationBasedFolding
&&
foldingRules
.
indendationBasedFolding
.
offSide
;
this
.
_indentRanges
=
computeRanges
(
this
,
offSide
);
}
return
this
.
_indentRanges
;
}
...
...
src/vs/editor/test/common/model/indentRanges.test.ts
浏览文件 @
abd5a763
...
...
@@ -16,9 +16,9 @@ export interface IndentRange {
}
suite
(
'
Indentation Folding
'
,
()
=>
{
function
assertRanges
(
lines
:
string
[],
expected
:
IndentRange
[]):
void
{
function
assertRanges
(
lines
:
string
[],
expected
:
IndentRange
[]
,
offside
):
void
{
let
model
=
Model
.
createFromString
(
lines
.
join
(
'
\n
'
));
let
actual
=
computeRanges
(
model
);
let
actual
=
computeRanges
(
model
,
offside
);
actual
.
sort
((
r1
,
r2
)
=>
r1
.
startLineNumber
-
r2
.
startLineNumber
);
assert
.
deepEqual
(
actual
,
expected
);
model
.
dispose
();
...
...
@@ -29,40 +29,48 @@ suite('Indentation Folding', () => {
}
test
(
'
Fold one level
'
,
()
=>
{
assertRanges
(
[
let
range
=
[
'
A
'
,
'
A
'
,
'
A
'
,
'
A
'
],
[
r
(
1
,
4
,
0
)]);
];
assertRanges
(
range
,
[
r
(
1
,
4
,
0
)],
true
);
assertRanges
(
range
,
[
r
(
1
,
4
,
0
)],
false
);
});
test
(
'
Fold two levels
'
,
()
=>
{
assertRanges
(
[
let
range
=
[
'
A
'
,
'
A
'
,
'
A
'
,
'
A
'
,
'
A
'
],
[
r
(
1
,
5
,
0
),
r
(
3
,
5
,
2
)]);
];
assertRanges
(
range
,
[
r
(
1
,
5
,
0
),
r
(
3
,
5
,
2
)],
true
);
assertRanges
(
range
,
[
r
(
1
,
5
,
0
),
r
(
3
,
5
,
2
)],
false
);
});
test
(
'
Fold three levels
'
,
()
=>
{
assertRanges
(
[
let
range
=
[
'
A
'
,
'
A
'
,
'
A
'
,
'
A
'
,
'
A
'
],
[
r
(
1
,
4
,
0
),
r
(
2
,
4
,
2
),
r
(
3
,
4
,
4
)]);
];
assertRanges
(
range
,
[
r
(
1
,
4
,
0
),
r
(
2
,
4
,
2
),
r
(
3
,
4
,
4
)],
true
);
assertRanges
(
range
,
[
r
(
1
,
4
,
0
),
r
(
2
,
4
,
2
),
r
(
3
,
4
,
4
)],
false
);
});
test
(
'
Fold decreasing indent
'
,
()
=>
{
assertRanges
(
[
let
range
=
[
'
A
'
,
'
A
'
,
'
A
'
],
[]);
];
assertRanges
(
range
,
[],
true
);
assertRanges
(
range
,
[],
false
);
});
test
(
'
Fold Java
'
,
()
=>
{
...
...
@@ -80,7 +88,7 @@ suite('Indentation Folding', () => {
/*11*/
'
interface B {
'
,
/*12*/
'
void bar();
'
,
/*13*/
'
}
'
,
],
[
r
(
1
,
9
,
0
),
r
(
2
,
4
,
2
),
r
(
7
,
8
,
2
),
r
(
11
,
12
,
0
)]);
],
[
r
(
1
,
9
,
0
),
r
(
2
,
4
,
2
),
r
(
7
,
8
,
2
),
r
(
11
,
12
,
0
)]
,
false
);
});
test
(
'
Fold Javadoc
'
,
()
=>
{
...
...
@@ -92,9 +100,9 @@ suite('Indentation Folding', () => {
/* 5*/
'
void foo() {
'
,
/* 6*/
'
}
'
,
/* 7*/
'
}
'
,
],
[
r
(
1
,
3
,
0
),
r
(
4
,
6
,
0
)]);
],
[
r
(
1
,
3
,
0
),
r
(
4
,
6
,
0
)]
,
false
);
});
test
(
'
Fold Whitespace
'
,
()
=>
{
test
(
'
Fold Whitespace
Java
'
,
()
=>
{
assertRanges
([
/* 1*/
'
class A {
'
,
/* 2*/
''
,
...
...
@@ -104,7 +112,20 @@ suite('Indentation Folding', () => {
/* 6*/
'
}
'
,
/* 7*/
'
'
,
/* 8*/
'
}
'
,
],
[
r
(
1
,
7
,
0
),
r
(
3
,
5
,
2
)]);
],
[
r
(
1
,
7
,
0
),
r
(
3
,
5
,
2
)],
false
);
});
test
(
'
Fold Whitespace Python
'
,
()
=>
{
assertRanges
([
/* 1*/
'
def a:
'
,
/* 2*/
'
pass
'
,
/* 3*/
'
'
,
/* 4*/
'
def b:
'
,
/* 5*/
'
pass
'
,
/* 6*/
'
'
,
/* 7*/
'
'
,
/* 8*/
'
def c: # since there was a deintent here
'
],
[
r
(
1
,
5
,
0
),
r
(
4
,
5
,
2
)],
true
);
});
test
(
'
Fold Tabs
'
,
()
=>
{
...
...
@@ -117,6 +138,6 @@ suite('Indentation Folding', () => {
/* 6*/
'
\t
}
'
,
/* 7*/
'
'
,
/* 8*/
'
}
'
,
],
[
r
(
1
,
7
,
0
),
r
(
3
,
5
,
4
)]);
],
[
r
(
1
,
7
,
0
),
r
(
3
,
5
,
4
)]
,
false
);
});
});
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录