Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
81631348
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,发现更多精彩内容 >>
提交
81631348
编写于
5月 31, 2016
作者:
K
Kevin Pilch-Bisson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix merge issues that made filtering completion to nothing crash VS
Fixes #11559
上级
b532942b
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
7 addition
and
6 deletion
+7
-6
src/EditorFeatures/Core/Implementation/IntelliSense/Completion/Controller.cs
...Core/Implementation/IntelliSense/Completion/Controller.cs
+2
-2
src/EditorFeatures/Core/Implementation/IntelliSense/Completion/Model.cs
...ures/Core/Implementation/IntelliSense/Completion/Model.cs
+0
-3
src/EditorFeatures/Core/Implementation/IntelliSense/Completion/Presentation/RoslynCompletionSet.cs
...telliSense/Completion/Presentation/RoslynCompletionSet.cs
+5
-1
未找到文件。
src/EditorFeatures/Core/Implementation/IntelliSense/Completion/Controller.cs
浏览文件 @
81631348
...
...
@@ -125,8 +125,8 @@ internal override void OnModelUpdated(Model modelOpt)
else
{
var
selectedItem
=
modelOpt
.
SelectedItem
;
var
viewSpan
=
modelOpt
.
GetViewBufferSpan
(
selectedItem
.
Item
.
Span
);
var
triggerSpan
=
modelOpt
.
GetCurrentSpanInSnapshot
(
viewSpan
,
this
.
TextView
.
TextSnapshot
)
var
viewSpan
=
selectedItem
==
null
?
(
ViewTextSpan
?)
null
:
modelOpt
.
GetViewBufferSpan
(
selectedItem
.
Item
.
Span
);
var
triggerSpan
=
viewSpan
==
null
?
null
:
modelOpt
.
GetCurrentSpanInSnapshot
(
viewSpan
.
Value
,
this
.
TextView
.
TextSnapshot
)
.
CreateTrackingSpan
(
SpanTrackingMode
.
EdgeInclusive
);
sessionOpt
.
PresenterSession
.
PresentItems
(
...
...
src/EditorFeatures/Core/Implementation/IntelliSense/Completion/Model.cs
浏览文件 @
81631348
...
...
@@ -62,10 +62,7 @@ internal class Model
ITrackingPoint
commitSpanEndPoint
,
bool
dismissIfEmpty
)
{
Contract
.
ThrowIfNull
(
selectedItem
);
Contract
.
ThrowIfFalse
(
totalItems
.
Length
!=
0
,
"Must have at least one item."
);
Contract
.
ThrowIfFalse
(
filteredItems
.
Length
!=
0
,
"Must have at least one filtered item."
);
Contract
.
ThrowIfFalse
(
filteredItems
.
Contains
(
selectedItem
)
||
defaultSuggestionModeItem
==
selectedItem
,
"Selected item must be in filtered items."
);
_disconnectedBufferGraph
=
disconnectedBufferGraph
;
this
.
OriginalList
=
originalList
;
...
...
src/EditorFeatures/Core/Implementation/IntelliSense/Completion/Presentation/RoslynCompletionSet.cs
浏览文件 @
81631348
...
...
@@ -87,12 +87,16 @@ void ICompletionSet.SetTrackingSpan(ITrackingSpan trackingSpan)
var
applicableToText
=
this
.
ApplicableTo
.
GetText
(
this
.
ApplicableTo
.
TextBuffer
.
CurrentSnapshot
);
var
filteredSuggestionModeItem
=
new
SimplePresentationItem
(
SimplePresentationItem
filteredSuggestionModeItem
=
null
;
if
(
selectedItem
!=
null
)
{
filteredSuggestionModeItem
=
new
SimplePresentationItem
(
CompletionItem
.
Create
(
displayText
:
applicableToText
,
span
:
this
.
ApplicableTo
.
GetSpan
(
this
.
ApplicableTo
.
TextBuffer
.
CurrentSnapshot
).
Span
.
ToTextSpan
()),
selectedItem
.
CompletionService
,
isSuggestionModeItem
:
true
);
}
var
showBuilder
=
suggestionMode
||
presetBuilder
!=
null
;
var
bestSuggestionModeItem
=
applicableToText
.
Length
>
0
?
filteredSuggestionModeItem
:
presetBuilder
??
filteredSuggestionModeItem
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录