Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
c337a61f
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,发现更多精彩内容 >>
提交
c337a61f
编写于
1月 04, 2017
作者:
R
Ravi Chande
提交者:
GitHub
1月 04, 2017
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #15424 from rchande/suggestionmodetrigger
Trigger C# suggestion mode except for snippets
上级
5b03b09a
09fc3ef8
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
24 addition
and
15 deletion
+24
-15
src/EditorFeatures/CSharpTest/Completion/CompletionProviders/SuggestionModeCompletionProviderTests.cs
...pletionProviders/SuggestionModeCompletionProviderTests.cs
+21
-12
src/EditorFeatures/Test2/IntelliSense/CSharpCompletionCommandHandlerTests.vb
...Test2/IntelliSense/CSharpCompletionCommandHandlerTests.vb
+2
-2
src/Features/CSharp/Portable/Completion/SuggestionMode/CSharpSuggestionModeCompletionProvider.cs
.../SuggestionMode/CSharpSuggestionModeCompletionProvider.cs
+1
-1
未找到文件。
src/EditorFeatures/CSharpTest/Completion/CompletionProviders/SuggestionModeCompletionProviderTests.cs
浏览文件 @
c337a61f
...
@@ -7,6 +7,7 @@
...
@@ -7,6 +7,7 @@
using
Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces
;
using
Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces
;
using
Roslyn.Test.Utilities
;
using
Roslyn.Test.Utilities
;
using
Xunit
;
using
Xunit
;
using
System.Collections.Generic
;
namespace
Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Completion.CompletionProviders
namespace
Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Completion.CompletionProviders
{
{
...
@@ -758,8 +759,15 @@ private async Task VerifyWorkerAsync(string markup, bool isBuilder)
...
@@ -758,8 +759,15 @@ private async Task VerifyWorkerAsync(string markup, bool isBuilder)
private
async
Task
CheckResultsAsync
(
Document
document
,
int
position
,
bool
isBuilder
)
private
async
Task
CheckResultsAsync
(
Document
document
,
int
position
,
bool
isBuilder
)
{
{
var
triggerInfo
=
CompletionTrigger
.
CreateInsertionTrigger
(
'a'
);
var
triggerInfos
=
new
List
<
CompletionTrigger
>();
triggerInfos
.
Add
(
CompletionTrigger
.
CreateInsertionTrigger
(
'a'
));
triggerInfos
.
Add
(
CompletionTrigger
.
Default
);
triggerInfos
.
Add
(
CompletionTrigger
.
CreateDeletionTrigger
(
'z'
));
var
service
=
GetCompletionService
(
document
.
Project
.
Solution
.
Workspace
);
var
service
=
GetCompletionService
(
document
.
Project
.
Solution
.
Workspace
);
foreach
(
var
triggerInfo
in
triggerInfos
)
{
var
completionList
=
await
service
.
GetContextAsync
(
var
completionList
=
await
service
.
GetContextAsync
(
service
.
ExclusiveProviders
?[
0
],
document
,
position
,
triggerInfo
,
service
.
ExclusiveProviders
?[
0
],
document
,
position
,
triggerInfo
,
options
:
null
,
cancellationToken
:
CancellationToken
.
None
);
options
:
null
,
cancellationToken
:
CancellationToken
.
None
);
...
@@ -778,4 +786,5 @@ private async Task CheckResultsAsync(Document document, int position, bool isBui
...
@@ -778,4 +786,5 @@ private async Task CheckResultsAsync(Document document, int position, bool isBui
}
}
}
}
}
}
}
}
}
src/EditorFeatures/Test2/IntelliSense/CSharpCompletionCommandHandlerTests.vb
浏览文件 @
c337a61f
...
@@ -290,7 +290,7 @@ class Variable
...
@@ -290,7 +290,7 @@ class Variable
}
]]
></
Document
>
)
}
]]
></
Document
>
)
state
.
SendInvokeCompletionList
()
state
.
SendInvokeCompletionList
()
Await
state
.
AssertSelectedCompletionItem
(
displayText
:
=
"as"
,
isHardSelected
:
=
Tru
e
)
Await
state
.
AssertSelectedCompletionItem
(
displayText
:
=
"as"
,
isHardSelected
:
=
Fals
e
)
End
Using
End
Using
End
Function
End
Function
...
@@ -307,7 +307,7 @@ class Variable
...
@@ -307,7 +307,7 @@ class Variable
}
]]
></
Document
>
)
}
]]
></
Document
>
)
state
.
SendInvokeCompletionList
()
state
.
SendInvokeCompletionList
()
Await
state
.
AssertSelectedCompletionItem
(
displayText
:
=
"as"
,
isHardSelected
:
=
Tru
e
)
Await
state
.
AssertSelectedCompletionItem
(
displayText
:
=
"as"
,
isHardSelected
:
=
Fals
e
)
End
Using
End
Using
End
Function
End
Function
...
...
src/Features/CSharp/Portable/Completion/SuggestionMode/CSharpSuggestionModeCompletionProvider.cs
浏览文件 @
c337a61f
...
@@ -21,7 +21,7 @@ internal class CSharpSuggestionModeCompletionProvider : SuggestionModeCompletion
...
@@ -21,7 +21,7 @@ internal class CSharpSuggestionModeCompletionProvider : SuggestionModeCompletion
protected
override
async
Task
<
CompletionItem
>
GetSuggestionModeItemAsync
(
protected
override
async
Task
<
CompletionItem
>
GetSuggestionModeItemAsync
(
Document
document
,
int
position
,
TextSpan
itemSpan
,
CompletionTrigger
trigger
,
CancellationToken
cancellationToken
=
default
(
CancellationToken
))
Document
document
,
int
position
,
TextSpan
itemSpan
,
CompletionTrigger
trigger
,
CancellationToken
cancellationToken
=
default
(
CancellationToken
))
{
{
if
(
trigger
.
Kind
==
CompletionTriggerKind
.
Insertion
)
if
(
trigger
.
Kind
!=
CompletionTriggerKind
.
Snippets
)
{
{
var
text
=
await
document
.
GetTextAsync
(
cancellationToken
).
ConfigureAwait
(
false
);
var
text
=
await
document
.
GetTextAsync
(
cancellationToken
).
ConfigureAwait
(
false
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录