Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
13b156b1
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,发现更多精彩内容 >>
提交
13b156b1
编写于
11月 13, 2017
作者:
V
Victor Z
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Moved common logic to extension method.
上级
e0658e34
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
51 addition
and
64 deletion
+51
-64
src/Features/CSharp/Portable/InlineDeclaration/CSharpInlineDeclarationDiagnosticAnalyzer.cs
...eDeclaration/CSharpInlineDeclarationDiagnosticAnalyzer.cs
+2
-29
src/Features/CSharp/Portable/MoveDeclarationNearReference/CSharpMoveDeclarationNearReferenceCodeRefactoringProvider.cs
...arpMoveDeclarationNearReferenceCodeRefactoringProvider.cs
+2
-35
src/Workspaces/CSharp/Portable/Extensions/ILocalSymbolExtensions.cs
...aces/CSharp/Portable/Extensions/ILocalSymbolExtensions.cs
+47
-0
未找到文件。
src/Features/CSharp/Portable/InlineDeclaration/CSharpInlineDeclarationDiagnosticAnalyzer.cs
浏览文件 @
13b156b1
...
@@ -194,18 +194,9 @@ private void AnalyzeSyntaxNode(SyntaxNodeAnalysisContext context, INamedTypeSymb
...
@@ -194,18 +194,9 @@ private void AnalyzeSyntaxNode(SyntaxNodeAnalysisContext context, INamedTypeSymb
// rewrite things.
// rewrite things.
var
outArgumentScope
=
GetOutArgumentScope
(
argumentExpression
);
var
outArgumentScope
=
GetOutArgumentScope
(
argumentExpression
);
if
(
enclosingBlockOfLocalStatement
!=
outArgumentScope
)
if
(
!
outLocalSymbol
.
CanSafelyMoveLocalToBlock
(
enclosingBlockOfLocalStatement
,
outArgumentScope
)
)
{
{
var
localFunctionOrMethodDeclaration
=
enclosingBlockOfLocalStatement
.
AncestorsAndSelf
()
return
;
.
FirstOrDefault
(
node
=>
node
.
IsKind
(
SyntaxKind
.
LocalFunctionStatement
,
SyntaxKind
.
MethodDeclaration
));
var
localFunctionStatement
=
outArgumentScope
.
FirstAncestorOrSelf
<
LocalFunctionStatementSyntax
>();
if
(
localFunctionOrMethodDeclaration
!=
localFunctionStatement
&&
HasTypeParameterWithName
(
localFunctionOrMethodDeclaration
,
outLocalSymbol
.
Type
.
Name
)
&&
HasTypeParameterWithName
(
localFunctionStatement
,
outLocalSymbol
.
Type
.
Name
))
{
return
;
}
}
}
// Make sure that variable is not accessed outside of that scope.
// Make sure that variable is not accessed outside of that scope.
...
@@ -447,23 +438,5 @@ private SyntaxNode GetOutArgumentScope(SyntaxNode argumentExpression)
...
@@ -447,23 +438,5 @@ private SyntaxNode GetOutArgumentScope(SyntaxNode argumentExpression)
// No accesses detected
// No accesses detected
return
false
;
return
false
;
}
}
private
static
bool
HasTypeParameterWithName
(
SyntaxNode
node
,
string
name
)
{
SeparatedSyntaxList
<
TypeParameterSyntax
>?
typeParameters
;
switch
(
node
)
{
case
MethodDeclarationSyntax
methodDeclaration
:
typeParameters
=
methodDeclaration
.
TypeParameterList
?.
Parameters
;
break
;
case
LocalFunctionStatementSyntax
localFunctionStatement
:
typeParameters
=
localFunctionStatement
.
TypeParameterList
?.
Parameters
;
break
;
default
:
return
false
;
}
return
typeParameters
.
HasValue
&&
typeParameters
.
Value
.
Any
(
x
=>
x
.
Identifier
.
ValueText
==
name
);
}
}
}
}
}
src/Features/CSharp/Portable/MoveDeclarationNearReference/CSharpMoveDeclarationNearReferenceCodeRefactoringProvider.cs
浏览文件 @
13b156b1
...
@@ -5,6 +5,7 @@
...
@@ -5,6 +5,7 @@
using
System.Threading
;
using
System.Threading
;
using
System.Threading.Tasks
;
using
System.Threading.Tasks
;
using
Microsoft.CodeAnalysis.CodeRefactorings
;
using
Microsoft.CodeAnalysis.CodeRefactorings
;
using
Microsoft.CodeAnalysis.CSharp.Extensions
;
using
Microsoft.CodeAnalysis.CSharp.Syntax
;
using
Microsoft.CodeAnalysis.CSharp.Syntax
;
using
Microsoft.CodeAnalysis.MoveDeclarationNearReference
;
using
Microsoft.CodeAnalysis.MoveDeclarationNearReference
;
...
@@ -57,40 +58,6 @@ protected override SyntaxToken GetIdentifierOfVariableDeclarator(VariableDeclara
...
@@ -57,40 +58,6 @@ protected override SyntaxToken GetIdentifierOfVariableDeclarator(VariableDeclara
}
}
protected
override
bool
CanMoveToBlock
(
ILocalSymbol
localSymbol
,
SyntaxNode
currentBlock
,
SyntaxNode
destinationBlock
)
protected
override
bool
CanMoveToBlock
(
ILocalSymbol
localSymbol
,
SyntaxNode
currentBlock
,
SyntaxNode
destinationBlock
)
{
=>
localSymbol
.
CanSafelyMoveLocalToBlock
(
currentBlock
,
destinationBlock
);
if
(
currentBlock
!=
destinationBlock
)
{
var
localFunctionOrMethodDeclaration
=
currentBlock
.
AncestorsAndSelf
()
.
FirstOrDefault
(
node
=>
node
.
IsKind
(
SyntaxKind
.
LocalFunctionStatement
)
||
node
.
IsKind
(
SyntaxKind
.
MethodDeclaration
));
var
localFunctionStatement
=
destinationBlock
.
FirstAncestorOrSelf
<
LocalFunctionStatementSyntax
>();
if
(
localFunctionOrMethodDeclaration
!=
localFunctionStatement
&&
HasTypeParameterWithName
(
localFunctionOrMethodDeclaration
,
localSymbol
.
Type
.
Name
)
&&
HasTypeParameterWithName
(
localFunctionStatement
,
localSymbol
.
Type
.
Name
))
{
return
false
;
}
}
return
true
;
bool
HasTypeParameterWithName
(
SyntaxNode
node
,
string
name
)
{
SeparatedSyntaxList
<
TypeParameterSyntax
>?
typeParameters
;
switch
(
node
)
{
case
MethodDeclarationSyntax
methodDeclaration
:
typeParameters
=
methodDeclaration
.
TypeParameterList
?.
Parameters
;
break
;
case
LocalFunctionStatementSyntax
localFunctionStatement
:
typeParameters
=
localFunctionStatement
.
TypeParameterList
?.
Parameters
;
break
;
default
:
return
false
;
}
return
typeParameters
.
HasValue
&&
typeParameters
.
Value
.
Any
(
typeParameter
=>
typeParameter
.
Identifier
.
ValueText
==
name
);
}
}
}
}
}
}
src/Workspaces/CSharp/Portable/Extensions/ILocalSymbolExtensions.cs
0 → 100644
浏览文件 @
13b156b1
// 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.Linq
;
using
Microsoft.CodeAnalysis.CSharp.Syntax
;
namespace
Microsoft.CodeAnalysis.CSharp.Extensions
{
internal
static
class
ILocalSymbolExtensions
{
public
static
bool
CanSafelyMoveLocalToBlock
(
this
ILocalSymbol
localSymbol
,
SyntaxNode
currentBlock
,
SyntaxNode
destinationBlock
)
{
if
(
currentBlock
!=
destinationBlock
)
{
var
localFunctionOrMethodDeclaration
=
currentBlock
.
AncestorsAndSelf
()
.
FirstOrDefault
(
node
=>
node
.
IsKind
(
SyntaxKind
.
LocalFunctionStatement
)
||
node
.
IsKind
(
SyntaxKind
.
MethodDeclaration
));
var
localFunctionStatement
=
destinationBlock
.
FirstAncestorOrSelf
<
LocalFunctionStatementSyntax
>();
if
(
localFunctionOrMethodDeclaration
!=
localFunctionStatement
&&
HasTypeParameterWithName
(
localFunctionOrMethodDeclaration
,
localSymbol
.
Type
.
Name
)
&&
HasTypeParameterWithName
(
localFunctionStatement
,
localSymbol
.
Type
.
Name
))
{
return
false
;
}
}
return
true
;
bool
HasTypeParameterWithName
(
SyntaxNode
node
,
string
name
)
{
SeparatedSyntaxList
<
TypeParameterSyntax
>?
typeParameters
;
switch
(
node
)
{
case
MethodDeclarationSyntax
methodDeclaration
:
typeParameters
=
methodDeclaration
.
TypeParameterList
?.
Parameters
;
break
;
case
LocalFunctionStatementSyntax
localFunctionStatement
:
typeParameters
=
localFunctionStatement
.
TypeParameterList
?.
Parameters
;
break
;
default
:
return
false
;
}
return
typeParameters
.
HasValue
&&
typeParameters
.
Value
.
Any
(
typeParameter
=>
typeParameter
.
Identifier
.
ValueText
==
name
);
}
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录