Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
022d70ee
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,发现更多精彩内容 >>
提交
022d70ee
编写于
5月 08, 2017
作者:
C
CyrusNajmabadi
提交者:
GitHub
5月 08, 2017
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #19338 from CyrusNajmabadi/completionInEnumInitializer
Offer enum completion inside an enum member's initializer
上级
54de6be4
22ea8679
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
148 addition
and
7 deletion
+148
-7
src/EditorFeatures/CSharpTest/Completion/CompletionProviders/EnumAndCompletionListTagCompletionProviderTests.cs
...viders/EnumAndCompletionListTagCompletionProviderTests.cs
+102
-4
src/Features/CSharp/Portable/Completion/CompletionProviders/EnumAndCompletionListTagCompletionProvider.cs
...onProviders/EnumAndCompletionListTagCompletionProvider.cs
+46
-3
未找到文件。
src/EditorFeatures/CSharpTest/Completion/CompletionProviders/EnumAndCompletionListTagCompletionProviderTests.cs
浏览文件 @
022d70ee
...
...
@@ -16,9 +16,7 @@ public EnumAndCompletionListTagCompletionProviderTests(CSharpTestWorkspaceFixtur
}
internal
override
CompletionProvider
CreateCompletionProvider
()
{
return
new
EnumAndCompletionListTagCompletionProvider
();
}
=>
new
EnumAndCompletionListTagCompletionProvider
();
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
Completion
)]
public
async
Task
NullableEnum
()
...
...
@@ -518,5 +516,105 @@ enum E
"
;
await
VerifyNoItemsExistAsync
(
markup
);
}
[
WorkItem
(
5419
,
"https://github.com/dotnet/roslyn/issues/5419"
)]
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
Completion
)]
public
async
Task
TestInEnumInitializer1
()
{
var
markup
=
@"using System;
[Flags]
internal enum ProjectTreeWriterOptions
{
None,
Tags,
FilePath,
Capabilities,
Visibility,
AllProperties = FilePath | Visibility | $$
}"
;
await
VerifyItemExistsAsync
(
markup
,
"ProjectTreeWriterOptions"
);
}
[
WorkItem
(
5419
,
"https://github.com/dotnet/roslyn/issues/5419"
)]
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
Completion
)]
public
async
Task
TestInEnumInitializer2
()
{
var
markup
=
@"using System;
[Flags]
internal enum ProjectTreeWriterOptions
{
None,
Tags,
FilePath,
Capabilities,
Visibility,
AllProperties = FilePath | $$ Visibility
}"
;
await
VerifyItemExistsAsync
(
markup
,
"ProjectTreeWriterOptions"
);
}
[
WorkItem
(
5419
,
"https://github.com/dotnet/roslyn/issues/5419"
)]
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
Completion
)]
public
async
Task
TestInEnumInitializer3
()
{
var
markup
=
@"using System;
[Flags]
internal enum ProjectTreeWriterOptions
{
None,
Tags,
FilePath,
Capabilities,
Visibility,
AllProperties = FilePath | $$ | Visibility
}"
;
await
VerifyItemExistsAsync
(
markup
,
"ProjectTreeWriterOptions"
);
}
[
WorkItem
(
5419
,
"https://github.com/dotnet/roslyn/issues/5419"
)]
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
Completion
)]
public
async
Task
TestInEnumInitializer4
()
{
var
markup
=
@"using System;
[Flags]
internal enum ProjectTreeWriterOptions
{
None,
Tags,
FilePath,
Capabilities,
Visibility,
AllProperties = FilePath ^ $$
}"
;
await
VerifyItemExistsAsync
(
markup
,
"ProjectTreeWriterOptions"
);
}
[
WorkItem
(
5419
,
"https://github.com/dotnet/roslyn/issues/5419"
)]
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
Completion
)]
public
async
Task
TestInEnumInitializer5
()
{
var
markup
=
@"using System;
[Flags]
internal enum ProjectTreeWriterOptions
{
None,
Tags,
FilePath,
Capabilities,
Visibility,
AllProperties = FilePath & $$
}"
;
await
VerifyItemExistsAsync
(
markup
,
"ProjectTreeWriterOptions"
);
}
}
}
}
\ No newline at end of file
src/Features/CSharp/Portable/Completion/CompletionProviders/EnumAndCompletionListTagCompletionProvider.cs
浏览文件 @
022d70ee
...
...
@@ -91,7 +91,9 @@ public override async Task ProvideCompletionsAsync(CompletionContext context)
if
(
type
.
TypeKind
!=
TypeKind
.
Enum
)
{
type
=
GetCompletionListType
(
type
,
semanticModel
.
GetEnclosingNamedType
(
position
,
cancellationToken
),
semanticModel
.
Compilation
);
type
=
TryGetEnumTypeInEnumInitializer
(
semanticModel
,
token
,
type
,
cancellationToken
)
??
TryGetCompletionListType
(
type
,
semanticModel
.
GetEnclosingNamedType
(
position
,
cancellationToken
),
semanticModel
.
Compilation
);
if
(
type
==
null
)
{
return
;
...
...
@@ -104,7 +106,7 @@ public override async Task ProvideCompletionsAsync(CompletionContext context)
}
// Does type have any aliases?
ISymbol
alias
=
await
type
.
FindApplicableAlias
(
position
,
semanticModel
,
cancellationToken
).
ConfigureAwait
(
false
);
var
alias
=
await
type
.
FindApplicableAlias
(
position
,
semanticModel
,
cancellationToken
).
ConfigureAwait
(
false
);
var
displayService
=
document
.
GetLanguageService
<
ISymbolDisplayService
>();
var
displayText
=
alias
!=
null
...
...
@@ -128,6 +130,47 @@ public override async Task ProvideCompletionsAsync(CompletionContext context)
}
}
private
ITypeSymbol
TryGetEnumTypeInEnumInitializer
(
SemanticModel
semanticModel
,
SyntaxToken
token
,
ITypeSymbol
type
,
CancellationToken
cancellationToken
)
{
// https://github.com/dotnet/roslyn/issues/5419
//
// 14.3: "Within an enum member initializer, values of other enum members are always
// treated as having the type of their underlying type"
// i.e. if we have "enum E { X, Y, Z = X |
// then we want to offer the enum after the |. However, the compiler will report this
// as an 'int' type, not the enum type.
// See if we're after a common enum-combining operator.
if
(
token
.
Kind
()
==
SyntaxKind
.
BarToken
||
token
.
Kind
()
==
SyntaxKind
.
AmpersandToken
||
token
.
Kind
()
==
SyntaxKind
.
CaretToken
)
{
// See if the type we're looking at is the underlying type for the enum we're contained in.
var
containingType
=
semanticModel
.
GetEnclosingNamedType
(
token
.
SpanStart
,
cancellationToken
);
if
(
containingType
?.
TypeKind
==
TypeKind
.
Enum
&&
type
.
Equals
(
containingType
.
EnumUnderlyingType
))
{
// If so, walk back to the token before the operator token and see if it binds to a member
// of this enum.
var
previousToken
=
token
.
GetPreviousToken
();
var
symbol
=
semanticModel
.
GetSymbolInfo
(
previousToken
.
Parent
,
cancellationToken
).
Symbol
;
if
(
symbol
?.
Kind
==
SymbolKind
.
Field
&&
containingType
.
Equals
(
symbol
.
ContainingType
))
{
// If so, then offer this as a place for enum completion for the enum we're currently
// inside of.
return
containingType
;
}
}
}
return
null
;
}
protected
override
Task
<
CompletionDescription
>
GetDescriptionWorkerAsync
(
Document
document
,
CompletionItem
item
,
CancellationToken
cancellationToken
)
=>
SymbolCompletionItem
.
GetDescriptionAsync
(
item
,
document
,
cancellationToken
);
...
...
@@ -136,7 +179,7 @@ protected override Task<CompletionDescription> GetDescriptionWorkerAsync(Documen
.
WithMatchPriority
(
MatchPriority
.
Preselect
)
.
WithSelectionBehavior
(
CompletionItemSelectionBehavior
.
HardSelection
);
private
INamedTypeSymbol
GetCompletionListType
(
ITypeSymbol
type
,
INamedTypeSymbol
within
,
Compilation
compilation
)
private
INamedTypeSymbol
Try
GetCompletionListType
(
ITypeSymbol
type
,
INamedTypeSymbol
within
,
Compilation
compilation
)
{
// PERF: None of the SpecialTypes include <completionlist> tags,
// so we don't even need to load the documentation.
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录