Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
dc1e3dfc
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,发现更多精彩内容 >>
提交
dc1e3dfc
编写于
2月 28, 2018
作者:
Š
Šimon Koníček
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Not offering 'when' after identifier if it's known to be a type using semantic checks
上级
37f9747c
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
122 addition
and
8 deletion
+122
-8
src/EditorFeatures/CSharpTest2/Recommendations/WhenKeywordRecommenderTests.cs
...SharpTest2/Recommendations/WhenKeywordRecommenderTests.cs
+79
-1
src/Features/CSharp/Portable/Completion/KeywordRecommenders/WhenKeywordRecommender.cs
.../Completion/KeywordRecommenders/WhenKeywordRecommender.cs
+43
-7
未找到文件。
src/EditorFeatures/CSharpTest2/Recommendations/WhenKeywordRecommenderTests.cs
浏览文件 @
dc1e3dfc
...
...
@@ -159,5 +159,83 @@ public async Task TestForSwitchCase_NotInEmptySwitchStatement()
{
await
VerifyAbsenceAsync
(
AddInsideMethod
(
@"switch (1) { $$ }"
));
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
KeywordRecommending
)]
public
async
Task
TestForSwitchCase_SemanticCheck_NotAfterPredefinedType
()
{
await
VerifyAbsenceAsync
(
@"
class SyntaxNode { }
class Color { }
class C
{
const Color Color = null;
void M() { switch (new object()) { case int $$ } }
}"
);
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
KeywordRecommending
)]
public
async
Task
TestForSwitchCase_SemanticCheck_NotAfterGenericType
()
{
await
VerifyAbsenceAsync
(
@"
class SyntaxNode { }
class Color { }
class C
{
const Color Color = null;
void M() { switch (new object()) { case Dictionary<string, int> $$ } }
}"
);
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
KeywordRecommending
)]
public
async
Task
TestForSwitchCase_SemanticCheck_NotAfterCustomType
()
{
await
VerifyAbsenceAsync
(
@"
class SyntaxNode { }
class Color { }
class C
{
const Color Color = null;
void M() { switch (new object()) { case SyntaxNode $$ } }
}"
);
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
KeywordRecommending
)]
public
async
Task
TestForSwitchCase_SemanticCheck_AfterColorColor
()
{
await
VerifyKeywordAsync
(
@"
class SyntaxNode { }
class Color { }
class C
{
const Color Color = null;
void M() { switch (new object()) { case Color $$ } }
}"
);
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
KeywordRecommending
)]
public
async
Task
TestForSwitchCase_SemanticCheck_AfterLocalConstant
()
{
await
VerifyKeywordAsync
(
@"
class SyntaxNode { }
class Color { }
class C
{
const Color Color = null;
void M() { const object local = null; switch (new object()) { case local $$ } }
}"
);
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
KeywordRecommending
)]
public
async
Task
TestForSwitchCase_SemanticCheck_AfterUnknownName
()
{
await
VerifyKeywordAsync
(
@"
class SyntaxNode { }
class Color { }
class C
{
const Color Color = null;
void M() { switch (new object()) { case unknown $$ } }
}"
);
}
}
}
src/Features/CSharp/Portable/Completion/KeywordRecommenders/WhenKeywordRecommender.cs
浏览文件 @
dc1e3dfc
...
...
@@ -15,12 +15,14 @@ public WhenKeywordRecommender()
{
}
protected
override
bool
IsValidContext
(
int
position
,
CSharpSyntaxContext
context
,
CancellationToken
cancellationToken
)
protected
override
bool
IsValidContext
(
int
position
,
CSharpSyntaxContext
context
,
CancellationToken
cancellationToken
)
{
return
context
.
IsCatchFilterContext
||
IsAfterCompleteExpressionOrPatternInCaseLabel
(
context
);
return
context
.
IsCatchFilterContext
||
IsAfterCompleteExpressionOrPatternInCaseLabel
(
context
,
cancellationToken
);
}
private
static
bool
IsAfterCompleteExpressionOrPatternInCaseLabel
(
CSharpSyntaxContext
context
)
private
static
bool
IsAfterCompleteExpressionOrPatternInCaseLabel
(
CSharpSyntaxContext
context
,
CancellationToken
cancellationToken
)
{
var
switchLabel
=
GetAncestorUntilStatement
<
SwitchLabelSyntax
>(
context
.
TargetToken
);
if
(
switchLabel
==
null
)
...
...
@@ -29,7 +31,7 @@ private static bool IsAfterCompleteExpressionOrPatternInCaseLabel(CSharpSyntaxCo
}
var
expressionOrPattern
=
switchLabel
.
ChildNodes
().
FirstOrDefault
();
if
(
expressionOrPattern
==
null
)
if
(
expressionOrPattern
==
null
)
// Oh well. It must have been a default label.
{
return
false
;
}
...
...
@@ -45,11 +47,45 @@ private static bool IsAfterCompleteExpressionOrPatternInCaseLabel(CSharpSyntaxCo
// case (1 + ) |
var
lastToken
=
expressionOrPattern
.
GetLastToken
(
includeZeroWidth
:
true
);
if
(
lastToken
.
IsMissing
)
{
return
false
;
}
// Only offer if we're at the last token of the expression/pattern, not inside it.
// Notice that when lastToken is missing, it will never compare equal to context.TargetToken
// since TargetToken skips missing tokens. So if this passes, we're all good!
return
context
.
TargetToken
==
lastToken
;
if
(
lastToken
==
context
.
TargetToken
)
{
return
NotATypeName
(
expressionOrPattern
);
}
else
if
(
lastToken
==
context
.
LeftToken
&&
expressionOrPattern
is
DeclarationPatternSyntax
declarationPattern
)
{
// case constant w|
// We might have a partially written 'when' keyword, which causes this to be parsed as a pattern.
// lastToken will be 'w' (LeftToken) as opposed to 'constant' (TargetToken). We handle this as a special case.
return
NotATypeName
(
declarationPattern
.
Type
);
}
return
false
;
bool
NotATypeName
(
SyntaxNode
node
)
{
// Syntactically, everything works out. We're in a pretty good spot to show 'when' now.
// But let's not do it just yet... Consider these cases:
// case SyntaxNode |
// case SyntaxNode w|
// If what we have here is known to be a type, we don't want to clutter the variable name suggestion list
// with 'when' since we know that the resulting code would be semantically invalid.
if
(
node
is
TypeSyntax
typeSyntax
)
{
return
!
typeSyntax
.
IsPotentialTypeName
(
context
.
SemanticModel
,
cancellationToken
);
}
return
true
;
}
}
private
static
T
GetAncestorUntilStatement
<
T
>(
SyntaxToken
token
)
where
T
:
SyntaxNode
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录