Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
f7f5f26f
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,发现更多精彩内容 >>
提交
f7f5f26f
编写于
2月 22, 2017
作者:
C
CyrusNajmabadi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Use more immutable types.
上级
20a7fe98
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
39 addition
and
26 deletion
+39
-26
src/Features/Core/Portable/Features.csproj
src/Features/Core/Portable/Features.csproj
+1
-0
src/Features/Core/Portable/GenerateFromMembers/AbstractGenerateFromMembersService.cs
...GenerateFromMembers/AbstractGenerateFromMembersService.cs
+10
-26
src/Features/Core/Portable/GenerateFromMembers/SelectedMemberInfo.cs
...s/Core/Portable/GenerateFromMembers/SelectedMemberInfo.cs
+28
-0
未找到文件。
src/Features/Core/Portable/Features.csproj
浏览文件 @
f7f5f26f
...
...
@@ -128,6 +128,7 @@
<Compile
Include=
"CodeFixes\FixAllOccurrences\FixSomeCodeAction.cs"
/>
<Compile
Include=
"AddPackage\InstallPackageDirectlyCodeAction.cs"
/>
<Compile
Include=
"AddConstructorParametersFromMembers\State.cs"
/>
<Compile
Include=
"GenerateFromMembers\SelectedMemberInfo.cs"
/>
<Compile
Include=
"ImplementType\ImplementTypeOptions.cs"
/>
<Compile
Include=
"ImplementType\ImplementTypeOptionsProvider.cs"
/>
<Compile
Include=
"RemoveUnnecessaryImports\AbstractRemoveUnnecessaryImportsCodeFixProvider.cs"
/>
...
...
src/Features/Core/Portable/GenerateFromMembers/AbstractGenerateFromMembersService.cs
浏览文件 @
f7f5f26f
...
...
@@ -20,19 +20,12 @@ internal interface IGenerateFromMembersHelperService : ILanguageService
IEnumerable
<
ISymbol
>
GetDeclaredSymbols
(
SemanticModel
semanticModel
,
SyntaxNode
memberDeclaration
,
CancellationToken
cancellationToken
);
}
internal
abstract
class
AbstractGenerateFromMembersCodeRefactoringProvider
:
CodeRefactoringProvider
internal
abstract
partial
class
AbstractGenerateFromMembersCodeRefactoringProvider
:
CodeRefactoringProvider
{
protected
AbstractGenerateFromMembersCodeRefactoringProvider
()
{
}
protected
class
SelectedMemberInfo
{
public
INamedTypeSymbol
ContainingType
;
public
IList
<
SyntaxNode
>
SelectedDeclarations
;
public
IList
<
ISymbol
>
SelectedMembers
;
}
protected
async
Task
<
SelectedMemberInfo
>
GetSelectedMemberInfoAsync
(
Document
document
,
TextSpan
textSpan
,
CancellationToken
cancellationToken
)
{
...
...
@@ -44,13 +37,13 @@ protected class SelectedMemberInfo
{
var
semanticModel
=
await
document
.
GetSemanticModelAsync
(
cancellationToken
).
ConfigureAwait
(
false
);
var
selectedMembers
=
selectedDeclarations
.
SelectMany
(
d
=>
helper
.
GetDeclaredSymbols
(
semanticModel
,
d
,
cancellationToken
)).
WhereNotNull
().
To
List
();
if
(
selectedMembers
.
Count
>
0
)
d
=>
helper
.
GetDeclaredSymbols
(
semanticModel
,
d
,
cancellationToken
)).
WhereNotNull
().
To
ImmutableArray
();
if
(
selectedMembers
.
Length
>
0
)
{
var
containingType
=
selectedMembers
.
First
().
ContainingType
;
if
(
containingType
!=
null
)
{
return
new
SelectedMemberInfo
{
ContainingType
=
containingType
,
SelectedDeclarations
=
selectedDeclarations
,
SelectedMembers
=
selectedMembers
}
;
return
new
SelectedMemberInfo
(
containingType
,
selectedDeclarations
,
selectedMembers
)
;
}
}
}
...
...
@@ -58,13 +51,10 @@ protected class SelectedMemberInfo
return
null
;
}
// Can use non const fields and properties with setters in them.
protected
static
bool
IsWritableInstanceFieldOrProperty
(
ISymbol
symbol
)
{
// Can use non const fields and properties with setters in them.
return
IsInstanceFieldOrProperty
(
symbol
)
&&
IsWritableFieldOrProperty
(
symbol
);
}
=>
IsInstanceFieldOrProperty
(
symbol
)
&&
IsWritableFieldOrProperty
(
symbol
);
private
static
bool
IsWritableFieldOrProperty
(
ISymbol
symbol
)
{
...
...
@@ -77,19 +67,13 @@ private static bool IsWritableFieldOrProperty(ISymbol symbol)
}
protected
static
bool
IsInstanceFieldOrProperty
(
ISymbol
symbol
)
{
return
!
symbol
.
IsStatic
&&
(
IsField
(
symbol
)
||
IsProperty
(
symbol
));
}
=>
!
symbol
.
IsStatic
&&
(
IsField
(
symbol
)
||
IsProperty
(
symbol
));
private
static
bool
IsProperty
(
ISymbol
symbol
)
{
return
symbol
.
Kind
==
SymbolKind
.
Property
;
}
=>
symbol
.
Kind
==
SymbolKind
.
Property
;
private
static
bool
IsField
(
ISymbol
symbol
)
{
return
symbol
.
Kind
==
SymbolKind
.
Field
;
}
=>
symbol
.
Kind
==
SymbolKind
.
Field
;
protected
List
<
IParameterSymbol
>
DetermineParameters
(
IList
<
ISymbol
>
selectedMembers
)
...
...
src/Features/Core/Portable/GenerateFromMembers/SelectedMemberInfo.cs
0 → 100644
浏览文件 @
f7f5f26f
// 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.Collections.Immutable
;
using
Microsoft.CodeAnalysis.CodeRefactorings
;
namespace
Microsoft.CodeAnalysis.GenerateFromMembers
{
internal
abstract
partial
class
AbstractGenerateFromMembersCodeRefactoringProvider
:
CodeRefactoringProvider
{
protected
class
SelectedMemberInfo
{
public
readonly
INamedTypeSymbol
ContainingType
;
public
readonly
ImmutableArray
<
SyntaxNode
>
SelectedDeclarations
;
public
readonly
ImmutableArray
<
ISymbol
>
SelectedMembers
;
public
SelectedMemberInfo
(
INamedTypeSymbol
containingType
,
ImmutableArray
<
SyntaxNode
>
selectedDeclarations
,
ImmutableArray
<
ISymbol
>
selectedMembers
)
{
ContainingType
=
containingType
;
SelectedDeclarations
=
selectedDeclarations
;
SelectedMembers
=
selectedMembers
;
}
}
}
}
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录