Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
e8befb9f
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,发现更多精彩内容 >>
提交
e8befb9f
编写于
6月 05, 2018
作者:
R
rebornix
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
textModel validate position handles NaN.
上级
cc84951f
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
27 addition
and
2 deletion
+27
-2
src/vs/editor/common/model/textModel.ts
src/vs/editor/common/model/textModel.ts
+9
-2
src/vs/editor/test/common/model/textModel.test.ts
src/vs/editor/test/common/model/textModel.test.ts
+18
-0
未找到文件。
src/vs/editor/common/model/textModel.ts
浏览文件 @
e8befb9f
...
...
@@ -898,6 +898,9 @@ export class TextModel extends Disposable implements model.ITextModel {
* @param strict Do NOT allow a position inside a high-low surrogate pair
*/
private
_isValidPosition
(
lineNumber
:
number
,
column
:
number
,
strict
:
boolean
):
boolean
{
if
(
isNaN
(
lineNumber
))
{
return
false
;
}
if
(
lineNumber
<
1
)
{
return
false
;
...
...
@@ -908,6 +911,10 @@ export class TextModel extends Disposable implements model.ITextModel {
return
false
;
}
if
(
isNaN
(
column
))
{
return
false
;
}
if
(
column
<
1
)
{
return
false
;
}
...
...
@@ -933,8 +940,8 @@ export class TextModel extends Disposable implements model.ITextModel {
* @param strict Do NOT allow a position inside a high-low surrogate pair
*/
private
_validatePosition
(
_lineNumber
:
number
,
_column
:
number
,
strict
:
boolean
):
Position
{
const
lineNumber
=
Math
.
floor
(
typeof
_lineNumber
===
'
number
'
?
_lineNumber
:
1
);
const
column
=
Math
.
floor
(
typeof
_column
===
'
number
'
?
_column
:
1
);
const
lineNumber
=
Math
.
floor
(
(
typeof
_lineNumber
===
'
number
'
&&
!
isNaN
(
_lineNumber
))
?
_lineNumber
:
1
);
const
column
=
Math
.
floor
(
(
typeof
_column
===
'
number
'
&&
!
isNaN
(
_column
))
?
_column
:
1
);
const
lineCount
=
this
.
_buffer
.
getLineCount
();
if
(
lineNumber
<
1
)
{
...
...
src/vs/editor/test/common/model/textModel.test.ts
浏览文件 @
e8befb9f
...
...
@@ -620,6 +620,18 @@ suite('Editor Model - TextModel', () => {
});
test
(
'
validatePosition handle NaN.
'
,
()
=>
{
let
m
=
TextModel
.
createFromString
(
'
line one
\n
line two
'
);
assert
.
deepEqual
(
m
.
validatePosition
(
new
Position
(
NaN
,
1
)),
new
Position
(
1
,
1
));
assert
.
deepEqual
(
m
.
validatePosition
(
new
Position
(
1
,
NaN
)),
new
Position
(
1
,
1
));
assert
.
deepEqual
(
m
.
validatePosition
(
new
Position
(
NaN
,
NaN
)),
new
Position
(
1
,
1
));
assert
.
deepEqual
(
m
.
validatePosition
(
new
Position
(
2
,
NaN
)),
new
Position
(
2
,
1
));
assert
.
deepEqual
(
m
.
validatePosition
(
new
Position
(
NaN
,
3
)),
new
Position
(
1
,
3
));
});
test
(
'
validateRange around high-low surrogate pairs 1
'
,
()
=>
{
let
m
=
TextModel
.
createFromString
(
'
a📚b
'
);
...
...
@@ -829,6 +841,12 @@ suite('Editor Model - TextModel', () => {
assert
.
equal
(
model
.
getLineLastNonWhitespaceColumn
(
11
),
0
,
'
11
'
);
assert
.
equal
(
model
.
getLineLastNonWhitespaceColumn
(
12
),
0
,
'
12
'
);
});
test
(
'
#50471. getValueInRange with invalid range
'
,
()
=>
{
let
m
=
TextModel
.
createFromString
(
'
My First Line
\r\n
My Second Line
\r\n
My Third Line
'
);
assert
.
equal
(
m
.
getValueInRange
(
new
Range
(
1
,
NaN
,
1
,
3
)),
'
My
'
);
assert
.
equal
(
m
.
getValueInRange
(
new
Range
(
NaN
,
NaN
,
NaN
,
NaN
)),
''
);
});
});
suite
(
'
TextModel.mightContainRTL
'
,
()
=>
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录