Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
c08aec57
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,发现更多精彩内容 >>
提交
c08aec57
编写于
11月 21, 2016
作者:
C
CyrusNajmabadi
提交者:
GitHub
11月 21, 2016
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #15415 from CyrusNajmabadi/noInlineWhenCaptured
Do not offer 'inline declaration' if it would break scoping.
上级
3dc0506e
32d3183d
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
98 addition
and
3 deletion
+98
-3
src/EditorFeatures/CSharpTest/InlineDeclaration/CSharpInlineDeclarationTests.cs
...arpTest/InlineDeclaration/CSharpInlineDeclarationTests.cs
+59
-0
src/Features/CSharp/Portable/InlineDeclaration/CSharpInlineDeclarationDiagnosticAnalyzer.cs
...eDeclaration/CSharpInlineDeclarationDiagnosticAnalyzer.cs
+39
-3
未找到文件。
src/EditorFeatures/CSharpTest/InlineDeclaration/CSharpInlineDeclarationTests.cs
浏览文件 @
c08aec57
...
...
@@ -922,5 +922,64 @@ void M()
}
}"
,
compareTokens
:
false
);
}
[
WorkItem
(
15336
,
"https://github.com/dotnet/roslyn/issues/15336"
)]
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsInlineDeclaration
)]
public
async
Task
TestNotMissingIfCapturedInLambdaAndNotUsedAfterwards
()
{
await
TestAsync
(
@"
using System;
class C
{
void M()
{
string [|s|];
Bar(() => Baz(out s));
}
void Baz(out string s) { }
void Bar(Action a) { }
}"
,
@"
using System;
class C
{
void M()
{
Bar(() => Baz(out string s));
}
void Baz(out string s) { }
void Bar(Action a) { }
}"
);
}
[
WorkItem
(
15336
,
"https://github.com/dotnet/roslyn/issues/15336"
)]
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsInlineDeclaration
)]
public
async
Task
TestMissingIfCapturedInLambdaAndUsedAfterwards
()
{
await
TestMissingAsync
(
@"
using System;
class C
{
void M()
{
string [|s|];
Bar(() => Baz(out s));
Console.WriteLine(s);
}
void Baz(out string s) { }
void Bar(Action a) { }
}"
);
}
}
}
\ No newline at end of file
src/Features/CSharp/Portable/InlineDeclaration/CSharpInlineDeclarationDiagnosticAnalyzer.cs
浏览文件 @
c08aec57
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using
System
;
using
System.Collections.Immutable
;
using
System.Linq
;
using
System.Threading
;
using
Microsoft.CodeAnalysis.CodeStyle
;
using
Microsoft.CodeAnalysis.CSharp.Extensions
;
using
Microsoft.CodeAnalysis.CSharp.Syntax
;
using
Microsoft.CodeAnalysis.Diagnostics
;
...
...
@@ -157,9 +159,7 @@ private void AnalyzeSyntaxNode(SyntaxNodeAnalysisContext context)
// Find the scope that the out-declaration variable will live in after we
// rewrite things.
var
outArgumentScope
=
containingStatement
.
Parent
is
BlockSyntax
?
(
BlockSyntax
)
containingStatement
.
Parent
:
containingStatement
;
var
outArgumentScope
=
GetOutArgumentScope
(
argumentExpression
);
// Make sure that variable is not accessed outside of that scope.
var
dataFlow
=
semanticModel
.
AnalyzeDataFlow
(
outArgumentScope
);
...
...
@@ -200,6 +200,42 @@ private void AnalyzeSyntaxNode(SyntaxNodeAnalysisContext context)
additionalLocations
:
allLocations
));
}
private
SyntaxNode
GetOutArgumentScope
(
SyntaxNode
argumentExpression
)
{
for
(
var
current
=
argumentExpression
;
current
!=
null
;
current
=
current
.
Parent
)
{
if
(
current
.
Parent
is
LambdaExpressionSyntax
lambda
&&
current
==
lambda
.
Body
)
{
// We were in a lambda. The lambda body will be the new scope of the
// out var.
return
current
;
}
if
(
current
is
StatementSyntax
)
{
// We hit a statement containing the out-argument. Statements can have one of
// two forms. They're either parented by a block, or by another statement
// (i.e. they're an embedded statement). If we're parented by a block, then
// that block will be the scope of the new out-var.
//
// However, if our containing statement is not parented by a block, then that
// means we have something like:
//
// if (x)
// if (Try(out y))
//
// In this case, there is a 'virtual' block scope surrounding the embedded 'if'
// statement, and that will be the scope the out-var goes into.
return
current
.
IsParentKind
(
SyntaxKind
.
Block
)
?
current
.
Parent
:
current
;
}
}
return
null
;
}
private
bool
IsAccessed
(
SemanticModel
semanticModel
,
ISymbol
outSymbol
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录