Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
62145930
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,发现更多精彩内容 >>
未验证
提交
62145930
编写于
10月 18, 2018
作者:
H
Heejae Chang
提交者:
GitHub
10月 18, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add workaround on extract method on
https://github.com/dotnet/roslyn/issues/30548
(#30550)
上级
28272087
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
119 addition
and
2 deletion
+119
-2
src/Compilers/CSharp/Test/Semantic/FlowAnalysis/RegionAnalysisTests.cs
.../CSharp/Test/Semantic/FlowAnalysis/RegionAnalysisTests.cs
+48
-2
src/EditorFeatures/CSharpTest/ExtractMethod/ExtractMethodTests.cs
...orFeatures/CSharpTest/ExtractMethod/ExtractMethodTests.cs
+67
-0
src/Features/Core/Portable/ExtractMethod/ExtractMethodMatrix.cs
...atures/Core/Portable/ExtractMethod/ExtractMethodMatrix.cs
+4
-0
未找到文件。
src/Compilers/CSharp/Test/Semantic/FlowAnalysis/RegionAnalysisTests.cs
浏览文件 @
62145930
// 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.Generic
;
using
System.Linq
;
using
Microsoft.CodeAnalysis.CSharp.Symbols
;
using
Microsoft.CodeAnalysis.CSharp.Syntax
;
using
Microsoft.CodeAnalysis.Text
;
using
Roslyn.Test.Utilities
;
using
Xunit
;
...
...
@@ -6314,6 +6312,54 @@ void M()
Assert
.
Equal
(
"this, x"
,
GetSymbolNamesJoined
(
dataFlowAnalysisResults
.
WrittenOutside
));
}
[
Fact
(
Skip
=
"https://github.com/dotnet/roslyn/issues/30548"
)]
[
WorkItem
(
30548
,
"https://github.com/dotnet/roslyn/issues/30548"
)]
public
void
SymbolInDataFlowInButNotInReadInside
()
{
var
analysisResults
=
CompileAndAnalyzeControlAndDataFlowStatements
(
@"
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace ConsoleApp39
{
class Program
{
void Method(out object test)
{
test = null;
var a = test != null;
/*<bind>*/if (a)
{
return;
}
if (A == a)
{
test = new object();
}/*</bind>*/
}
}
}"
);
var
dataFlowAnalysisResults
=
analysisResults
.
Item2
;
Assert
.
Equal
(
null
,
GetSymbolNamesJoined
(
dataFlowAnalysisResults
.
VariablesDeclared
));
Assert
.
Equal
(
null
,
GetSymbolNamesJoined
(
dataFlowAnalysisResults
.
AlwaysAssigned
));
Assert
.
Equal
(
null
,
GetSymbolNamesJoined
(
dataFlowAnalysisResults
.
Captured
));
Assert
.
Equal
(
null
,
GetSymbolNamesJoined
(
dataFlowAnalysisResults
.
CapturedInside
));
Assert
.
Equal
(
null
,
GetSymbolNamesJoined
(
dataFlowAnalysisResults
.
CapturedOutside
));
Assert
.
Equal
(
"test, a"
,
GetSymbolNamesJoined
(
dataFlowAnalysisResults
.
DataFlowsIn
));
Assert
.
Equal
(
"test"
,
GetSymbolNamesJoined
(
dataFlowAnalysisResults
.
DataFlowsOut
));
Assert
.
Equal
(
"a"
,
GetSymbolNamesJoined
(
dataFlowAnalysisResults
.
ReadInside
));
Assert
.
Equal
(
"test"
,
GetSymbolNamesJoined
(
dataFlowAnalysisResults
.
ReadOutside
));
Assert
.
Equal
(
"test"
,
GetSymbolNamesJoined
(
dataFlowAnalysisResults
.
WrittenInside
));
Assert
.
Equal
(
"this, test, a"
,
GetSymbolNamesJoined
(
dataFlowAnalysisResults
.
WrittenOutside
));
}
#
endregion
}
}
src/EditorFeatures/CSharpTest/ExtractMethod/ExtractMethodTests.cs
浏览文件 @
62145930
...
...
@@ -10939,5 +10939,72 @@ private void NewMethod(int value, int value2)
await
TestExtractMethodAsync
(
code
,
expected
);
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
ExtractMethod
)]
public
async
Task
TestDataFlowInButNoReadInside
()
{
var
code
=
@"using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace ConsoleApp39
{
class Program
{
void Method(out object test)
{
test = null;
var a = test != null;
[|if (a)
{
return;
}
if (A == a)
{
test = new object();
}|]
}
}
}"
;
var
expected
=
@"using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace ConsoleApp39
{
class Program
{
void Method(out object test)
{
test = null;
var a = test != null;
NewMethod(ref test, a);
}
private static void NewMethod(ref object test, bool a)
{
if (a)
{
return;
}
if (A == a)
{
test = new object();
}
}
}
}"
;
await
TestExtractMethodAsync
(
code
,
expected
);
}
}
}
src/Features/Core/Portable/ExtractMethod/ExtractMethodMatrix.cs
浏览文件 @
62145930
...
...
@@ -158,6 +158,10 @@ private static void BuildMatrix()
s_matrix
.
Add
(
new
Key
(
dataFlowIn
:
true
,
dataFlowOut
:
false
,
alwaysAssigned
:
true
,
variableDeclared
:
false
,
readInside
:
true
,
writtenInside
:
true
,
readOutside
:
false
,
writtenOutside
:
true
),
VariableStyle
.
InputOnly
);
s_matrix
.
Add
(
new
Key
(
dataFlowIn
:
true
,
dataFlowOut
:
false
,
alwaysAssigned
:
true
,
variableDeclared
:
false
,
readInside
:
true
,
writtenInside
:
true
,
readOutside
:
true
,
writtenOutside
:
false
),
VariableStyle
.
InputOnly
);
s_matrix
.
Add
(
new
Key
(
dataFlowIn
:
true
,
dataFlowOut
:
false
,
alwaysAssigned
:
true
,
variableDeclared
:
false
,
readInside
:
true
,
writtenInside
:
true
,
readOutside
:
true
,
writtenOutside
:
true
),
VariableStyle
.
InputOnly
);
// workaround for the bug(https://github.com/dotnet/roslyn/issues/30548)
s_matrix
.
Add
(
new
Key
(
dataFlowIn
:
true
,
dataFlowOut
:
true
,
alwaysAssigned
:
false
,
variableDeclared
:
false
,
readInside
:
false
,
writtenInside
:
true
,
readOutside
:
true
,
writtenOutside
:
true
),
VariableStyle
.
Ref
);
s_matrix
.
Add
(
new
Key
(
dataFlowIn
:
true
,
dataFlowOut
:
true
,
alwaysAssigned
:
false
,
variableDeclared
:
false
,
readInside
:
true
,
writtenInside
:
true
,
readOutside
:
true
,
writtenOutside
:
false
),
VariableStyle
.
OutWithErrorInput
);
s_matrix
.
Add
(
new
Key
(
dataFlowIn
:
true
,
dataFlowOut
:
true
,
alwaysAssigned
:
false
,
variableDeclared
:
false
,
readInside
:
true
,
writtenInside
:
true
,
readOutside
:
true
,
writtenOutside
:
true
),
VariableStyle
.
Ref
);
s_matrix
.
Add
(
new
Key
(
dataFlowIn
:
true
,
dataFlowOut
:
true
,
alwaysAssigned
:
true
,
variableDeclared
:
false
,
readInside
:
true
,
writtenInside
:
true
,
readOutside
:
true
,
writtenOutside
:
false
),
VariableStyle
.
OutWithErrorInput
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录