Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
b8a451e6
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,发现更多精彩内容 >>
提交
b8a451e6
编写于
6月 28, 2019
作者:
P
Petr Houška
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
PR feedback.
上级
59a78d7d
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
12 addition
and
7 deletion
+12
-7
src/Features/CSharp/Portable/CodeRefactorings/CSharpRefactoringHelpersService.cs
...table/CodeRefactorings/CSharpRefactoringHelpersService.cs
+3
-3
src/Features/Core/Portable/CodeRefactorings/AbstractRefactoringHelpersService.cs
...ble/CodeRefactorings/AbstractRefactoringHelpersService.cs
+9
-4
未找到文件。
src/Features/CSharp/Portable/CodeRefactorings/CSharpRefactoringHelpersService.cs
浏览文件 @
b8a451e6
using
System.Composition
;
// 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.Composition
;
using
Microsoft.CodeAnalysis.CodeRefactorings
;
using
Microsoft.CodeAnalysis.CSharp.Syntax
;
using
Microsoft.CodeAnalysis.Host.Mef
;
using
Microsoft.CodeAnalysis.LanguageServices
;
namespace
Microsoft.CodeAnalysis.CSharp.CodeRefactorings
{
...
...
src/Features/Core/Portable/CodeRefactorings/AbstractRefactoringHelpersService.cs
浏览文件 @
b8a451e6
...
...
@@ -14,7 +14,7 @@ internal abstract class AbstractRefactoringHelpersService : IRefactoringHelpersS
public
async
Task
<
TSyntaxNode
>
TryGetSelectedNodeAsync
<
TSyntaxNode
>(
Document
document
,
TextSpan
selection
,
CancellationToken
cancellationToken
)
where
TSyntaxNode
:
SyntaxNode
{
return
await
TryGetSelectedNodeAsync
(
document
,
selection
,
n
=>
n
is
TSyntaxNode
,
cancellationToken
).
ConfigureAwait
(
false
)
as
TSyntaxNode
;
return
(
TSyntaxNode
)
await
TryGetSelectedNodeAsync
(
document
,
selection
,
n
=>
n
is
TSyntaxNode
,
cancellationToken
).
ConfigureAwait
(
false
)
;
}
/// <summary>
...
...
@@ -39,7 +39,8 @@ internal abstract class AbstractRefactoringHelpersService : IRefactoringHelpersS
/// of tokens gracefully.
/// </para>
/// </summary>
protected
Task
<
SyntaxNode
>
TryGetSelectedNodeAsync
(
Document
document
,
TextSpan
selection
,
Predicate
<
SyntaxNode
>
predicate
,
CancellationToken
cancellationToken
)
=>
TryGetSelectedNodeAsync
(
document
,
selection
,
predicate
,
DefaultNodeExtractor
,
cancellationToken
);
protected
Task
<
SyntaxNode
>
TryGetSelectedNodeAsync
(
Document
document
,
TextSpan
selection
,
Predicate
<
SyntaxNode
>
predicate
,
CancellationToken
cancellationToken
)
=>
TryGetSelectedNodeAsync
(
document
,
selection
,
predicate
,
DefaultNodeExtractor
,
cancellationToken
);
/// <summary>
/// <para>
...
...
@@ -76,7 +77,7 @@ protected async Task<SyntaxNode> TryGetSelectedNodeAsync(Document document, Text
var
root
=
await
document
.
GetSyntaxRootAsync
(
cancellationToken
).
ConfigureAwait
(
false
);
var
selectionTrimmed
=
await
CodeRefactoringHelpers
.
GetTrimmedTextSpan
(
document
,
selection
,
cancellationToken
).
ConfigureAwait
(
false
);
// Everytime a Node is considered by following alg
h
orithm (and tested with predicate) and the predicate fails
// Everytime a Node is considered by following algorithm (and tested with predicate) and the predicate fails
// extractNode is called on the node and the result is tested with predicate again. If any of those succeed
// a respective Node gets returned.
//
...
...
@@ -205,7 +206,6 @@ static SyntaxNode TryGetAcceptedNodeOrExtracted(SyntaxNode node, Predicate<Synta
return
node
;
}
var
extractedNode
=
extractNode
(
node
,
syntaxFacts
);
return
(
extractedNode
!=
null
&&
predicate
(
extractedNode
))
?
extractedNode
...
...
@@ -225,6 +225,11 @@ static SyntaxNode TryGetAcceptedNodeOrExtracted(SyntaxNode node, Predicate<Synta
/// </summary>
protected
virtual
SyntaxNode
DefaultNodeExtractor
(
SyntaxNode
node
,
ISyntaxFactsService
syntaxFacts
)
{
// REMARKS:
// The set of currently attempted extractions is in no way exhaustive and covers only cases
// that were found to be relevant for refactorings that were moved to `TryGetSelectedNodeAsync`.
// Feel free to extend it / refine current heuristics.
// var a = b;
// -> b
if
(
syntaxFacts
.
IsLocalDeclarationStatement
(
node
))
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录