Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
ab62d37a
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,发现更多精彩内容 >>
提交
ab62d37a
编写于
3月 08, 2017
作者:
C
CyrusNajmabadi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Properly compute scope for loops with Inline-Decl.
上级
5961e610
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
296 addition
and
1 deletion
+296
-1
src/EditorFeatures/CSharpTest/InlineDeclaration/CSharpInlineDeclarationTests.cs
...arpTest/InlineDeclaration/CSharpInlineDeclarationTests.cs
+286
-0
src/Features/CSharp/Portable/InlineDeclaration/CSharpInlineDeclarationDiagnosticAnalyzer.cs
...eDeclaration/CSharpInlineDeclarationDiagnosticAnalyzer.cs
+10
-1
未找到文件。
src/EditorFeatures/CSharpTest/InlineDeclaration/CSharpInlineDeclarationTests.cs
浏览文件 @
ab62d37a
...
...
@@ -1195,6 +1195,292 @@ private int Bar()
catalogs,
out IProjectRuleSnapshot unresolvedReferenceSnapshot);
}
}"
);
}
[
WorkItem
(
17624
,
"https://github.com/dotnet/roslyn/issues/17624"
)]
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsInlineDeclaration
)]
public
async
Task
TestNotInLoops1
()
{
await
TestMissingAsync
(
@"
using System;
class C
{
static void Main(string[] args)
{
string [|token|];
do
{
}
while (!TryExtractTokenFromEmail(out token));
Console.WriteLine(token == ""Test"");
}
private static bool TryExtractTokenFromEmail(out string token)
{
throw new NotImplementedException();
}
}"
);
}
[
WorkItem
(
17624
,
"https://github.com/dotnet/roslyn/issues/17624"
)]
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsInlineDeclaration
)]
public
async
Task
TestNotInLoops2
()
{
await
TestMissingAsync
(
@"
using System;
class C
{
static void Main(string[] args)
{
string [|token|];
while (!TryExtractTokenFromEmail(out token))
{
}
Console.WriteLine(token == ""Test"");
}
private static bool TryExtractTokenFromEmail(out string token)
{
throw new NotImplementedException();
}
}"
);
}
[
WorkItem
(
17624
,
"https://github.com/dotnet/roslyn/issues/17624"
)]
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsInlineDeclaration
)]
public
async
Task
TestNotInLoops3
()
{
await
TestMissingAsync
(
@"
using System;
using System.Collections.Generic;
class C
{
static void Main(string[] args)
{
string [|token|];
foreach (var v in TryExtractTokenFromEmail(out token))
{
}
Console.WriteLine(token == ""Test"");
}
private static IEnumerable<bool> TryExtractTokenFromEmail(out string token)
{
throw new NotImplementedException();
}
}"
);
}
[
WorkItem
(
17624
,
"https://github.com/dotnet/roslyn/issues/17624"
)]
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsInlineDeclaration
)]
public
async
Task
TestNotInLoops4
()
{
await
TestMissingAsync
(
@"
using System;
using System.Collections.Generic;
class C
{
static void Main(string[] args)
{
string [|token|];
for ( ; TryExtractTokenFromEmail(out token); )
{
}
Console.WriteLine(token == ""Test"");
}
private static bool TryExtractTokenFromEmail(out string token)
{
throw new NotImplementedException();
}
}"
);
}
[
WorkItem
(
17624
,
"https://github.com/dotnet/roslyn/issues/17624"
)]
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsInlineDeclaration
)]
public
async
Task
TestInLoops1
()
{
await
TestInRegularAndScript1Async
(
@"
using System;
class C
{
static void Main(string[] args)
{
string [|token|];
do
{
}
while (!TryExtractTokenFromEmail(out token));
}
private static bool TryExtractTokenFromEmail(out string token)
{
throw new NotImplementedException();
}
}"
,
@"
using System;
class C
{
static void Main(string[] args)
{
do
{
}
while (!TryExtractTokenFromEmail(out string token));
}
private static bool TryExtractTokenFromEmail(out string token)
{
throw new NotImplementedException();
}
}"
);
}
[
WorkItem
(
17624
,
"https://github.com/dotnet/roslyn/issues/17624"
)]
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsInlineDeclaration
)]
public
async
Task
TestInLoops2
()
{
await
TestInRegularAndScript1Async
(
@"
using System;
class C
{
static void Main(string[] args)
{
string [|token|];
while (!TryExtractTokenFromEmail(out token))
{
}
}
private static bool TryExtractTokenFromEmail(out string token)
{
throw new NotImplementedException();
}
}"
,
@"
using System;
class C
{
static void Main(string[] args)
{
while (!TryExtractTokenFromEmail(out string token))
{
}
}
private static bool TryExtractTokenFromEmail(out string token)
{
throw new NotImplementedException();
}
}"
);
}
[
WorkItem
(
17624
,
"https://github.com/dotnet/roslyn/issues/17624"
)]
[
Fact
(
Skip
=
"https://github.com/dotnet/roslyn/issues/17635"
),
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsInlineDeclaration
)]
public
async
Task
TestInLoops3
()
{
await
TestInRegularAndScript1Async
(
@"
using System;
using System.Collections.Generic;
class C
{
static void Main(string[] args)
{
string [|token|];
foreach (var v in TryExtractTokenFromEmail(out token))
{
}
}
private static IEnumerable<bool> TryExtractTokenFromEmail(out string token)
{
throw new NotImplementedException();
}
}"
,
@"
using System;
using System.Collections.Generic;
class C
{
static void Main(string[] args)
{
foreach (var v in TryExtractTokenFromEmail(out string token))
{
}
}
private static IEnumerable<bool> TryExtractTokenFromEmail(out string token)
{
throw new NotImplementedException();
}
}"
);
}
[
WorkItem
(
17624
,
"https://github.com/dotnet/roslyn/issues/17624"
)]
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsInlineDeclaration
)]
public
async
Task
TestInLoops4
()
{
await
TestInRegularAndScript1Async
(
@"
using System;
using System.Collections.Generic;
class C
{
static void Main(string[] args)
{
string [|token|];
for ( ; TryExtractTokenFromEmail(out token); )
{
}
}
private static bool TryExtractTokenFromEmail(out string token)
{
throw new NotImplementedException();
}
}"
,
@"
using System;
using System.Collections.Generic;
class C
{
static void Main(string[] args)
{
for ( ; TryExtractTokenFromEmail(out string token); )
{
}
}
private static bool TryExtractTokenFromEmail(out string token)
{
throw new NotImplementedException();
}
}"
);
}
}
...
...
src/Features/CSharp/Portable/InlineDeclaration/CSharpInlineDeclarationDiagnosticAnalyzer.cs
浏览文件 @
ab62d37a
...
...
@@ -155,7 +155,7 @@ private void AnalyzeSyntaxNode(SyntaxNodeAnalysisContext context, INamedTypeSymb
// If the local has an initializer, only allow the refactoring if it is initialized
// with a simple literal or 'default' expression. i.e. it's ok to inline "var v = 0"
// since there are no side-effects of the initialization. However something like
// "var v = M()" shou
dl
not be inlined as that could break program semantics.
// "var v = M()" shou
ld
not be inlined as that could break program semantics.
if
(
localDeclarator
.
Initializer
!=
null
)
{
if
(!(
localDeclarator
.
Initializer
.
Value
is
LiteralExpressionSyntax
)
&&
...
...
@@ -323,6 +323,15 @@ private SyntaxNode GetOutArgumentScope(SyntaxNode argumentExpression)
return
current
;
}
// Any loop construct defines a scope for out-variables.
if
(
current
.
Kind
()
==
SyntaxKind
.
WhileStatement
||
current
.
Kind
()
==
SyntaxKind
.
DoStatement
||
current
.
Kind
()
==
SyntaxKind
.
ForStatement
||
current
.
Kind
()
==
SyntaxKind
.
ForEachStatement
)
{
return
current
;
}
if
(
current
is
StatementSyntax
)
{
// We hit a statement containing the out-argument. Statements can have one of
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录