Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
d5fd7036
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,发现更多精彩内容 >>
提交
d5fd7036
编写于
3月 18, 2017
作者:
C
CyrusNajmabadi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Get things building.
上级
1368d3a6
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
25 addition
and
17 deletion
+25
-17
src/EditorFeatures/TestUtilities/CodeActions/AbstractCodeActionTest.cs
...tures/TestUtilities/CodeActions/AbstractCodeActionTest.cs
+6
-4
src/Features/Core/Portable/GenerateConstructorFromMembers/GenerateConstructorWithDialogCodeAction.cs
...torFromMembers/GenerateConstructorWithDialogCodeAction.cs
+2
-1
src/Features/Core/Portable/GenerateEqualsAndGetHashCodeFromMembers/GenerateEqualsAndHashWithDialogCodeAction.cs
...eFromMembers/GenerateEqualsAndHashWithDialogCodeAction.cs
+1
-2
src/Features/Core/Portable/PickMembers/IPickMembersService.cs
...Features/Core/Portable/PickMembers/IPickMembersService.cs
+10
-4
src/Features/Core/Portable/PickMembers/PickMembersResult.cs
src/Features/Core/Portable/PickMembers/PickMembersResult.cs
+2
-2
src/VisualStudio/Core/Def/Implementation/PickMembers/PickMembersDialogViewModel.cs
.../Implementation/PickMembers/PickMembersDialogViewModel.cs
+3
-3
src/VisualStudio/Core/Def/Implementation/PickMembers/VisualStudioPickMembersService.cs
...lementation/PickMembers/VisualStudioPickMembersService.cs
+1
-1
未找到文件。
src/EditorFeatures/TestUtilities/CodeActions/AbstractCodeActionTest.cs
浏览文件 @
d5fd7036
...
@@ -126,11 +126,13 @@ public TestPickMembersService(ImmutableArray<string> memberNames)
...
@@ -126,11 +126,13 @@ public TestPickMembersService(ImmutableArray<string> memberNames)
public
PickMembersResult
PickMembers
(
public
PickMembersResult
PickMembers
(
string
title
,
ImmutableArray
<
ISymbol
>
members
,
string
title
,
ImmutableArray
<
ISymbol
>
members
,
ImmutableArray
<
I
PickMembersOption
>
options
)
ImmutableArray
<
PickMembersOption
>
options
)
{
{
return
new
PickMembersResult
(
_memberNames
.
IsDefault
return
new
PickMembersResult
(
?
members
_memberNames
.
IsDefault
:
_memberNames
.
SelectAsArray
(
n
=>
members
.
Single
(
m
=>
m
.
Name
==
n
)));
?
members
:
_memberNames
.
SelectAsArray
(
n
=>
members
.
Single
(
m
=>
m
.
Name
==
n
)),
options
);
}
}
}
}
...
...
src/Features/Core/Portable/GenerateConstructorFromMembers/GenerateConstructorWithDialogCodeAction.cs
浏览文件 @
d5fd7036
...
@@ -43,7 +43,8 @@ public override object GetOptions(CancellationToken cancellationToken)
...
@@ -43,7 +43,8 @@ public override object GetOptions(CancellationToken cancellationToken)
var
workspace
=
_document
.
Project
.
Solution
.
Workspace
;
var
workspace
=
_document
.
Project
.
Solution
.
Workspace
;
var
service
=
_service
.
_pickMembersService_forTesting
??
workspace
.
Services
.
GetService
<
IPickMembersService
>();
var
service
=
_service
.
_pickMembersService_forTesting
??
workspace
.
Services
.
GetService
<
IPickMembersService
>();
return
service
.
PickMembers
(
return
service
.
PickMembers
(
FeaturesResources
.
Pick_members_to_be_used_as_constructor_parameters
,
_viableMembers
);
FeaturesResources
.
Pick_members_to_be_used_as_constructor_parameters
,
_viableMembers
,
ImmutableArray
.
Create
(
new
PickMembersOption
(
"Add null checks"
)));
}
}
protected
override
async
Task
<
IEnumerable
<
CodeActionOperation
>>
ComputeOperationsAsync
(
protected
override
async
Task
<
IEnumerable
<
CodeActionOperation
>>
ComputeOperationsAsync
(
...
...
src/Features/Core/Portable/GenerateEqualsAndGetHashCodeFromMembers/GenerateEqualsAndHashWithDialogCodeAction.cs
浏览文件 @
d5fd7036
...
@@ -44,8 +44,7 @@ public override object GetOptions(CancellationToken cancellationToken)
...
@@ -44,8 +44,7 @@ public override object GetOptions(CancellationToken cancellationToken)
{
{
var
service
=
_service
.
_pickMembersService_forTestingPurposes
??
_document
.
Project
.
Solution
.
Workspace
.
Services
.
GetService
<
IPickMembersService
>();
var
service
=
_service
.
_pickMembersService_forTestingPurposes
??
_document
.
Project
.
Solution
.
Workspace
.
Services
.
GetService
<
IPickMembersService
>();
return
service
.
PickMembers
(
FeaturesResources
.
Pick_members_to_be_used_in_Equals_GetHashCode
,
return
service
.
PickMembers
(
FeaturesResources
.
Pick_members_to_be_used_in_Equals_GetHashCode
,
_viableMembers
,
_viableMembers
);
);
}
}
protected
override
async
Task
<
IEnumerable
<
CodeActionOperation
>>
ComputeOperationsAsync
(
object
options
,
CancellationToken
cancellationToken
)
protected
override
async
Task
<
IEnumerable
<
CodeActionOperation
>>
ComputeOperationsAsync
(
object
options
,
CancellationToken
cancellationToken
)
...
...
src/Features/Core/Portable/PickMembers/IPickMembersService.cs
浏览文件 @
d5fd7036
...
@@ -9,12 +9,18 @@ internal interface IPickMembersService : IWorkspaceService
...
@@ -9,12 +9,18 @@ internal interface IPickMembersService : IWorkspaceService
{
{
PickMembersResult
PickMembers
(
PickMembersResult
PickMembers
(
string
title
,
ImmutableArray
<
ISymbol
>
members
,
string
title
,
ImmutableArray
<
ISymbol
>
members
,
ImmutableArray
<
IPickMembersOption
>
options
=
default
(
ImmutableArray
<
I
PickMembersOption
>));
ImmutableArray
<
PickMembersOption
>
options
=
default
(
ImmutableArray
<
PickMembersOption
>));
}
}
internal
interface
I
PickMembersOption
internal
class
PickMembersOption
{
{
string
Title
{
get
;
}
public
PickMembersOption
(
string
title
,
bool
value
=
false
)
bool
Value
{
get
;
set
;
}
{
Title
=
title
;
Value
=
value
;
}
public
string
Title
{
get
;
}
public
bool
Value
{
get
;
set
;
}
}
}
}
}
\ No newline at end of file
src/Features/Core/Portable/PickMembers/PickMembersResult.cs
浏览文件 @
d5fd7036
...
@@ -10,7 +10,7 @@ internal class PickMembersResult
...
@@ -10,7 +10,7 @@ internal class PickMembersResult
public
readonly
bool
IsCanceled
;
public
readonly
bool
IsCanceled
;
public
readonly
ImmutableArray
<
ISymbol
>
Members
;
public
readonly
ImmutableArray
<
ISymbol
>
Members
;
public
readonly
ImmutableArray
<
I
PickMembersOption
>
Options
;
public
readonly
ImmutableArray
<
PickMembersOption
>
Options
;
private
PickMembersResult
(
bool
isCanceled
)
private
PickMembersResult
(
bool
isCanceled
)
{
{
...
@@ -19,7 +19,7 @@ private PickMembersResult(bool isCanceled)
...
@@ -19,7 +19,7 @@ private PickMembersResult(bool isCanceled)
public
PickMembersResult
(
public
PickMembersResult
(
ImmutableArray
<
ISymbol
>
members
,
ImmutableArray
<
ISymbol
>
members
,
ImmutableArray
<
I
PickMembersOption
>
options
)
ImmutableArray
<
PickMembersOption
>
options
)
{
{
Members
=
members
;
Members
=
members
;
Options
=
options
;
Options
=
options
;
...
...
src/VisualStudio/Core/Def/Implementation/PickMembers/PickMembersDialogViewModel.cs
浏览文件 @
d5fd7036
...
@@ -23,7 +23,7 @@ internal class PickMembersDialogViewModel : AbstractNotifyPropertyChanged
...
@@ -23,7 +23,7 @@ internal class PickMembersDialogViewModel : AbstractNotifyPropertyChanged
internal
PickMembersDialogViewModel
(
internal
PickMembersDialogViewModel
(
IGlyphService
glyphService
,
IGlyphService
glyphService
,
ImmutableArray
<
ISymbol
>
members
,
ImmutableArray
<
ISymbol
>
members
,
ImmutableArray
<
I
PickMembersOption
>
options
)
ImmutableArray
<
PickMembersOption
>
options
)
{
{
MemberContainers
=
members
.
Select
(
m
=>
new
MemberSymbolViewModel
(
m
,
glyphService
)).
ToList
();
MemberContainers
=
members
.
Select
(
m
=>
new
MemberSymbolViewModel
(
m
,
glyphService
)).
ToList
();
Options
=
options
.
Select
(
o
=>
new
OptionViewModel
(
o
)).
ToList
();
Options
=
options
.
Select
(
o
=>
new
OptionViewModel
(
o
)).
ToList
();
...
@@ -186,9 +186,9 @@ public bool IsChecked
...
@@ -186,9 +186,9 @@ public bool IsChecked
internal
class
OptionViewModel
:
AbstractNotifyPropertyChanged
internal
class
OptionViewModel
:
AbstractNotifyPropertyChanged
{
{
public
I
PickMembersOption
Option
{
get
;
}
public
PickMembersOption
Option
{
get
;
}
public
OptionViewModel
(
I
PickMembersOption
option
)
public
OptionViewModel
(
PickMembersOption
option
)
{
{
Option
=
option
;
Option
=
option
;
_isChecked
=
option
.
Value
;
_isChecked
=
option
.
Value
;
...
...
src/VisualStudio/Core/Def/Implementation/PickMembers/VisualStudioPickMembersService.cs
浏览文件 @
d5fd7036
...
@@ -22,7 +22,7 @@ public VisualStudioPickMembersService(IGlyphService glyphService)
...
@@ -22,7 +22,7 @@ public VisualStudioPickMembersService(IGlyphService glyphService)
}
}
public
PickMembersResult
PickMembers
(
public
PickMembersResult
PickMembers
(
string
title
,
ImmutableArray
<
ISymbol
>
members
,
ImmutableArray
<
I
PickMembersOption
>
options
)
string
title
,
ImmutableArray
<
ISymbol
>
members
,
ImmutableArray
<
PickMembersOption
>
options
)
{
{
options
=
options
.
NullToEmpty
();
options
=
options
.
NullToEmpty
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录