Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
ab6c64b6
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,发现更多精彩内容 >>
提交
ab6c64b6
编写于
5月 29, 2017
作者:
C
CyrusNajmabadi
提交者:
GitHub
5月 29, 2017
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #19836 from CyrusNajmabadi/nullPropagationNullable
Properly use ?. in an expression containing a nullable type.
上级
166ff84c
e9be1e2f
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
132 addition
and
14 deletion
+132
-14
src/EditorFeatures/CSharpTest/UseNullPropagation/UseNullPropagationTests.cs
.../CSharpTest/UseNullPropagation/UseNullPropagationTests.cs
+70
-0
src/Features/Core/Portable/AddParameter/AbstractAddParameterCodeFixProvider.cs
...table/AddParameter/AbstractAddParameterCodeFixProvider.cs
+1
-4
src/Features/Core/Portable/GenerateMember/GenerateParameterizedMember/AbstractGenerateParameterizedMemberService.SignatureInfo.cs
...stractGenerateParameterizedMemberService.SignatureInfo.cs
+1
-1
src/Features/Core/Portable/UseNullPropagation/AbstractUseNullPropagationCodeFixProvider.cs
...lPropagation/AbstractUseNullPropagationCodeFixProvider.cs
+35
-4
src/Features/Core/Portable/UseNullPropagation/AbstractUseNullPropagationDiagnosticAnalyzer.cs
...opagation/AbstractUseNullPropagationDiagnosticAnalyzer.cs
+14
-1
src/Workspaces/CSharp/Portable/LanguageServices/CSharpSyntaxFactsService.cs
...arp/Portable/LanguageServices/CSharpSyntaxFactsService.cs
+2
-0
src/Workspaces/Core/Portable/FindSymbols/Extensions.cs
src/Workspaces/Core/Portable/FindSymbols/Extensions.cs
+2
-4
src/Workspaces/Core/Portable/LanguageServices/SyntaxFactsService/ISyntaxFactsService.cs
...anguageServices/SyntaxFactsService/ISyntaxFactsService.cs
+1
-0
src/Workspaces/VisualBasic/Portable/LanguageServices/VisualBasicSyntaxFactsService.vb
...ortable/LanguageServices/VisualBasicSyntaxFactsService.vb
+6
-0
未找到文件。
src/EditorFeatures/CSharpTest/UseNullPropagation/UseNullPropagationTests.cs
浏览文件 @
ab6c64b6
...
...
@@ -360,5 +360,75 @@ public void Method<T>(Expression<Func<T, string>> functor)
}
}"
);
}
[
WorkItem
(
19774
,
"https://github.com/dotnet/roslyn/issues/19774"
)]
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsUseNullPropagation
)]
public
async
Task
TestNullableMemberAccess
()
{
await
TestInRegularAndScriptAsync
(
@"
using System;
class C
{
void Main(DateTime? toDate)
{
var v = [||]toDate == null ? null : toDate.Value.ToString(""yyyy/MM/ dd"");
}
}
"
,
@"
using System;
class C
{
void Main(DateTime? toDate)
{
var v = toDate?.ToString(""yyyy/MM/ dd"");
}
}
"
);
}
[
WorkItem
(
19774
,
"https://github.com/dotnet/roslyn/issues/19774"
)]
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsUseNullPropagation
)]
public
async
Task
TestNullableElementAccess
()
{
await
TestInRegularAndScriptAsync
(
@"
using System;
struct S
{
public string this[int i] => """";
}
class C
{
void Main(S? s)
{
var x = [||]s == null ? null : s.Value[0];
}
}
"
,
@"
using System;
struct S
{
public string this[int i] => """";
}
class C
{
void Main(S? s)
{
var x = s?[0];
}
}
"
);
}
}
}
\ No newline at end of file
src/Features/Core/Portable/AddParameter/AbstractAddParameterCodeFixProvider.cs
浏览文件 @
ab6c64b6
...
...
@@ -110,10 +110,7 @@ public override async Task RegisterCodeFixesAsync(CodeFixContext context)
var
arguments
=
(
SeparatedSyntaxList
<
TArgumentSyntax
>)
syntaxFacts
.
GetArgumentsOfObjectCreationExpression
(
objectCreation
);
var
comparer
=
syntaxFacts
.
IsCaseSensitive
?
StringComparer
.
Ordinal
:
CaseInsensitiveComparison
.
Comparer
;
var
comparer
=
syntaxFacts
.
StringComparer
;
var
constructorsAndArgumentToAdd
=
ArrayBuilder
<(
IMethodSymbol
constructor
,
TArgumentSyntax
argument
,
int
index
)>.
GetInstance
();
foreach
(
var
constructor
in
type
.
InstanceConstructors
.
OrderBy
(
m
=>
m
.
Parameters
.
Length
))
...
...
src/Features/Core/Portable/GenerateMember/GenerateParameterizedMember/AbstractGenerateParameterizedMemberService.SignatureInfo.cs
浏览文件 @
ab6c64b6
...
...
@@ -121,7 +121,7 @@ public ITypeSymbol DetermineReturnType(CancellationToken cancellationToken)
var
languageServiceProvider
=
this
.
Document
.
Project
.
Solution
.
Workspace
.
Services
.
GetLanguageServices
(
this
.
State
.
TypeToGenerateIn
.
Language
);
var
syntaxFacts
=
languageServiceProvider
.
GetService
<
ISyntaxFactsService
>();
var
equalityComparer
=
syntaxFacts
.
IsCaseSensitive
?
StringComparer
.
Ordinal
:
StringComparer
.
OrdinalIgnoreCase
;
var
equalityComparer
=
syntaxFacts
.
StringComparer
;
var
reservedParameterNames
=
this
.
DetermineParameterNames
(
cancellationToken
)
.
Select
(
p
=>
p
.
BestNameForParameter
)
.
ToSet
(
equalityComparer
);
...
...
src/Features/Core/Portable/UseNullPropagation/AbstractUseNullPropagationCodeFixProvider.cs
浏览文件 @
ab6c64b6
...
...
@@ -65,6 +65,7 @@ public override Task RegisterCodeFixesAsync(CodeFixContext context)
syntaxFacts
.
GetPartsOfConditionalExpression
(
conditionalExpression
,
out
var
condition
,
out
var
whenTrue
,
out
var
whenFalse
);
var
whenPartIsNullable
=
diagnostic
.
Properties
.
ContainsKey
(
UseNullPropagationConstants
.
WhenPartIsNullable
);
editor
.
ReplaceNode
(
conditionalExpression
,
(
c
,
g
)
=>
{
syntaxFacts
.
GetPartsOfConditionalExpression
(
...
...
@@ -82,7 +83,7 @@ public override Task RegisterCodeFixesAsync(CodeFixContext context)
}
var
newNode
=
CreateConditionalAccessExpression
(
syntaxFacts
,
g
,
currentWhenPartToCheck
,
match
,
c
);
syntaxFacts
,
g
,
whenPartIsNullable
,
currentWhenPartToCheck
,
match
,
c
);
newNode
=
newNode
.
WithTriviaFrom
(
c
);
return
newNode
;
...
...
@@ -93,10 +94,40 @@ public override Task RegisterCodeFixesAsync(CodeFixContext context)
}
private
SyntaxNode
CreateConditionalAccessExpression
(
ISyntaxFactsService
syntaxFacts
,
SyntaxGenerator
generator
,
ISyntaxFactsService
syntaxFacts
,
SyntaxGenerator
generator
,
bool
whenPartIsNullable
,
SyntaxNode
whenPart
,
SyntaxNode
match
,
SyntaxNode
currentConditional
)
{
var
memberAccess
=
match
.
Parent
as
TMemberAccessExpression
;
if
(
whenPartIsNullable
)
{
if
(
match
.
Parent
is
TMemberAccessExpression
memberAccess
)
{
var
nameNode
=
syntaxFacts
.
GetNameOfMemberAccessExpression
(
memberAccess
);
syntaxFacts
.
GetNameAndArityOfSimpleName
(
nameNode
,
out
var
name
,
out
var
arity
);
var
comparer
=
syntaxFacts
.
StringComparer
;
if
(
arity
==
0
&&
comparer
.
Equals
(
name
,
nameof
(
Nullable
<
int
>.
Value
)))
{
// They're calling ".Value" off of a nullable. Because we're moving to ?.
// we want to remove the .Value as well. i.e. we should generate:
//
// foo?.Bar() not foo?.Value.Bar();
return
CreateConditionalAccessExpression
(
syntaxFacts
,
generator
,
whenPart
,
match
,
memberAccess
.
Parent
,
currentConditional
);
}
}
}
return
CreateConditionalAccessExpression
(
syntaxFacts
,
generator
,
whenPart
,
match
,
match
.
Parent
,
currentConditional
);
}
private
SyntaxNode
CreateConditionalAccessExpression
(
ISyntaxFactsService
syntaxFacts
,
SyntaxGenerator
generator
,
SyntaxNode
whenPart
,
SyntaxNode
match
,
SyntaxNode
matchParent
,
SyntaxNode
currentConditional
)
{
var
memberAccess
=
matchParent
as
TMemberAccessExpression
;
if
(
memberAccess
!=
null
)
{
return
whenPart
.
ReplaceNode
(
memberAccess
,
...
...
@@ -106,7 +137,7 @@ public override Task RegisterCodeFixesAsync(CodeFixContext context)
syntaxFacts
.
GetNameOfMemberAccessExpression
(
memberAccess
))));
}
var
elementAccess
=
match
.
Parent
as
TElementAccessExpression
;
var
elementAccess
=
matchParent
as
TElementAccessExpression
;
if
(
elementAccess
!=
null
)
{
return
whenPart
.
ReplaceNode
(
elementAccess
,
...
...
src/Features/Core/Portable/UseNullPropagation/AbstractUseNullPropagationDiagnosticAnalyzer.cs
浏览文件 @
ab6c64b6
...
...
@@ -8,6 +8,11 @@
namespace
Microsoft.CodeAnalysis.UseNullPropagation
{
internal
static
class
UseNullPropagationConstants
{
public
const
string
WhenPartIsNullable
=
nameof
(
WhenPartIsNullable
);
}
internal
abstract
class
AbstractUseNullPropagationDiagnosticAnalyzer
<
TSyntaxKind
,
TExpressionSyntax
,
...
...
@@ -147,10 +152,18 @@ private void AnalyzeSyntax(SyntaxNodeAnalysisContext context, INamedTypeSymbol e
conditionPartToCheck
.
GetLocation
(),
whenPartToCheck
.
GetLocation
());
var
properties
=
ImmutableDictionary
<
string
,
string
>.
Empty
;
var
whenPartIsNullable
=
semanticModel
.
GetTypeInfo
(
whenPartMatch
).
Type
?.
OriginalDefinition
.
SpecialType
==
SpecialType
.
System_Nullable_T
;
if
(
whenPartIsNullable
)
{
properties
=
properties
.
Add
(
UseNullPropagationConstants
.
WhenPartIsNullable
,
""
);
}
context
.
ReportDiagnostic
(
Diagnostic
.
Create
(
this
.
GetDescriptorWithSeverity
(
option
.
Notification
.
Value
),
conditionalExpression
.
GetLocation
(),
locations
));
locations
,
properties
));
}
internal
static
SyntaxNode
GetWhenPartMatch
(
...
...
src/Workspaces/CSharp/Portable/LanguageServices/CSharpSyntaxFactsService.cs
浏览文件 @
ab6c64b6
...
...
@@ -30,6 +30,8 @@ private CSharpSyntaxFactsService()
public
bool
IsCaseSensitive
=>
true
;
public
StringComparer
StringComparer
{
get
;
}
=
StringComparer
.
Ordinal
;
protected
override
IDocumentationCommentService
DocumentationCommentService
=>
CSharpDocumentationCommentService
.
Instance
;
...
...
src/Workspaces/Core/Portable/FindSymbols/Extensions.cs
浏览文件 @
ab6c64b6
...
...
@@ -69,8 +69,6 @@ public static async Task<IEnumerable<SyntaxToken>> GetConstructorInitializerToke
}
internal
static
bool
TextMatch
(
this
ISyntaxFactsService
syntaxFacts
,
string
text1
,
string
text2
)
{
return
syntaxFacts
.
IsCaseSensitive
?
text1
==
text2
:
string
.
Equals
(
text1
,
text2
,
StringComparison
.
OrdinalIgnoreCase
);
}
=>
syntaxFacts
.
StringComparer
.
Equals
(
text1
,
text2
);
}
}
}
\ No newline at end of file
src/Workspaces/Core/Portable/LanguageServices/SyntaxFactsService/ISyntaxFactsService.cs
浏览文件 @
ab6c64b6
...
...
@@ -13,6 +13,7 @@ namespace Microsoft.CodeAnalysis.LanguageServices
internal
interface
ISyntaxFactsService
:
ILanguageService
{
bool
IsCaseSensitive
{
get
;
}
StringComparer
StringComparer
{
get
;
}
bool
SupportsIndexingInitializer
(
ParseOptions
options
);
bool
SupportsThrowExpression
(
ParseOptions
options
);
...
...
src/Workspaces/VisualBasic/Portable/LanguageServices/VisualBasicSyntaxFactsService.vb
浏览文件 @
ab6c64b6
...
...
@@ -40,6 +40,12 @@ Namespace Microsoft.CodeAnalysis.VisualBasic
End
Get
End
Property
Public
ReadOnly
Property
StringComparer
As
StringComparer
Implements
ISyntaxFactsService
.
StringComparer
Get
Return
CaseInsensitiveComparison
.
Comparer
End
Get
End
Property
Protected
Overrides
ReadOnly
Property
DocumentationCommentService
As
IDocumentationCommentService
Get
Return
VisualBasicDocumentationCommentService
.
Instance
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录