Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
181cd201
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,发现更多精彩内容 >>
提交
181cd201
编写于
7月 13, 2017
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
improve whitespace detection when searching for word at position, #29102
上级
1501dbe6
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
45 addition
and
6 deletion
+45
-6
src/vs/editor/common/model/wordHelper.ts
src/vs/editor/common/model/wordHelper.ts
+17
-6
src/vs/workbench/test/electron-browser/api/extHostDocumentData.test.ts
...nch/test/electron-browser/api/extHostDocumentData.test.ts
+28
-0
未找到文件。
src/vs/editor/common/model/wordHelper.ts
浏览文件 @
181cd201
...
...
@@ -57,10 +57,6 @@ export function ensureValidWordDefinition(wordDefinition?: RegExp): RegExp {
function
getWordAtPosFast
(
column
:
number
,
wordDefinition
:
RegExp
,
text
:
string
,
textOffset
:
number
):
IWordAtPosition
{
// find whitespace enclosed text around column and match from there
if
(
wordDefinition
.
test
(
'
'
))
{
return
getWordAtPosSlow
(
column
,
wordDefinition
,
text
,
textOffset
);
}
let
pos
=
column
-
1
-
textOffset
;
let
start
=
text
.
lastIndexOf
(
'
'
,
pos
-
1
)
+
1
;
let
end
=
text
.
indexOf
(
'
'
,
pos
);
...
...
@@ -113,10 +109,25 @@ function getWordAtPosSlow(column: number, wordDefinition: RegExp, text: string,
}
export
function
getWordAtText
(
column
:
number
,
wordDefinition
:
RegExp
,
text
:
string
,
textOffset
:
number
):
IWordAtPosition
{
const
result
=
getWordAtPosFast
(
column
,
wordDefinition
,
text
,
textOffset
);
// if `words` can contain whitespace character we have to use the slow variant
// otherwise we use the fast variant of finding a word
wordDefinition
.
lastIndex
=
0
;
let
match
=
wordDefinition
.
exec
(
text
);
if
(
!
match
)
{
return
null
;
}
// todo@joh the `match` could already be the (first) word
const
ret
=
match
[
0
].
indexOf
(
'
'
)
>=
0
// did match a word which contains a space character -> use slow word find
?
getWordAtPosSlow
(
column
,
wordDefinition
,
text
,
textOffset
)
// sane word definition -> use fast word find
:
getWordAtPosFast
(
column
,
wordDefinition
,
text
,
textOffset
);
// both (getWordAtPosFast and getWordAtPosSlow) leave the wordDefinition-RegExp
// in an undefined state and to not confuse other users of the wordDefinition
// we reset the lastIndex
wordDefinition
.
lastIndex
=
0
;
return
result
;
return
ret
;
}
src/vs/workbench/test/electron-browser/api/extHostDocumentData.test.ts
浏览文件 @
181cd201
...
...
@@ -269,6 +269,34 @@ suite('ExtHostDocumentData', () => {
range
=
data
.
document
.
getWordRangeAtPosition
(
new
Position
(
0
,
11
),
/yy/
);
assert
.
equal
(
range
,
undefined
);
});
test
(
'
getWordRangeAtPosition doesn
\'
t quite use the regex as expected, #29102
'
,
function
()
{
data
=
new
ExtHostDocumentData
(
undefined
,
URI
.
file
(
''
),
[
'
some text here
'
,
'
/** foo bar */
'
,
'
function() {
'
,
'
"far boo"
'
,
'
}
'
],
'
\n
'
,
'
text
'
,
1
,
false
);
let
range
=
data
.
document
.
getWordRangeAtPosition
(
new
Position
(
0
,
0
),
/
\/\*
.+
\*\/
/
);
assert
.
equal
(
range
,
undefined
);
range
=
data
.
document
.
getWordRangeAtPosition
(
new
Position
(
1
,
0
),
/
\/\*
.+
\*\/
/
);
assert
.
equal
(
range
.
start
.
line
,
1
);
assert
.
equal
(
range
.
start
.
character
,
0
);
assert
.
equal
(
range
.
end
.
line
,
1
);
assert
.
equal
(
range
.
end
.
character
,
14
);
range
=
data
.
document
.
getWordRangeAtPosition
(
new
Position
(
3
,
0
),
/
(
"|'
)
.*
\1
/
);
assert
.
equal
(
range
,
undefined
);
range
=
data
.
document
.
getWordRangeAtPosition
(
new
Position
(
3
,
1
),
/
(
"|'
)
.*
\1
/
);
assert
.
equal
(
range
.
start
.
line
,
3
);
assert
.
equal
(
range
.
start
.
character
,
1
);
assert
.
equal
(
range
.
end
.
line
,
3
);
assert
.
equal
(
range
.
end
.
character
,
10
);
});
});
enum
AssertDocumentLineMappingDirection
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录