Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
24fddfff
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,发现更多精彩内容 >>
提交
24fddfff
编写于
1月 15, 2018
作者:
M
Martin Strecker
提交者:
Sam Harwell
2月 14, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Added check for value type constraint parameter.
上级
f67fb259
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
66 addition
and
10 deletion
+66
-10
src/EditorFeatures/CSharpTest/UseIsNullCheck/UseIsNullCheckTests.cs
...Features/CSharpTest/UseIsNullCheck/UseIsNullCheckTests.cs
+28
-9
src/EditorFeatures/VisualBasicTest/UseIsNullCheck/UseIsNullCheckTests.vb
...res/VisualBasicTest/UseIsNullCheck/UseIsNullCheckTests.vb
+15
-0
src/Features/Core/Portable/UseIsNullCheck/AbstractUseIsNullDiagnosticAnalyzer.cs
...ble/UseIsNullCheck/AbstractUseIsNullDiagnosticAnalyzer.cs
+23
-1
未找到文件。
src/EditorFeatures/CSharpTest/UseIsNullCheck/UseIsNullCheckTests.cs
浏览文件 @
24fddfff
...
...
@@ -226,22 +226,22 @@ public async Task TestMissingIfValueParameterTypeIsUnconstraintGeneric()
@"
class C
{
public static void NotNull<T>(T value
, string parameterName
)
public static void NotNull<T>(T value)
{
if ([||]ReferenceEquals(value, null))
{
throw new System.ArgumentNullException(parameterName)
;
return
;
}
}
}
"
,
@"
class C
{
public static void NotNull<T>(T value
, string parameterName
)
public static void NotNull<T>(T value)
{
if (value == null)
{
throw new System.ArgumentNullException(parameterName)
;
return
;
}
}
}
...
...
@@ -250,17 +250,17 @@ public static void NotNull<T>(T value, string parameterName)
[
WorkItem
(
23581
,
"https://github.com/dotnet/roslyn/issues/23581"
)]
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsUseIsNullCheck
)]
public
async
Task
TestValueParameterTypeIsConstraintGeneric
()
public
async
Task
TestValueParameterTypeIs
Ref
ConstraintGeneric
()
{
await
TestInRegularAndScriptAsync
(
@"
class C
{
public static void NotNull<T>(T value
, string parameterName
) where T:class
public static void NotNull<T>(T value) where T:class
{
if ([||]ReferenceEquals(value, null))
{
throw new System.ArgumentNullException(parameterName)
;
return
;
}
}
}
...
...
@@ -268,11 +268,30 @@ class C
@"
class C
{
public static void NotNull<T>(T value
, string parameterName
) where T:class
public static void NotNull<T>(T value) where T:class
{
if (value == null)
{
throw new System.ArgumentNullException(parameterName);
return;
}
}
}
"
);
}
[
WorkItem
(
23581
,
"https://github.com/dotnet/roslyn/issues/23581"
)]
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsUseIsNullCheck
)]
public
async
Task
TestValueParameterTypeIsValueConstraintGeneric
()
{
await
TestMissingAsync
(
@"
class C
{
public static void NotNull<T>(T value) where T:struct
{
if ([||]ReferenceEquals(value, null))
{
return;
}
}
}
...
...
src/EditorFeatures/VisualBasicTest/UseIsNullCheck/UseIsNullCheckTests.vb
浏览文件 @
24fddfff
...
...
@@ -179,6 +179,21 @@ class C
return
end if
end sub
end class"
)
End
Function
<
WorkItem
(
23581
,
"https://github.com/dotnet/roslyn/issues/23581"
)
>
<
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsUseIsNullCheck
)
>
Public
Async
Function
TestValueParameterTypeIsValueConstraintGeneric
()
As
Task
Await
TestMissingInRegularAndScriptAsync
(
"Imports System
class C
sub M(Of T As Structure)(v as T)
if ([||]ReferenceEquals(Nothing, v))
return
end if
end sub
end class"
)
End
Function
End
Class
...
...
src/Features/Core/Portable/UseIsNullCheck/AbstractUseIsNullDiagnosticAnalyzer.cs
浏览文件 @
24fddfff
...
...
@@ -28,7 +28,8 @@ public override bool OpenFileOnly(Workspace workspace)
=>
false
;
protected
override
void
InitializeWorker
(
AnalysisContext
context
)
=>
context
.
RegisterCompilationStartAction
(
compilationContext
=>
{
=>
context
.
RegisterCompilationStartAction
(
compilationContext
=>
{
var
objectType
=
compilationContext
.
Compilation
.
GetSpecialType
(
SpecialType
.
System_Object
);
if
(
objectType
!=
null
)
{
...
...
@@ -109,6 +110,11 @@ private void AnalyzeSyntax(SyntaxNodeAnalysisContext context, IMethodSymbol refe
return
;
}
if
(
HasValueTypeConstraintGenericParameter
(
syntaxFacts
,
semanticModel
,
arguments
[
0
],
arguments
[
1
],
cancellationToken
))
{
return
;
}
var
additionalLocations
=
ImmutableArray
.
Create
(
invocation
.
GetLocation
());
var
properties
=
ImmutableDictionary
<
string
,
string
>.
Empty
;
...
...
@@ -125,6 +131,22 @@ private void AnalyzeSyntax(SyntaxNodeAnalysisContext context, IMethodSymbol refe
additionalLocations
,
properties
));
}
private
static
bool
HasValueTypeConstraintGenericParameter
(
ISyntaxFactsService
syntaxFacts
,
SemanticModel
semanticModel
,
SyntaxNode
node1
,
SyntaxNode
node2
,
CancellationToken
cancellationToken
)
{
var
valueNode
=
syntaxFacts
.
IsNullLiteralExpression
(
syntaxFacts
.
GetExpressionOfArgument
(
node1
))
?
node2
:
node1
;
var
argumentExpression
=
syntaxFacts
.
GetExpressionOfArgument
(
valueNode
);
if
(
argumentExpression
!=
null
)
{
var
parameterType
=
semanticModel
.
GetTypeInfo
(
argumentExpression
,
cancellationToken
).
Type
;
if
(
parameterType
is
ITypeParameterSymbol
typeParameter
)
{
return
typeParameter
.
HasValueTypeConstraint
;
}
}
return
false
;
}
private
static
bool
MatchesPattern
(
ISyntaxFactsService
syntaxFacts
,
SyntaxNode
node1
,
SyntaxNode
node2
)
=>
syntaxFacts
.
IsNullLiteralExpression
(
syntaxFacts
.
GetExpressionOfArgument
(
node1
))
&&
!
syntaxFacts
.
IsNullLiteralExpression
(
syntaxFacts
.
GetExpressionOfArgument
(
node2
));
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录