Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
8bd2dc2d
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,发现更多精彩内容 >>
提交
8bd2dc2d
编写于
8月 21, 2019
作者:
P
Petr Houska
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add extraction of ExpressionStatement to refa helpers.
上级
87b2e9f9
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
29 addition
and
8 deletion
+29
-8
src/Features/Core/Portable/CodeRefactorings/AbstractRefactoringHelpersService.cs
...ble/CodeRefactorings/AbstractRefactoringHelpersService.cs
+14
-0
src/Features/Core/Portable/IntroduceVariable/IntroduceLocalForExpressionCodeRefactoringProvider.cs
...ble/IntroduceLocalForExpressionCodeRefactoringProvider.cs
+0
-8
src/Workspaces/CSharp/Portable/LanguageServices/CSharpSyntaxKindsService.cs
...arp/Portable/LanguageServices/CSharpSyntaxKindsService.cs
+2
-0
src/Workspaces/Core/Portable/LanguageServices/SyntaxFactsService/AbstractSyntaxFactsService.cs
...Services/SyntaxFactsService/AbstractSyntaxFactsService.cs
+3
-0
src/Workspaces/Core/Portable/LanguageServices/SyntaxFactsService/ISyntaxFactsService.cs
...anguageServices/SyntaxFactsService/ISyntaxFactsService.cs
+2
-0
src/Workspaces/Core/Portable/LanguageServices/SyntaxFactsService/ISyntaxKindsService.cs
...anguageServices/SyntaxFactsService/ISyntaxKindsService.cs
+2
-0
src/Workspaces/VisualBasic/Portable/LanguageServices/VisualBasicSyntaxFactsService.vb
...ortable/LanguageServices/VisualBasicSyntaxFactsService.vb
+4
-0
src/Workspaces/VisualBasic/Portable/LanguageServices/VisualBasicSyntaxKindsService.vb
...ortable/LanguageServices/VisualBasicSyntaxKindsService.vb
+2
-0
未找到文件。
src/Features/Core/Portable/CodeRefactorings/AbstractRefactoringHelpersService.cs
浏览文件 @
8bd2dc2d
...
...
@@ -365,6 +365,20 @@ protected virtual IEnumerable<SyntaxNode> ExtractNodesSimple(SyntaxNode node, IS
syntaxFacts
.
GetPartsOfAssignmentExpressionOrStatement
(
node
,
out
_
,
out
_
,
out
var
rightSide
);
yield
return
rightSide
;
}
// `a();`
// -> a()
if
(
syntaxFacts
.
IsExpressionStatement
(
node
))
{
yield
return
syntaxFacts
.
GetExpressionOfExpressionStatement
(
node
);
}
// `a()`;
// -> `a();`
if
(
node
.
Parent
!=
null
&&
syntaxFacts
.
IsExpressionStatement
(
node
.
Parent
))
{
yield
return
node
.
Parent
;
}
}
/// <summary>
...
...
src/Features/Core/Portable/IntroduceVariable/IntroduceLocalForExpressionCodeRefactoringProvider.cs
浏览文件 @
8bd2dc2d
...
...
@@ -58,14 +58,6 @@ public sealed override async Task ComputeRefactoringsAsync(CodeRefactoringContex
protected
async
Task
<
TExpressionStatementSyntax
>
GetExpressionStatementAsync
(
CodeRefactoringContext
context
)
{
var
expressionStatement
=
await
context
.
TryGetRelevantNodeAsync
<
TExpressionStatementSyntax
>().
ConfigureAwait
(
false
);
if
(
expressionStatement
==
null
)
{
// If an expression-statement wasn't selected, see if they're selecting
// an expression belonging to an expression-statement instead.
var
expression
=
await
context
.
TryGetRelevantNodeAsync
<
TExpressionSyntax
>().
ConfigureAwait
(
false
);
expressionStatement
=
expression
?.
Parent
as
TExpressionStatementSyntax
;
}
return
expressionStatement
!=
null
&&
IsValid
(
expressionStatement
,
context
.
Span
)
?
expressionStatement
:
null
;
...
...
src/Workspaces/CSharp/Portable/LanguageServices/CSharpSyntaxKindsService.cs
浏览文件 @
8bd2dc2d
...
...
@@ -28,5 +28,7 @@ private CSharpSyntaxKindsService()
public
override
int
UsingStatement
=>
(
int
)
SyntaxKind
.
UsingStatement
;
public
override
int
ReturnStatement
=>
(
int
)
SyntaxKind
.
ReturnStatement
;
public
override
int
HashToken
=>
(
int
)
SyntaxKind
.
HashToken
;
public
override
int
ExpressionStatement
=>
(
int
)
SyntaxKind
.
ExpressionStatement
;
}
}
src/Workspaces/Core/Portable/LanguageServices/SyntaxFactsService/AbstractSyntaxFactsService.cs
浏览文件 @
8bd2dc2d
...
...
@@ -571,5 +571,8 @@ public bool IsUsingStatement(SyntaxNode node)
public
bool
IsReturnStatement
(
SyntaxNode
node
)
=>
node
.
RawKind
==
SyntaxKinds
.
ReturnStatement
;
public
bool
IsExpressionStatement
(
SyntaxNode
node
)
=>
node
.
RawKind
==
SyntaxKinds
.
ExpressionStatement
;
}
}
src/Workspaces/Core/Portable/LanguageServices/SyntaxFactsService/ISyntaxFactsService.cs
浏览文件 @
8bd2dc2d
...
...
@@ -105,6 +105,8 @@ internal interface ISyntaxFactsService : ILanguageService
bool
IsTrueLiteralExpression
(
SyntaxNode
node
);
bool
IsThisExpression
(
SyntaxNode
node
);
bool
IsBaseExpression
(
SyntaxNode
node
);
bool
IsExpressionStatement
(
SyntaxNode
node
);
string
GetText
(
int
kind
);
bool
IsInInactiveRegion
(
SyntaxTree
syntaxTree
,
int
position
,
CancellationToken
cancellationToken
);
...
...
src/Workspaces/Core/Portable/LanguageServices/SyntaxFactsService/ISyntaxKindsService.cs
浏览文件 @
8bd2dc2d
...
...
@@ -33,6 +33,7 @@ internal interface ISyntaxKindsService : ILanguageService
int
UsingStatement
{
get
;
}
int
ReturnStatement
{
get
;
}
int
HashToken
{
get
;
}
int
ExpressionStatement
{
get
;
}
}
internal
abstract
class
AbstractSyntaxKindsService
:
ISyntaxKindsService
...
...
@@ -53,5 +54,6 @@ internal abstract class AbstractSyntaxKindsService : ISyntaxKindsService
public
abstract
int
UsingStatement
{
get
;
}
public
abstract
int
ReturnStatement
{
get
;
}
public
abstract
int
HashToken
{
get
;
}
public
abstract
int
ExpressionStatement
{
get
;
}
}
}
src/Workspaces/VisualBasic/Portable/LanguageServices/VisualBasicSyntaxFactsService.vb
浏览文件 @
8bd2dc2d
...
...
@@ -2037,5 +2037,9 @@ Namespace Microsoft.CodeAnalysis.VisualBasic
Return
IsOnHeader
(
position
,
node
,
node
.
ForEachStatement
)
End
Function
Private
Function
ISyntaxFactsService_IsExpressionStatement
(
node
As
SyntaxNode
)
As
Boolean
Implements
ISyntaxFactsService
.
IsExpressionStatement
Return
MyBase
.
IsExpressionStatement
(
node
)
End
Function
End
Class
End
Namespace
src/Workspaces/VisualBasic/Portable/LanguageServices/VisualBasicSyntaxKindsService.vb
浏览文件 @
8bd2dc2d
...
...
@@ -28,5 +28,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.LanguageServices
Public
Overrides
ReadOnly
Property
UsingStatement
As
Integer
=
SyntaxKind
.
UsingStatement
Public
Overrides
ReadOnly
Property
ReturnStatement
As
Integer
=
SyntaxKind
.
ReturnStatement
Public
Overrides
ReadOnly
Property
HashToken
As
Integer
=
SyntaxKind
.
HashToken
Public
Overrides
ReadOnly
Property
ExpressionStatement
As
Integer
=
SyntaxKind
.
ExpressionStatement
End
Class
End
Namespace
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录