Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
688b5347
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,发现更多精彩内容 >>
提交
688b5347
编写于
9月 09, 2020
作者:
G
Gen Lu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
show void keyword in completion after readonly in struct
上级
00edbcef
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
29 addition
and
11 deletion
+29
-11
src/EditorFeatures/CSharpTest2/Recommendations/VoidKeywordRecommenderTests.cs
...SharpTest2/Recommendations/VoidKeywordRecommenderTests.cs
+20
-0
src/Features/CSharp/Portable/Completion/KeywordRecommenders/VoidKeywordRecommender.cs
.../Completion/KeywordRecommenders/VoidKeywordRecommender.cs
+9
-11
未找到文件。
src/EditorFeatures/CSharpTest2/Recommendations/VoidKeywordRecommenderTests.cs
浏览文件 @
688b5347
...
...
@@ -772,5 +772,25 @@ class C
{
delegate*$$"
);
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
KeywordRecommending
)]
[
WorkItem
(
43295
,
"https://github.com/dotnet/roslyn/issues/43295"
)]
public
async
Task
TestAfterReadonlyInStruct
()
{
await
VerifyKeywordAsync
(
@"
struct S
{
public readonly $$"
);
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
KeywordRecommending
)]
[
WorkItem
(
43295
,
"https://github.com/dotnet/roslyn/issues/43295"
)]
public
async
Task
TestNotAfterReadonlyInClass
()
{
await
VerifyAbsenceAsync
(
@"
class C
{
public readonly $$"
);
}
}
}
src/Features/CSharp/Portable/Completion/KeywordRecommenders/VoidKeywordRecommender.cs
浏览文件 @
688b5347
...
...
@@ -12,7 +12,7 @@ namespace Microsoft.CodeAnalysis.CSharp.Completion.KeywordRecommenders
{
internal
class
VoidKeywordRecommender
:
AbstractSyntacticSingleKeywordRecommender
{
private
static
readonly
ISet
<
SyntaxKind
>
s_validModifiers
=
new
HashSet
<
SyntaxKind
>(
SyntaxFacts
.
EqualityComparer
)
private
static
readonly
ISet
<
SyntaxKind
>
s_valid
ClassInterfaceRecord
Modifiers
=
new
HashSet
<
SyntaxKind
>(
SyntaxFacts
.
EqualityComparer
)
{
SyntaxKind
.
NewKeyword
,
SyntaxKind
.
PublicKeyword
,
...
...
@@ -29,6 +29,11 @@ internal class VoidKeywordRecommender : AbstractSyntacticSingleKeywordRecommende
SyntaxKind
.
AsyncKeyword
};
private
static
readonly
ISet
<
SyntaxKind
>
s_validStructModifiers
=
new
HashSet
<
SyntaxKind
>(
s_validClassInterfaceRecordModifiers
,
SyntaxFacts
.
EqualityComparer
)
{
SyntaxKind
.
ReadOnlyKeyword
,
};
public
VoidKeywordRecommender
()
:
base
(
SyntaxKind
.
VoidKeyword
)
{
...
...
@@ -101,15 +106,8 @@ private static bool IsUnsafeLocalVariableDeclarationContext(CSharpSyntaxContext
}
private
static
bool
IsMemberReturnTypeContext
(
int
position
,
CSharpSyntaxContext
context
,
CancellationToken
cancellationToken
)
{
var
syntaxTree
=
context
.
SyntaxTree
;
return
syntaxTree
.
IsGlobalMemberDeclarationContext
(
position
,
SyntaxKindSet
.
AllGlobalMemberModifiers
,
cancellationToken
)
||
context
.
IsMemberDeclarationContext
(
validModifiers
:
s_validModifiers
,
validTypeDeclarations
:
SyntaxKindSet
.
ClassInterfaceStructRecordTypeDeclarations
,
canBePartial
:
true
,
cancellationToken
:
cancellationToken
);
}
=>
context
.
SyntaxTree
.
IsGlobalMemberDeclarationContext
(
position
,
SyntaxKindSet
.
AllGlobalMemberModifiers
,
cancellationToken
)
||
context
.
IsMemberDeclarationContext
(
validModifiers
:
s_validClassInterfaceRecordModifiers
,
validTypeDeclarations
:
SyntaxKindSet
.
ClassInterfaceRecordTypeDeclarations
,
canBePartial
:
true
,
cancellationToken
)
||
context
.
IsMemberDeclarationContext
(
validModifiers
:
s_validStructModifiers
,
validTypeDeclarations
:
SyntaxKindSet
.
StructOnlyTypeDeclarations
,
canBePartial
:
false
,
cancellationToken
);
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录