Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
4e74318b
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,发现更多精彩内容 >>
提交
4e74318b
编写于
6月 02, 2015
作者:
C
Charles Stoner
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Restore original fix for #2639
上级
1540509e
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
145 addition
and
3 deletion
+145
-3
src/EditorFeatures/CSharpTest/Completion/CompletionProviders/SymbolCompletionProviderTests.cs
...tion/CompletionProviders/SymbolCompletionProviderTests.cs
+137
-0
src/Workspaces/Core/Portable/Recommendations/AbstractRecommendationService.cs
...Portable/Recommendations/AbstractRecommendationService.cs
+8
-3
未找到文件。
src/EditorFeatures/CSharpTest/Completion/CompletionProviders/SymbolCompletionProviderTests.cs
浏览文件 @
4e74318b
...
...
@@ -7235,6 +7235,143 @@ class MyAttribute : Attribute
VerifyItemExists
(
markup
,
"My"
);
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
Completion
)]
public
void
InstanceMembersFromBaseOuterType
()
{
var
markup
=
@"abstract class Test
{
private int _field;
public sealed class InnerTest : Test
{
public void SomeTest()
{
$$
}
}
}"
;
VerifyItemExists
(
markup
,
"_field"
);
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
Completion
)]
public
void
InstanceMembersFromBaseOuterType2
()
{
var
markup
=
@"class C<T>
{
void M() { }
class N : C<int>
{
void Test()
{
$$ // M recommended and accessible
}
class NN
{
void Test2()
{
// M inaccessible and not recommended
}
}
}
}"
;
VerifyItemExists
(
markup
,
"M"
);
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
Completion
)]
public
void
InstanceMembersFromBaseOuterType3
()
{
var
markup
=
@"class C<T>
{
void M() { }
class N : C<int>
{
void Test()
{
M(); // M recommended and accessible
}
class NN
{
void Test2()
{
$$ // M inaccessible and not recommended
}
}
}
}"
;
VerifyItemIsAbsent
(
markup
,
"M"
);
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
Completion
)]
public
void
InstanceMembersFromBaseOuterType4
()
{
var
markup
=
@"class C<T>
{
void M() { }
class N : C<int>
{
void Test()
{
M(); // M recommended and accessible
}
class NN : N
{
void Test2()
{
$$ // M accessible and recommended.
}
}
}
}"
;
VerifyItemExists
(
markup
,
"M"
);
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
Completion
)]
public
void
InstanceMembersFromBaseOuterType5
()
{
var
markup
=
@"
class D
{
public void Q() { }
}
class C<T> : D
{
class N
{
void Test()
{
$$
}
}
}"
;
VerifyItemIsAbsent
(
markup
,
"Q"
);
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
Completion
)]
public
void
InstanceMembersFromBaseOuterType6
()
{
var
markup
=
@"
class Base<T>
{
public int X;
}
class Derived : Base<int>
{
class Nested
{
void Test()
{
$$
}
}
}"
;
VerifyItemIsAbsent
(
markup
,
"X"
);
}
[
WorkItem
(
983367
)]
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
Completion
)]
public
void
NoTypeParametersDefinedInCrefs
()
...
...
src/Workspaces/Core/Portable/Recommendations/AbstractRecommendationService.cs
浏览文件 @
4e74318b
...
...
@@ -79,10 +79,15 @@ private bool ShouldIncludeSymbol(ISymbol symbol, AbstractSyntaxContext context,
// In an expression or statement context, we don't want to display instance members declared in outer containing types.
if
((
context
.
IsStatementContext
||
context
.
IsAnyExpressionContext
)
&&
!
symbol
.
IsStatic
&&
isMember
&&
context
.
GetOuterTypes
(
cancellationToken
).
Contains
(
symbol
.
ContainingType
))
isMember
)
{
return
false
;
var
outerTypesAndBases
=
context
.
GetOuterTypes
(
cancellationToken
).
SelectMany
(
o
=>
o
.
GetBaseTypesAndThis
()).
Select
(
t
=>
t
.
OriginalDefinition
);
var
containingTypeOriginalDefinition
=
symbol
.
ContainingType
.
OriginalDefinition
;
if
(
outerTypesAndBases
.
Contains
(
containingTypeOriginalDefinition
))
{
var
enclosingType
=
context
.
SemanticModel
.
GetEnclosingNamedType
(
context
.
LeftToken
.
SpanStart
,
cancellationToken
);
return
enclosingType
!=
null
&&
enclosingType
.
GetBaseTypes
().
Select
(
b
=>
b
.
OriginalDefinition
).
Contains
(
containingTypeOriginalDefinition
);
}
}
var
namespaceSymbol
=
symbol
as
INamespaceSymbol
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录