Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
c549ec81
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,发现更多精彩内容 >>
提交
c549ec81
编写于
6月 09, 2016
作者:
R
Ravi Chande
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
More CR feedback
Fix tests
上级
a4281a3f
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
6 addition
and
21 deletion
+6
-21
src/EditorFeatures/Core/Extensibility/Completion/CompletionHelper.cs
...eatures/Core/Extensibility/Completion/CompletionHelper.cs
+2
-17
src/EditorFeatures/VisualBasic/Completion/VisualBasicCompletionHelper.vb
...res/VisualBasic/Completion/VisualBasicCompletionHelper.vb
+1
-1
src/Features/Core/Portable/Completion/CommonCompletionItem.cs
...Features/Core/Portable/Completion/CommonCompletionItem.cs
+1
-1
src/Features/Core/Portable/Completion/Providers/SymbolCompletionItem.cs
...ore/Portable/Completion/Providers/SymbolCompletionItem.cs
+1
-1
src/Features/VisualBasic/Portable/Completion/CompletionProviders/EnumCompletionProvider.vb
.../Completion/CompletionProviders/EnumCompletionProvider.vb
+1
-1
未找到文件。
src/EditorFeatures/Core/Extensibility/Completion/CompletionHelper.cs
浏览文件 @
c549ec81
...
...
@@ -190,18 +190,13 @@ private PatternMatcher GetFallbackPatternMatcher(string value)
/// text, or false if it is not better.
/// </summary>
public
virtual
bool
IsBetterFilterMatch
(
CompletionItem
item1
,
CompletionItem
item2
,
string
filterText
,
CompletionTrigger
trigger
,
CompletionFilterReason
filterReason
,
ImmutableArray
<
string
>
recentItems
=
default
(
ImmutableArray
<
string
>))
{
return
IsBetterFilterMatchWorker
(
item1
,
item2
,
filterText
,
recentItems
,
comparePriorityBeforeCapitalization
:
false
);
}
protected
bool
IsBetterFilterMatchWorker
(
CompletionItem
item1
,
CompletionItem
item2
,
string
filterText
,
ImmutableArray
<
string
>
recentItems
,
bool
comparePriorityBeforeCapitalization
)
{
var
match1
=
GetMatch
(
item1
,
filterText
);
var
match2
=
GetMatch
(
item2
,
filterText
);
if
(
match1
!=
null
&&
match2
!=
null
)
{
var
result
=
CompareMatches
(
match1
.
Value
,
match2
.
Value
,
item1
,
item2
,
comparePriorityBeforeCapitalization
);
var
result
=
CompareMatches
(
match1
.
Value
,
match2
.
Value
,
item1
,
item2
);
if
(
result
!=
0
)
{
return
result
<
0
;
...
...
@@ -275,7 +270,7 @@ protected int GetPrefixLength(string text, string pattern)
return
x
;
}
protected
int
CompareMatches
(
PatternMatch
match1
,
PatternMatch
match2
,
CompletionItem
item1
,
CompletionItem
item2
,
bool
comparePriorityBeforeCapitalization
)
protected
int
CompareMatches
(
PatternMatch
match1
,
PatternMatch
match2
,
CompletionItem
item1
,
CompletionItem
item2
)
{
int
diff
;
...
...
@@ -301,16 +296,6 @@ protected int CompareMatches(PatternMatch match1, PatternMatch match2, Completio
return
-
1
;
}
// preselected items are prefered
if
(
comparePriorityBeforeCapitalization
&&
item1
.
Rules
.
MatchPriority
>
item2
.
Rules
.
MatchPriority
)
{
return
-
1
;
}
else
if
(
comparePriorityBeforeCapitalization
&&
item2
.
Rules
.
MatchPriority
>
item1
.
Rules
.
MatchPriority
)
{
return
1
;
}
diff
=
PatternMatch
.
CompareCase
(
match1
,
match2
);
if
(
diff
!=
0
)
{
...
...
src/EditorFeatures/VisualBasic/Completion/VisualBasicCompletionHelper.vb
浏览文件 @
c549ec81
...
...
@@ -87,7 +87,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.Completion
End
If
End
If
Return
IsBetterFilterMatchWorker
(
item1
,
item2
,
filterText
,
recentItems
,
comparePriorityBeforeCapitalization
:
=
True
)
Return
MyBase
.
IsBetterFilterMatch
(
item1
,
item2
,
filterText
,
trigger
,
filterReason
,
recentItems
)
End
Function
Public
Overrides
Function
ShouldSoftSelectItem
(
item
As
CompletionItem
,
filterText
As
String
,
trigger
As
CompletionTrigger
)
As
Boolean
...
...
src/Features/Core/Portable/Completion/CommonCompletionItem.cs
浏览文件 @
c549ec81
...
...
@@ -54,7 +54,7 @@ internal static class CommonCompletionItem
}
rules
=
rules
??
CompletionItemRules
.
Default
;
rules
=
rules
.
WithMatchPriority
(
matchPriority
??
MatchPriority
.
Default
)
rules
=
rules
.
WithMatchPriority
(
matchPriority
.
GetValueOrDefault
()
)
.
WithFormatOnCommit
(
shouldFormatOnCommit
);
return
CompletionItem
.
Create
(
...
...
src/Features/Core/Portable/Completion/Providers/SymbolCompletionItem.cs
浏览文件 @
c549ec81
...
...
@@ -94,7 +94,7 @@ internal static class SymbolCompletionItem
insertionText
:
insertionText
,
glyph
:
glyph
,
filterText
:
filterText
,
matchPriority
:
matchPriority
??
MatchPriority
.
Default
,
matchPriority
:
matchPriority
.
GetValueOrDefault
()
,
supportedPlatforms
:
supportedPlatforms
,
isArgumentName
:
isArgumentName
,
properties
:
properties
,
...
...
src/Features/VisualBasic/Portable/Completion/CompletionProviders/EnumCompletionProvider.vb
浏览文件 @
c549ec81
...
...
@@ -119,7 +119,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Completion.Providers
contextPosition
:
=
context
.
Position
,
descriptionPosition
:
=
position
,
sortText
:
=
insertionText
,
matchPriority
:
=
MatchPriority
.
Preselect
,
matchPriority
:
=
If
(
preselect
,
MatchPriority
.
Preselect
,
MatchPriority
.
Default
)
,
supportedPlatforms
:
=
supportedPlatformData
,
rules
:
=
GetCompletionItemRules
(
symbols
,
context
))
End
Function
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录