Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
e1693712
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,发现更多精彩内容 >>
提交
e1693712
编写于
6月 09, 2018
作者:
Š
Šimon Koníček
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixing completion for partially written 'when' consumed as an identifier in a recursive pattern
上级
4281de6c
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
31 addition
and
13 deletion
+31
-13
src/EditorFeatures/CSharpTest2/Recommendations/WhenKeywordRecommenderTests.cs
...SharpTest2/Recommendations/WhenKeywordRecommenderTests.cs
+3
-3
src/Features/CSharp/Portable/Completion/KeywordRecommenders/WhenKeywordRecommender.cs
.../Completion/KeywordRecommenders/WhenKeywordRecommender.cs
+28
-10
未找到文件。
src/EditorFeatures/CSharpTest2/Recommendations/WhenKeywordRecommenderTests.cs
浏览文件 @
e1693712
...
...
@@ -84,7 +84,7 @@ public async Task TestForCatchClause_NotAfterFilter3()
[
InlineData
(
"1"
)]
[
InlineData
(
"1 + 1"
)]
[
InlineData
(
"true ? 1 : 1"
)]
// [InlineData("(1 + )")] // https://github.com/dotnet/roslyn/issues/25998 this resembles a positional pattern that it not handled by the recommender
[
InlineData
(
"(1 + )"
)]
public
async
Task
TestForSwitchCase_AfterExpression
(
string
expression
)
=>
await
VerifyKeywordAsync
(
AddInsideMethod
(
$@"switch (1)
{{
case
{
expression
}
$$
}}
"
));
...
...
@@ -93,7 +93,7 @@ public async Task TestForCatchClause_NotAfterFilter3()
[
InlineData
(
"1"
)]
[
InlineData
(
"1 + 1"
)]
[
InlineData
(
"true ? 1 : 1"
)]
// [InlineData("(1 + )")] // https://github.com/dotnet/roslyn/issues/25998 this resembles a positional pattern that it not handled by the recommender
[
InlineData
(
"(1 + )"
)]
public
async
Task
TestForSwitchCase_AfterExpression_BeforeBreak
(
string
expression
)
=>
await
VerifyKeywordAsync
(
AddInsideMethod
(
$@"switch (1)
{{
case
{
expression
}
$$
break
;
}}
"
));
...
...
@@ -102,7 +102,7 @@ public async Task TestForCatchClause_NotAfterFilter3()
[
InlineData
(
"1"
)]
[
InlineData
(
"1 + 1"
)]
[
InlineData
(
"true ? 1 : 1"
)]
// [InlineData("(1 + )")] // https://github.com/dotnet/roslyn/issues/25998 this resembles a positional pattern that it not handled by the recommender
[
InlineData
(
"(1 + )"
)]
public
async
Task
TestForSwitchCase_AfterExpression_BeforeWhen
(
string
expression
)
=>
await
VerifyKeywordAsync
(
AddInsideMethod
(
$@"switch (1)
{{
case
{
expression
}
$$
when
}}
"
));
...
...
src/Features/CSharp/Portable/Completion/KeywordRecommenders/WhenKeywordRecommender.cs
浏览文件 @
e1693712
...
...
@@ -64,17 +64,35 @@ protected override bool IsValidContext(int position, CSharpSyntaxContext context
return
true
;
}
if
(
lastToken
==
context
.
LeftToken
&&
expressionOrPattern
is
DeclarationPatternSyntax
declarationPattern
)
if
(
lastToken
==
context
.
LeftToken
)
{
// case constant w|
// The user is typing a new word (might be a partially written 'when' keyword), which causes this to be parsed
// as a declaration pattern. lastToken will be 'w' (LeftToken) as opposed to 'constant' (TargetToken).
// However we'd like to pretend that this is not the case and that we just a have single expression
// with 'constant' as if the new word didn't exist. Let's do that by adjusting our variable.
expressionOrPattern
=
declarationPattern
.
Type
;
return
true
;
// The user is typing a new word (might be a partially written 'when' keyword),
// which is part of the pattern as opposed to appearing outside of it. In a few special cases,
// this word can actually be replaced with 'when' and the resulting pattern would still be valid.
if
(
expressionOrPattern
is
DeclarationPatternSyntax
declarationPattern
)
{
// The new token causes this to be parsed as a declaration pattern:
// case constant w| ('w' = LeftToken, 'constant' = TargetToken)
// However 'constant' itself might end up being a valid constant pattern.
// We will pretend as if 'w' didn't exist so that the later check
// for whether 'constant' is actually a type can still work properly.
expressionOrPattern
=
declarationPattern
.
Type
;
return
true
;
}
if
(
expressionOrPattern
is
RecursivePatternSyntax
recursivePattern
)
{
// The new token is consumed as the identifier in a recursive pattern:
// case { } w| ('w' = LeftToken, '}' = TargetToken)
// However the identifier is optional and can be replaced by 'when'.
return
true
;
}
// In other cases, this would not be true because the pattern would be incomplete without this word:
// case 1 + w|
}
return
false
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录