Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
d00ad812
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,发现更多精彩内容 >>
提交
d00ad812
编写于
10月 25, 2017
作者:
M
Martin Aeschlimann
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
indentRanges: no need for indent ranges
上级
7eb1b4ca
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
49 addition
and
31 deletion
+49
-31
src/vs/editor/common/model/textModelWithTokens.ts
src/vs/editor/common/model/textModelWithTokens.ts
+46
-28
src/vs/editor/test/common/model/textModelWithTokens.test.ts
src/vs/editor/test/common/model/textModelWithTokens.test.ts
+3
-3
未找到文件。
src/vs/editor/common/model/textModelWithTokens.ts
浏览文件 @
d00ad812
...
...
@@ -861,39 +861,57 @@ export class TextModelWithTokens extends TextModel implements editorCommon.IToke
throw
new
Error
(
'
Illegal value
'
+
lineNumber
+
'
for `lineNumber`
'
);
}
let
indentRanges
=
this
.
_getIndentRanges
();
for
(
let
i
=
indentRanges
.
length
-
1
;
i
>=
0
;
i
--
)
{
let
startLineNumber
=
indentRanges
.
getStartLineNumber
(
i
);
if
(
startLineNumber
===
lineNumber
)
{
return
this
.
_toValidLineIndentGuide
(
lineNumber
,
Math
.
ceil
(
indentRanges
.
getIndent
(
i
)
/
this
.
_options
.
tabSize
));
}
let
endLineNumber
=
indentRanges
.
getEndLineNumber
(
i
);
if
(
startLineNumber
<
lineNumber
&&
lineNumber
<=
endLineNumber
)
{
return
this
.
_toValidLineIndentGuide
(
lineNumber
,
1
+
Math
.
floor
(
indentRanges
.
getIndent
(
i
)
/
this
.
_options
.
tabSize
));
const
currentIndent
=
this
.
_lines
[
lineNumber
-
1
].
getIndentLevel
();
if
(
currentIndent
>=
0
)
{
// This line has content (besides whitespace)
// Use the line's indent
return
Math
.
ceil
(
currentIndent
/
this
.
_options
.
tabSize
);
}
let
belowIndent
=
-
1
;
for
(
let
lineIndex
=
lineNumber
,
lineCount
=
this
.
getLineCount
();
lineIndex
<
lineCount
;
lineIndex
++
)
{
let
indent
=
this
.
_lines
[
lineIndex
].
getIndentLevel
();
if
(
indent
>=
0
)
{
belowIndent
=
indent
;
break
;
}
if
(
endLineNumber
+
1
===
lineNumber
)
{
let
bestIndent
=
indentRanges
.
getIndent
(
i
);
while
(
i
>
0
)
{
i
--
;
endLineNumber
=
indentRanges
.
getEndLineNumber
(
i
);
if
(
endLineNumber
+
1
===
lineNumber
)
{
bestIndent
=
indentRanges
.
getIndent
(
i
);
}
}
return
this
.
_toValidLineIndentGuide
(
lineNumber
,
Math
.
ceil
(
bestIndent
/
this
.
_options
.
tabSize
));
}
let
aboveIndent
=
-
1
;
for
(
let
lineIndex
=
lineNumber
-
2
;
lineIndex
>=
0
;
lineIndex
--
)
{
let
indent
=
this
.
_lines
[
lineIndex
].
getIndentLevel
();
if
(
indent
>=
0
)
{
aboveIndent
=
indent
;
break
;
}
}
return
0
;
}
if
(
aboveIndent
===
-
1
||
belowIndent
===
-
1
)
{
// At the top or bottom of the file
return
0
;
}
if
(
aboveIndent
<
belowIndent
)
{
// we are inside the region above
return
(
1
+
Math
.
floor
(
aboveIndent
/
this
.
_options
.
tabSize
));
}
if
(
aboveIndent
===
belowIndent
)
{
// we are in between two regions
return
Math
.
ceil
(
belowIndent
/
this
.
_options
.
tabSize
);
}
private
_toValidLineIndentGuide
(
lineNumber
:
number
,
indentGuide
:
number
):
number
{
let
lineIndentLevel
=
this
.
_lines
[
lineNumber
-
1
].
getIndentLevel
();
if
(
lineIndentLevel
===
-
1
)
{
return
indentGuide
;
let
foldingRules
=
LanguageConfigurationRegistry
.
getFoldingRules
(
this
.
_languageIdentifier
.
id
);
let
offSide
=
foldingRules
&&
foldingRules
.
offSide
;
if
(
offSide
)
{
// same level as region below
return
Math
.
ceil
(
belowIndent
/
this
.
_options
.
tabSize
);
}
else
{
// we are inside the region that ends below
return
(
1
+
Math
.
floor
(
belowIndent
/
this
.
_options
.
tabSize
));
}
let
maxIndentGuide
=
Math
.
ceil
(
lineIndentLevel
/
this
.
_options
.
tabSize
);
return
Math
.
min
(
maxIndentGuide
,
indentGuide
);
}
}
src/vs/editor/test/common/model/textModelWithTokens.test.ts
浏览文件 @
d00ad812
...
...
@@ -408,8 +408,8 @@ suite('TextModel.getLineIndentGuide', () => {
test
(
'
getLineIndentGuide decreasing indent
'
,
()
=>
{
assertIndentGuides
([
[
0
,
'
A
'
],
[
0
,
'
A
'
],
[
1
,
'
A
'
],
[
1
,
'
A
'
],
[
0
,
'
A
'
],
]);
});
...
...
@@ -450,7 +450,7 @@ suite('TextModel.getLineIndentGuide', () => {
[
1
,
''
],
[
1
,
'
void foo() {
'
],
[
1
,
'
'
],
[
1
,
'
return 1;
'
],
[
2
,
'
return 1;
'
],
[
1
,
'
}
'
],
[
1
,
'
'
],
[
0
,
'
}
'
],
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录