Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
fb632068
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,发现更多精彩内容 >>
提交
fb632068
编写于
10月 29, 2019
作者:
I
Ivan Basov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
rename CoolParameter -> ParameterBase -> Parameter
上级
d9936136
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
23 addition
and
24 deletion
+23
-24
src/Features/Core/Portable/ChangeSignature/AbstractChangeSignatureService.cs
...ortable/ChangeSignature/AbstractChangeSignatureService.cs
+1
-1
src/Features/Core/Portable/ChangeSignature/Parameter.cs
src/Features/Core/Portable/ChangeSignature/Parameter.cs
+3
-3
src/Features/Core/Portable/ChangeSignature/ParameterConfiguration.cs
...s/Core/Portable/ChangeSignature/ParameterConfiguration.cs
+14
-15
src/VisualStudio/Core/Def/Implementation/ChangeSignature/ChangeSignatureDialogViewModel.cs
...ntation/ChangeSignature/ChangeSignatureDialogViewModel.cs
+4
-4
src/VisualStudio/Core/Test/ChangeSignature/ChangeSignatureViewModelTests.vb
...ore/Test/ChangeSignature/ChangeSignatureViewModelTests.vb
+1
-1
未找到文件。
src/Features/Core/Portable/ChangeSignature/AbstractChangeSignatureService.cs
浏览文件 @
fb632068
...
...
@@ -136,7 +136,7 @@ internal ChangeSignatureResult ChangeSignature(Document document, int position,
return
new
ChangeSignatureAnalyzedContext
(
CannotChangeSignatureReason
.
IncorrectKind
);
}
var
parameterConfiguration
=
ParameterConfiguration
.
Create
(
symbol
.
GetParameters
().
Select
(
p
=>
new
ExistingParameter
(
p
)).
ToList
<
Parameter
Base
>(),
symbol
is
IMethodSymbol
&&
(
symbol
as
IMethodSymbol
).
IsExtensionMethod
,
selectedIndex
);
var
parameterConfiguration
=
ParameterConfiguration
.
Create
(
symbol
.
GetParameters
().
Select
(
p
=>
new
ExistingParameter
(
p
)).
ToList
<
Parameter
>(),
symbol
is
IMethodSymbol
&&
(
symbol
as
IMethodSymbol
).
IsExtensionMethod
,
selectedIndex
);
if
(!
parameterConfiguration
.
IsChangeable
())
{
return
new
ChangeSignatureAnalyzedContext
(
CannotChangeSignatureReason
.
InsufficientParameters
);
...
...
src/Features/Core/Portable/ChangeSignature/Parameter
Base
.cs
→
src/Features/Core/Portable/ChangeSignature/Parameter.cs
浏览文件 @
fb632068
...
...
@@ -2,14 +2,14 @@
namespace
Microsoft.CodeAnalysis.ChangeSignature
{
internal
abstract
class
Parameter
Base
internal
abstract
class
Parameter
{
public
abstract
bool
HasExplicitDefaultValue
{
get
;
}
public
abstract
string
Name
{
get
;
}
public
abstract
IParameterSymbol
Symbol
{
get
;
}
}
internal
class
ExistingParameter
:
Parameter
Base
internal
class
ExistingParameter
:
Parameter
{
public
override
IParameterSymbol
Symbol
{
get
;
}
...
...
@@ -22,7 +22,7 @@ public ExistingParameter(IParameterSymbol param)
public
override
string
Name
=>
Symbol
.
Name
;
}
internal
class
AddedParameter
:
Parameter
Base
internal
class
AddedParameter
:
Parameter
{
public
AddedParameter
(
string
type
,
string
parameter
,
string
callsite
)
{
...
...
src/Features/Core/Portable/ChangeSignature/ParameterConfiguration.cs
浏览文件 @
fb632068
// 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
;
using
System.Collections.Generic
;
using
System.Linq
;
...
...
@@ -8,13 +7,13 @@ namespace Microsoft.CodeAnalysis.ChangeSignature
{
internal
sealed
class
ParameterConfiguration
{
public
readonly
Parameter
Base
ThisParameter
;
public
readonly
List
<
Parameter
Base
>
ParametersWithoutDefaultValues
;
public
readonly
List
<
Parameter
Base
>
RemainingEditableParameters
;
public
readonly
Parameter
Base
ParamsParameter
;
public
readonly
Parameter
ThisParameter
;
public
readonly
List
<
Parameter
>
ParametersWithoutDefaultValues
;
public
readonly
List
<
Parameter
>
RemainingEditableParameters
;
public
readonly
Parameter
ParamsParameter
;
public
readonly
int
SelectedIndex
;
public
ParameterConfiguration
(
Parameter
Base
thisParameter
,
List
<
ParameterBase
>
parametersWithoutDefaultValues
,
List
<
ParameterBase
>
remainingEditableParameters
,
ParameterBase
paramsParameter
,
int
selectedIndex
)
public
ParameterConfiguration
(
Parameter
thisParameter
,
List
<
Parameter
>
parametersWithoutDefaultValues
,
List
<
Parameter
>
remainingEditableParameters
,
Parameter
paramsParameter
,
int
selectedIndex
)
{
ThisParameter
=
thisParameter
;
ParametersWithoutDefaultValues
=
parametersWithoutDefaultValues
;
...
...
@@ -23,12 +22,12 @@ public ParameterConfiguration(ParameterBase thisParameter, List<ParameterBase> p
SelectedIndex
=
selectedIndex
;
}
public
static
ParameterConfiguration
Create
(
List
<
Parameter
Base
>
parameters
,
bool
isExtensionMethod
,
int
selectedIndex
)
public
static
ParameterConfiguration
Create
(
List
<
Parameter
>
parameters
,
bool
isExtensionMethod
,
int
selectedIndex
)
{
Parameter
Base
thisParameter
=
null
;
var
parametersWithoutDefaultValues
=
new
List
<
Parameter
Base
>();
var
remainingReorderableParameters
=
new
List
<
Parameter
Base
>();
Parameter
Base
paramsParameter
=
null
;
Parameter
thisParameter
=
null
;
var
parametersWithoutDefaultValues
=
new
List
<
Parameter
>();
var
remainingReorderableParameters
=
new
List
<
Parameter
>();
Parameter
paramsParameter
=
null
;
if
(
parameters
.
Count
>
0
&&
isExtensionMethod
)
{
...
...
@@ -58,12 +57,12 @@ public static ParameterConfiguration Create(List<ParameterBase> parameters, bool
internal
ParameterConfiguration
WithoutAddedParameters
()
{
return
Create
(
ToListOfParameters
().
OfType
<
ExistingParameter
>().
ToList
<
Parameter
Base
>(),
ThisParameter
!=
null
,
selectedIndex
:
0
);
return
Create
(
ToListOfParameters
().
OfType
<
ExistingParameter
>().
ToList
<
Parameter
>(),
ThisParameter
!=
null
,
selectedIndex
:
0
);
}
public
List
<
Parameter
Base
>
ToListOfParameters
()
public
List
<
Parameter
>
ToListOfParameters
()
{
var
list
=
new
List
<
Parameter
Base
>();
var
list
=
new
List
<
Parameter
>();
if
(
ThisParameter
!=
null
)
{
...
...
@@ -81,7 +80,7 @@ public List<ParameterBase> ToListOfParameters()
return
list
;
}
// TODO probably remove thi
i
s check. It was created when we didn't support Add Parameters to parameterless methods.
// TODO probably remove this check. It was created when we didn't support Add Parameters to parameterless methods.
public
bool
IsChangeable
()
{
return
true
;
...
...
src/VisualStudio/Core/Def/Implementation/ChangeSignature/ChangeSignatureDialogViewModel.cs
浏览文件 @
fb632068
...
...
@@ -523,7 +523,7 @@ public ParameterViewModel(ChangeSignatureDialogViewModel changeSignatureDialogVi
this
.
changeSignatureDialogViewModel
=
changeSignatureDialogViewModel
;
}
internal
abstract
Parameter
Base
CreateParameter
();
internal
abstract
Parameter
CreateParameter
();
public
abstract
string
InitialIndex
{
get
;
}
}
...
...
@@ -548,7 +548,7 @@ public AddedParameterViewModel(ChangeSignatureDialogViewModel changeSignatureDia
public
override
bool
IsDisabled
=>
false
;
public
override
string
Callsite
=>
_addParameterViewModel
.
CallsiteValue
;
internal
override
Parameter
Base
CreateParameter
()
internal
override
Parameter
CreateParameter
()
=>
new
AddedParameter
(
Type
,
Parameter
,
Callsite
);
public
override
string
InitialIndex
=>
"NEW"
;
...
...
@@ -558,14 +558,14 @@ public class ExistingParameterViewModel : ParameterViewModel
{
public
IParameterSymbol
ParameterSymbol
{
get
;
}
public
ExistingParameterViewModel
(
ChangeSignatureDialogViewModel
changeSignatureDialogViewModel
,
Parameter
Base
parameter
,
int
initialIndex
)
public
ExistingParameterViewModel
(
ChangeSignatureDialogViewModel
changeSignatureDialogViewModel
,
Parameter
parameter
,
int
initialIndex
)
:
base
(
changeSignatureDialogViewModel
)
{
ParameterSymbol
=
(
parameter
as
ExistingParameter
).
Symbol
;
InitialIndex
=
initialIndex
.
ToString
();
}
internal
override
Parameter
Base
CreateParameter
()
internal
override
Parameter
CreateParameter
()
{
return
new
ExistingParameter
(
ParameterSymbol
);
}
...
...
src/VisualStudio/Core/Test/ChangeSignature/ChangeSignatureViewModelTests.vb
浏览文件 @
fb632068
...
...
@@ -436,7 +436,7 @@ class MyClass
Dim
viewModel
=
New
ChangeSignatureDialogViewModel
(
New
TestNotificationService
(),
ParameterConfiguration
.
Create
(
symbol
.
GetParameters
().
Select
(
Function
(
p
)
DirectCast
(
New
ExistingParameter
(
p
),
Parameter
Base
)).
ToList
(),
symbol
.
IsExtensionMethod
(),
selectedIndex
:
=
0
),
ParameterConfiguration
.
Create
(
symbol
.
GetParameters
().
Select
(
Function
(
p
)
DirectCast
(
New
ExistingParameter
(
p
),
Parameter
)).
ToList
(),
symbol
.
IsExtensionMethod
(),
selectedIndex
:
=
0
),
symbol
,
workspace
.
ExportProvider
.
GetExportedValue
(
Of
IClassificationFormatMapService
)().
GetClassificationFormatMap
(
"text"
),
workspace
.
ExportProvider
.
GetExportedValue
(
Of
ClassificationTypeMap
)())
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录