Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
386dd3b5
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,发现更多精彩内容 >>
提交
386dd3b5
编写于
6月 17, 2020
作者:
G
Gen Lu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix completion of ext-method for receiver of type parameter type
上级
ca892c8d
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
68 addition
and
9 deletion
+68
-9
src/EditorFeatures/CSharpTest/Completion/CompletionProviders/ExtensionMethodImportCompletionProviderTests.cs
...Providers/ExtensionMethodImportCompletionProviderTests.cs
+46
-0
src/Features/Core/Portable/Completion/Providers/ImportCompletionProvider/ExtensionMethodImportCompletionHelper.cs
...mpletionProvider/ExtensionMethodImportCompletionHelper.cs
+22
-9
未找到文件。
src/EditorFeatures/CSharpTest/Completion/CompletionProviders/ExtensionMethodImportCompletionProviderTests.cs
浏览文件 @
386dd3b5
...
...
@@ -1491,6 +1491,52 @@ public void M(int{rank} x)
inlineDescription
:
"Foo"
);
}
[
InlineData
(
ReferenceType
.
Project
)]
[
InlineData
(
ReferenceType
.
Metadata
)]
[
Theory
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
Completion
)]
public
async
Task
TestGenericReceiverTypeWithConstraint
(
ReferenceType
refType
)
{
var
refDoc
=
@"
using System;
namespace NS1
{
public class C1 {}
}
namespace NS2
{
public static class Extensions
{
public static bool ExtentionMethod(this NS1.C1 c) => false;
}
}"
;
var
srcDoc
=
@"
namespace NS1
{
public class C2
{
public void M<T>(T x) where T : C1
{
x.$$
}
}
}"
;
var
markup
=
refType
switch
{
ReferenceType
.
Project
=>
CreateMarkupForProjectWithProjectReference
(
srcDoc
,
refDoc
,
LanguageNames
.
CSharp
,
LanguageNames
.
CSharp
),
ReferenceType
.
Metadata
=>
CreateMarkupForProjectWithMetadataReference
(
srcDoc
,
refDoc
,
LanguageNames
.
CSharp
,
LanguageNames
.
CSharp
),
_
=>
null
,
};
await
VerifyImportItemExistsAsync
(
markup
,
"ExtentionMethod"
,
glyph
:
(
int
)
Glyph
.
ExtensionMethodPublic
,
inlineDescription
:
"NS2"
);
}
private
Task
VerifyImportItemExistsAsync
(
string
markup
,
string
expectedItem
,
int
glyph
,
string
inlineDescription
,
string
displayTextSuffix
=
null
,
string
expectedDescriptionOrNull
=
null
)
=>
VerifyItemExistsAsync
(
markup
,
expectedItem
,
displayTextSuffix
:
displayTextSuffix
,
glyph
:
glyph
,
inlineDescription
:
inlineDescription
,
expectedDescriptionOrNull
:
expectedDescriptionOrNull
);
...
...
src/Features/Core/Portable/Completion/Providers/ImportCompletionProvider/ExtensionMethodImportCompletionHelper.cs
浏览文件 @
386dd3b5
...
...
@@ -75,18 +75,31 @@ async Task<(ImmutableArray<SerializableImportCompletionItem>, StatisticCounter)>
private
static
ImmutableArray
<
string
>
GetReceiverTypeNames
(
ITypeSymbol
receiverTypeSymbol
)
{
using
var
_
=
PooledHashSet
<
string
>.
GetInstance
(
out
var
allTypeNamesBuilder
);
AddNamesForTypeWorker
(
receiverTypeSymbol
,
allTypeNamesBuilder
);
return
allTypeNamesBuilder
.
ToImmutableArray
();
allTypeNamesBuilder
.
Add
(
GetReceiverTypeName
(
receiverTypeSymbol
));
allTypeNamesBuilder
.
AddRange
(
receiverTypeSymbol
.
GetBaseTypes
().
Select
(
t
=>
t
.
MetadataName
));
allTypeNamesBuilder
.
AddRange
(
receiverTypeSymbol
.
GetAllInterfacesIncludingThis
().
Select
(
t
=>
t
.
MetadataName
));
// interface doesn't inherit from object, but is implicitly convertible to object type.
if
(
receiverTypeSymbol
.
IsInterfaceType
())
static
void
AddNamesForTypeWorker
(
ITypeSymbol
receiverTypeSymbol
,
PooledHashSet
<
string
>
builder
)
{
allTypeNamesBuilder
.
Add
(
nameof
(
Object
));
}
if
(
receiverTypeSymbol
is
ITypeParameterSymbol
typeParameter
)
{
foreach
(
var
constraintType
in
typeParameter
.
ConstraintTypes
)
{
AddNamesForTypeWorker
(
constraintType
,
builder
);
}
}
else
{
builder
.
Add
(
GetReceiverTypeName
(
receiverTypeSymbol
));
builder
.
AddRange
(
receiverTypeSymbol
.
GetBaseTypes
().
Select
(
t
=>
t
.
MetadataName
));
builder
.
AddRange
(
receiverTypeSymbol
.
GetAllInterfacesIncludingThis
().
Select
(
t
=>
t
.
MetadataName
));
return
allTypeNamesBuilder
.
ToImmutableArray
();
// interface doesn't inherit from object, but is implicitly convertible to object type.
if
(
receiverTypeSymbol
.
IsInterfaceType
())
{
builder
.
Add
(
nameof
(
Object
));
}
}
}
}
private
static
string
GetReceiverTypeName
(
ITypeSymbol
typeSymbol
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录