Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
964d1801
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,发现更多精彩内容 >>
提交
964d1801
编写于
6月 19, 2019
作者:
P
Petr Houška
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix ConvertLocalFuncToMethod not available when selection is used.
上级
d680432e
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
94 addition
and
3 deletion
+94
-3
src/EditorFeatures/CSharpTest/CodeActions/ConvertLocalFunctionToMethod/ConvertLocalFunctionToMethodTests.cs
...ocalFunctionToMethod/ConvertLocalFunctionToMethodTests.cs
+48
-0
src/Features/CSharp/Portable/CodeRefactorings/ConvertLocalFunctionToMethod/CSharpConvertLocalFunctionToMethodCodeRefactoringProvider.cs
...arpConvertLocalFunctionToMethodCodeRefactoringProvider.cs
+6
-3
src/Workspaces/Core/Portable/Shared/Extensions/SyntaxTreeExtensions.cs
...s/Core/Portable/Shared/Extensions/SyntaxTreeExtensions.cs
+40
-0
未找到文件。
src/EditorFeatures/CSharpTest/CodeActions/ConvertLocalFunctionToMethod/ConvertLocalFunctionToMethodTests.cs
浏览文件 @
964d1801
...
...
@@ -550,6 +550,54 @@ void M()
return
null
;
}}
}}
}}
"
);
}
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsConvertLocalFunctionToMethod
)]
public
async
Task
TestWholeMethodSelectionPositon
()
{
await
TestAsync
(
"[|C LocalFunction(C c)"
);
await
TestMissingAsync
(
"C LocalFunction(C c)[|"
);
async
Task
TestAsync
(
string
signature
)
{
await
TestInRegularAndScriptAsync
(
$@"class C
{{
void
M
()
{{
{
signature
}
{{
return
null
;
}}|]
}}
}}
"
,
@"class C
{
void M()
{
}
private static C LocalFunction(C c)
{
return null;
}
}"
);
}
async
Task
TestMissingAsync
(
string
signature
)
{
await
this
.
TestMissingAsync
(
$@"class C
{{
void
M
()
{{
{
signature
}
{{
return
null
;
}}|]
}}
}}
"
);
}
}
...
...
src/Features/CSharp/Portable/CodeRefactorings/ConvertLocalFunctionToMethod/CSharpConvertLocalFunctionToMethodCodeRefactoringProvider.cs
浏览文件 @
964d1801
...
...
@@ -42,15 +42,18 @@ public override async Task ComputeRefactoringsAsync(CodeRefactoringContext conte
var
cancellationToken
=
context
.
CancellationToken
;
var
root
=
await
document
.
GetSyntaxRootAsync
(
cancellationToken
).
ConfigureAwait
(
false
);
var
identifier
=
await
root
.
SyntaxTree
.
GetTouchingTokenAsync
(
context
.
Span
.
Start
,
token
=>
token
.
Parent
.
IsKind
(
SyntaxKind
.
LocalFunctionStatement
),
cancellationToken
).
ConfigureAwait
(
false
);
var
identifier
=
context
.
Span
.
IsEmpty
?
await
root
.
SyntaxTree
.
GetTouchingTokenAsync
(
context
.
Span
.
Start
,
token
=>
token
.
Parent
.
IsKind
(
SyntaxKind
.
LocalFunctionStatement
),
cancellationToken
).
ConfigureAwait
(
false
)
:
await
root
.
SyntaxTree
.
GetLeftmostTokenInSpanAsync
(
context
.
Span
,
token
=>
token
.
Parent
.
IsKind
(
SyntaxKind
.
LocalFunctionStatement
),
cancellationToken
).
ConfigureAwait
(
false
);
if
(
identifier
==
default
)
{
return
;
}
if
(
context
.
Span
.
Length
>
0
&&
context
.
Span
!=
identifier
.
Span
)
(
context
.
Span
!=
identifier
.
Span
&&
context
.
Span
!=
identifier
.
Parent
.
Span
))
// either local function's identifier Token or the whole function's span
{
return
;
}
...
...
src/Workspaces/Core/Portable/Shared/Extensions/SyntaxTreeExtensions.cs
浏览文件 @
964d1801
...
...
@@ -72,6 +72,46 @@ public static bool IsScript(this SyntaxTree syntaxTree)
return
default
;
}
/// <summary>
/// Returns the first Token that passes <paramref name="predicate"/> within supplied <paramref name="span"/>.
/// </summary>
public
static
async
Task
<
SyntaxToken
>
GetLeftmostTokenInSpanAsync
(
this
SyntaxTree
syntaxTree
,
TextSpan
span
,
Predicate
<
SyntaxToken
>
predicate
,
CancellationToken
cancellationToken
,
bool
findInsideTrivia
=
false
,
bool
includeSkipped
=
true
,
bool
includeDirectives
=
false
,
bool
includeDocumentationComments
=
false
)
{
Contract
.
ThrowIfNull
(
syntaxTree
);
if
(
span
.
Start
>=
syntaxTree
.
Length
)
{
return
default
;
}
var
root
=
await
syntaxTree
.
GetRootAsync
(
cancellationToken
).
ConfigureAwait
(
false
);
var
token
=
root
.
FindToken
(
span
.
Start
,
findInsideTrivia
);
while
(!
predicate
(
token
))
{
if
(
token
.
FullSpan
.
End
>=
syntaxTree
.
Length
)
{
// SyntaxKind = None
return
default
;
}
token
=
root
.
FindTokenOnRightOfPosition
(
token
.
FullSpan
.
End
,
includeSkipped
,
includeDirectives
,
includeDocumentationComments
);
}
return
token
;
}
public
static
bool
IsEntirelyHidden
(
this
SyntaxTree
tree
,
TextSpan
span
,
CancellationToken
cancellationToken
)
{
if
(!
tree
.
HasHiddenRegions
())
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录