Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
709ee871
R
roslyn
项目概览
lwm1986
/
roslyn
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
roslyn
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
709ee871
编写于
2月 19, 2015
作者:
C
Cyrus Najmabadi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix spelling the pattern matcher, and avoid recomputing already computed data.
上级
92476dc1
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
10 addition
and
11 deletion
+10
-11
src/Features/Core/Shared/Utilities/PatternMatcher.cs
src/Features/Core/Shared/Utilities/PatternMatcher.cs
+10
-11
未找到文件。
src/Features/Core/Shared/Utilities/PatternMatcher.cs
浏览文件 @
709ee871
...
...
@@ -138,7 +138,7 @@ public TextChunk(string text)
private
readonly
bool
_invalidPattern
;
private
readonly
Segment
_fullPatternSegment
;
private
readonly
Segment
[]
_dotSeparatedSeg
e
ments
;
private
readonly
Segment
[]
_dotSeparatedSegments
;
private
readonly
Dictionary
<
string
,
List
<
TextSpan
>>
_stringToWordSpans
=
new
Dictionary
<
string
,
List
<
TextSpan
>>();
private
readonly
Func
<
string
,
List
<
TextSpan
>>
_breakIntoWordSpans
=
StringBreaker
.
BreakIntoWordParts
;
...
...
@@ -165,13 +165,13 @@ public PatternMatcher(string pattern, CultureInfo culture, bool verbatimIdentifi
_compareInfo
=
culture
.
CompareInfo
;
_fullPatternSegment
=
new
Segment
(
pattern
,
verbatimIdentifierPrefixIsWordCharacter
);
_dotSeparatedSeg
e
ments
=
pattern
.
Split
(
DotCharacterArray
,
StringSplitOptions
.
RemoveEmptyEntries
)
_dotSeparatedSegments
=
pattern
.
Split
(
DotCharacterArray
,
StringSplitOptions
.
RemoveEmptyEntries
)
.
Select
(
text
=>
new
Segment
(
text
.
Trim
(),
verbatimIdentifierPrefixIsWordCharacter
))
.
ToArray
();
_invalidPattern
=
_dotSeparatedSeg
ements
.
Length
==
0
||
_dotSeparatedSege
ments
.
Any
(
s
=>
s
.
IsInvalid
);
_invalidPattern
=
_dotSeparatedSeg
ments
.
Length
==
0
||
_dotSeparatedSeg
ments
.
Any
(
s
=>
s
.
IsInvalid
);
}
public
bool
IsDottedPattern
=>
_dotSeparatedSeg
e
ments
.
Length
>
1
;
public
bool
IsDottedPattern
=>
_dotSeparatedSegments
.
Length
>
1
;
private
bool
SkipMatch
(
string
candidate
)
{
...
...
@@ -202,7 +202,7 @@ public IEnumerable<PatternMatch> GetMatchesForLastSegmentOfPattern(string candid
return
null
;
}
return
MatchSegment
(
candidate
,
_dotSeparatedSeg
e
ments
.
Last
());
return
MatchSegment
(
candidate
,
_dotSeparatedSegments
.
Last
());
}
/// <summary>
...
...
@@ -227,7 +227,7 @@ public IEnumerable<PatternMatch> GetMatches(string candidate, string dottedConta
// First, check that the last part of the dot separated pattern matches the name of the
// candidate. If not, then there's no point in proceeding and doing the more
// expensive work.
var
candidateMatch
=
MatchSegment
(
candidate
,
_dotSeparatedSeg
e
ments
.
Last
());
var
candidateMatch
=
MatchSegment
(
candidate
,
_dotSeparatedSegments
.
Last
());
if
(
candidateMatch
==
null
)
{
return
null
;
...
...
@@ -238,7 +238,7 @@ public IEnumerable<PatternMatch> GetMatches(string candidate, string dottedConta
// -1 because the last part was checked against the name, and only the rest
// of the parts are checked against the container.
if
(
_dotSeparatedSeg
e
ments
.
Length
-
1
>
containerParts
.
Length
)
if
(
_dotSeparatedSegments
.
Length
-
1
>
containerParts
.
Length
)
{
// There weren't enough container parts to match against the pattern parts.
// So this definitely doesn't match.
...
...
@@ -249,11 +249,11 @@ public IEnumerable<PatternMatch> GetMatches(string candidate, string dottedConta
// the dotted parts match up correctly.
var
totalMatch
=
candidateMatch
.
ToList
();
for
(
int
i
=
_dotSeparatedSeg
e
ments
.
Length
-
2
,
j
=
containerParts
.
Length
-
1
;
for
(
int
i
=
_dotSeparatedSegments
.
Length
-
2
,
j
=
containerParts
.
Length
-
1
;
i
>=
0
;
i
--,
j
--)
{
var
segment
=
_dotSeparatedSeg
e
ments
[
i
];
var
segment
=
_dotSeparatedSegments
[
i
];
var
containerName
=
containerParts
[
j
];
var
containerMatch
=
MatchSegment
(
containerName
,
segment
);
if
(
containerMatch
==
null
)
...
...
@@ -403,8 +403,7 @@ private static bool ContainsUpperCaseLetter(string pattern)
// (Pattern: fogbar, Candidate: quuxfogbarFogBar).
if
(
chunk
.
Text
.
Length
<
candidate
.
Length
)
{
var
firstInstance
=
_compareInfo
.
IndexOf
(
candidate
,
chunk
.
Text
,
CompareOptions
.
IgnoreCase
);
if
(
firstInstance
!=
-
1
&&
char
.
IsUpper
(
candidate
[
firstInstance
]))
if
(
index
!=
-
1
&&
char
.
IsUpper
(
candidate
[
index
]))
{
return
new
PatternMatch
(
PatternMatchKind
.
Substring
,
punctuationStripped
,
isCaseSensitive
:
false
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录