Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
bf71ef42
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,发现更多精彩内容 >>
未验证
提交
bf71ef42
编写于
3月 24, 2020
作者:
S
Sam Harwell
提交者:
GitHub
3月 24, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #42714 from YairHalberstadt/unique-name-replace-method-with-property
GenerateUniqueName for ReplaceMethodWithProperty
上级
d2e50fd7
b90c3711
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
64 addition
and
1 deletion
+64
-1
src/EditorFeatures/CSharpTest/CodeActions/ReplaceMethodWithProperty/ReplaceMethodWithPropertyTests.cs
...placeMethodWithProperty/ReplaceMethodWithPropertyTests.cs
+24
-0
src/EditorFeatures/VisualBasicTest/CodeActions/ReplaceMethodWithProperty/ReplaceMethodWithPropertyTests.vb
...placeMethodWithProperty/ReplaceMethodWithPropertyTests.vb
+36
-0
src/Features/Core/Portable/ReplaceMethodWithProperty/ReplaceMethodWithPropertyCodeRefactoringProvider.cs
...perty/ReplaceMethodWithPropertyCodeRefactoringProvider.cs
+4
-1
未找到文件。
src/EditorFeatures/CSharpTest/CodeActions/ReplaceMethodWithProperty/ReplaceMethodWithPropertyTests.cs
浏览文件 @
bf71ef42
...
@@ -2335,6 +2335,30 @@ int GetGoo()
...
@@ -2335,6 +2335,30 @@ int GetGoo()
}"
);
}"
);
}
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsReplaceMethodWithProperty
)]
[
WorkItem
(
42699
,
"https://github.com/dotnet/roslyn/issues/42699"
)]
public
async
Task
TestSameNameMemberAsProperty
()
{
await
TestInRegularAndScript1Async
(
@"class C
{
int Goo;
[||]int GetGoo()
{
}
}"
,
@"class C
{
int Goo;
int Goo1
{
get
{
}
}
}"
);
}
private
async
Task
TestWithAllCodeStyleOff
(
private
async
Task
TestWithAllCodeStyleOff
(
string
initialMarkup
,
string
expectedMarkup
,
string
initialMarkup
,
string
expectedMarkup
,
ParseOptions
parseOptions
=
null
,
int
index
=
0
)
ParseOptions
parseOptions
=
null
,
int
index
=
0
)
...
...
src/EditorFeatures/VisualBasicTest/CodeActions/ReplaceMethodWithProperty/ReplaceMethodWithPropertyTests.vb
浏览文件 @
bf71ef42
...
@@ -911,5 +911,41 @@ end class")
...
@@ -911,5 +911,41 @@ end class")
End Function
End Function
end class"
)
end class"
)
End
Function
End
Function
<
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsReplaceMethodWithProperty
)
>
<
WorkItem
(
42699
,
"https://github.com/dotnet/roslyn/issues/42699"
)
>
Public
Async
Function
TestSameNameMemberAsProperty
()
As
Task
Await
TestInRegularAndScriptAsync
(
"class C
Public Goo as integer
function [||]GetGoo() as integer
End function
End class"
,
"class C
Public Goo as integer
ReadOnly Property Goo1 as integer
Get
End Get
End Property
End class"
)
End
Function
<
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsReplaceMethodWithProperty
)
>
<
WorkItem
(
42699
,
"https://github.com/dotnet/roslyn/issues/42699"
)
>
Public
Async
Function
TestSameNameMemberAsPropertyDifferentCase
()
As
Task
Await
TestInRegularAndScriptAsync
(
"class C
Public goo as integer
function [||]GetGoo() as integer
End function
End class"
,
"class C
Public goo as integer
ReadOnly Property Goo1 as integer
Get
End Get
End Property
End class"
)
End
Function
End
Class
End
Class
End
Namespace
End
Namespace
src/Features/Core/Portable/ReplaceMethodWithProperty/ReplaceMethodWithPropertyCodeRefactoringProvider.cs
浏览文件 @
bf71ef42
...
@@ -14,6 +14,7 @@
...
@@ -14,6 +14,7 @@
using
Microsoft.CodeAnalysis.Editing
;
using
Microsoft.CodeAnalysis.Editing
;
using
Microsoft.CodeAnalysis.FindSymbols
;
using
Microsoft.CodeAnalysis.FindSymbols
;
using
Microsoft.CodeAnalysis.Shared.Extensions
;
using
Microsoft.CodeAnalysis.Shared.Extensions
;
using
Microsoft.CodeAnalysis.Shared.Utilities
;
using
Roslyn.Utilities
;
using
Roslyn.Utilities
;
namespace
Microsoft.CodeAnalysis.ReplaceMethodWithProperty
namespace
Microsoft.CodeAnalysis.ReplaceMethodWithProperty
...
@@ -58,7 +59,9 @@ public override async Task ComputeRefactoringsAsync(CodeRefactoringContext conte
...
@@ -58,7 +59,9 @@ public override async Task ComputeRefactoringsAsync(CodeRefactoringContext conte
var
hasGetPrefix
=
HasGetPrefix
(
methodName
);
var
hasGetPrefix
=
HasGetPrefix
(
methodName
);
var
propertyName
=
hasGetPrefix
var
propertyName
=
hasGetPrefix
?
methodName
.
Substring
(
GetPrefix
.
Length
)
?
NameGenerator
.
GenerateUniqueName
(
methodName
.
Substring
(
GetPrefix
.
Length
),
n
=>
!
methodSymbol
.
ContainingType
.
GetMembers
(
n
).
Any
())
:
methodName
;
:
methodName
;
var
nameChanged
=
hasGetPrefix
;
var
nameChanged
=
hasGetPrefix
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录