Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
6bbfdc8f
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,发现更多精彩内容 >>
提交
6bbfdc8f
编写于
4月 03, 2020
作者:
C
Cyrus Najmabadi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix
上级
522c2c9b
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
5 addition
and
9 deletion
+5
-9
src/Features/Core/Portable/EncapsulateField/AbstractEncapsulateFieldService.cs
...table/EncapsulateField/AbstractEncapsulateFieldService.cs
+5
-9
未找到文件。
src/Features/Core/Portable/EncapsulateField/AbstractEncapsulateFieldService.cs
浏览文件 @
6bbfdc8f
...
...
@@ -244,14 +244,12 @@ private async Task<Result> EncapsulateFieldAsync(IFieldSymbol field, Document do
var
projectId
=
document
.
Project
.
Id
;
if
(
field
.
IsReadOnly
)
{
var
fieldAnProjectId
=
SymbolAndProjectId
.
Create
(
field
,
projectId
);
// Inside the constructor we want to rename references the field to the final field name.
var
constructorLocations
=
GetConstructorLocations
(
field
.
ContainingType
);
if
(
finalFieldName
!=
field
.
Name
&&
constructorLocations
.
Count
>
0
)
{
solution
=
await
RenameAsync
(
solution
,
fieldAnProjectId
,
finalFieldName
,
solution
,
SymbolAndProjectId
.
Create
(
field
,
projectId
)
,
finalFieldName
,
location
=>
IntersectsWithAny
(
location
,
constructorLocations
),
cancellationToken
).
ConfigureAwait
(
false
);
...
...
@@ -264,7 +262,7 @@ private async Task<Result> EncapsulateFieldAsync(IFieldSymbol field, Document do
// Outside the constructor we want to rename references to the field to final property name.
return
await
RenameAsync
(
solution
,
fieldAnProjectId
,
generatedPropertyName
,
solution
,
SymbolAndProjectId
.
Create
(
field
,
projectId
)
,
generatedPropertyName
,
location
=>
!
IntersectsWithAny
(
location
,
constructorLocations
),
cancellationToken
).
ConfigureAwait
(
false
);
}
...
...
@@ -272,8 +270,7 @@ private async Task<Result> EncapsulateFieldAsync(IFieldSymbol field, Document do
{
// Just rename everything.
return
await
Renamer
.
RenameSymbolAsync
(
solution
,
SymbolAndProjectId
.
Create
(
field
,
projectId
),
generatedPropertyName
,
solution
.
Options
,
cancellationToken
).
ConfigureAwait
(
false
);
solution
,
SymbolAndProjectId
.
Create
(
field
,
projectId
),
generatedPropertyName
,
solution
.
Options
,
cancellationToken
).
ConfigureAwait
(
false
);
}
}
...
...
@@ -287,10 +284,9 @@ private async Task<Result> EncapsulateFieldAsync(IFieldSymbol field, Document do
var
initialLocations
=
await
Renamer
.
GetRenameLocationsAsync
(
solution
,
field
,
solution
.
Options
,
cancellationToken
).
ConfigureAwait
(
false
);
var
insideLocations
=
initialLocations
.
Filter
(
filter
);
return
await
Renamer
.
RenameAsync
(
insideLocations
,
finalName
,
cancellationToken
:
cancellationToken
).
ConfigureAwait
(
false
);
initialLocations
.
Filter
(
filter
),
finalName
,
cancellationToken
:
cancellationToken
).
ConfigureAwait
(
false
);
}
private
bool
IntersectsWithAny
(
Location
location
,
ISet
<
Location
>
constructorLocations
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录