Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
498172dc
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,体验更适合开发者的 AI 搜索 >>
提交
498172dc
编写于
4月 14, 2020
作者:
D
David Poeschl
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Rename IsCallsiteError to IsCallsiteTodo and document Parameter properties
上级
911749b5
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
39 addition
and
13 deletion
+39
-13
src/EditorFeatures/CSharpTest/ChangeSignature/RemoveParametersTests.cs
...tures/CSharpTest/ChangeSignature/RemoveParametersTests.cs
+1
-1
src/EditorFeatures/TestUtilities/ChangeSignature/AddedParameterOrExistingIndex.cs
...tilities/ChangeSignature/AddedParameterOrExistingIndex.cs
+3
-3
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
+30
-4
src/VisualStudio/Core/Def/Implementation/ChangeSignature/AddParameterDialog.xaml
...ef/Implementation/ChangeSignature/AddParameterDialog.xaml
+1
-1
src/VisualStudio/Core/Def/Implementation/ChangeSignature/AddParameterDialogViewModel.cs
...ementation/ChangeSignature/AddParameterDialogViewModel.cs
+1
-1
src/VisualStudio/Core/Def/Implementation/ChangeSignature/ChangeSignatureDialog.xaml.cs
...lementation/ChangeSignature/ChangeSignatureDialog.xaml.cs
+1
-1
src/VisualStudio/Core/Test/ChangeSignature/AddParameterViewModelTests.vb
...o/Core/Test/ChangeSignature/AddParameterViewModelTests.vb
+1
-1
未找到文件。
src/EditorFeatures/CSharpTest/ChangeSignature/RemoveParametersTests.cs
浏览文件 @
498172dc
...
...
@@ -333,7 +333,7 @@ void M()
var
updatedSignature
=
new
[]
{
new
AddedParameterOrExistingIndex
(
0
),
new
AddedParameterOrExistingIndex
(
2
),
new
AddedParameterOrExistingIndex
(
new
AddedParameter
(
null
,
"int"
,
"newIntegerParameter"
,
callSiteValue
:
"123"
,
true
,
isCallsiteOmitted
:
false
,
isCallsite
Error
:
false
),
"int"
)
};
new
AddedParameterOrExistingIndex
(
new
AddedParameter
(
null
,
"int"
,
"newIntegerParameter"
,
callSiteValue
:
"123"
,
true
,
isCallsiteOmitted
:
false
,
isCallsite
Todo
:
false
),
"int"
)
};
using
var
testState
=
ChangeSignatureTestState
.
Create
(
XElement
.
Parse
(
workspaceXml
));
testState
.
TestChangeSignatureOptionsService
.
UpdatedSignature
=
updatedSignature
;
...
...
src/EditorFeatures/TestUtilities/ChangeSignature/AddedParameterOrExistingIndex.cs
浏览文件 @
498172dc
...
...
@@ -44,7 +44,7 @@ public AddedParameterOrExistingIndex(AddedParameter addedParameterWithoutTypeSym
string
defaultValue
=
""
,
bool
useNamedArguments
=
false
,
bool
isCallsiteOmitted
=
false
,
bool
isCallsite
Error
=
false
,
bool
isCallsite
Todo
=
false
,
bool
typeBinds
=
true
)
{
var
parameter
=
new
AddedParameter
(
...
...
@@ -56,7 +56,7 @@ public AddedParameterOrExistingIndex(AddedParameter addedParameterWithoutTypeSym
defaultValue
,
useNamedArguments
,
isCallsiteOmitted
,
isCallsite
Error
,
isCallsite
Todo
,
typeBinds
);
return
new
AddedParameterOrExistingIndex
(
parameter
,
fullTypeName
);
...
...
@@ -90,7 +90,7 @@ internal AddedParameter GetAddedParameter(Document document)
_addedParameterWithoutTypeSymbol
.
DefaultValue
,
_addedParameterWithoutTypeSymbol
.
UseNamedArguments
,
_addedParameterWithoutTypeSymbol
.
IsCallsiteOmitted
,
_addedParameterWithoutTypeSymbol
.
IsCallsite
Error
);
_addedParameterWithoutTypeSymbol
.
IsCallsite
Todo
);
}
}
}
src/Features/Core/Portable/ChangeSignature/AbstractChangeSignatureService.cs
浏览文件 @
498172dc
...
...
@@ -789,7 +789,7 @@ protected static int GetParameterIndex<TNode>(SeparatedSyntaxList<TNode> paramet
!
SupportsOptionalAndParamsArrayParametersSimultaneously
();
var
isCallsiteActuallyOmitted
=
addedParameter
.
IsCallsiteOmitted
&&
!
forcedCallsiteErrorDueToParamsArray
;
var
isCallsiteActuallyErrored
=
addedParameter
.
IsCallsite
Error
||
forcedCallsiteErrorDueToParamsArray
;
var
isCallsiteActuallyErrored
=
addedParameter
.
IsCallsite
Todo
||
forcedCallsiteErrorDueToParamsArray
;
if
(
isCallsiteActuallyOmitted
)
{
...
...
src/Features/Core/Portable/ChangeSignature/Parameter.cs
浏览文件 @
498172dc
...
...
@@ -40,7 +40,7 @@ internal sealed class AddedParameter : Parameter
string
defaultValue
=
""
,
bool
useNamedArguments
=
false
,
bool
isCallsiteOmitted
=
false
,
bool
isCallsite
Error
=
false
,
bool
isCallsite
Todo
=
false
,
bool
typeBinds
=
true
)
{
Type
=
type
;
...
...
@@ -51,11 +51,11 @@ internal sealed class AddedParameter : Parameter
IsRequired
=
isRequired
;
DefaultValue
=
defaultValue
;
IsCallsite
Error
=
isCallsiteError
;
IsCallsite
Todo
=
isCallsiteTodo
;
IsCallsiteOmitted
=
isCallsiteOmitted
;
UseNamedArguments
=
useNamedArguments
;
if
(
IsCallsite
Error
)
if
(
IsCallsite
Todo
)
{
CallSiteValue
=
FeaturesResources
.
ChangeSignature_NewParameterIntroduceTODOVariable
;
}
...
...
@@ -77,11 +77,37 @@ internal sealed class AddedParameter : Parameter
public
bool
TypeBinds
{
get
;
}
public
string
CallSiteValue
{
get
;
}
/// <summary>
/// True if required, false if optional with a default value.
/// </summary>
public
bool
IsRequired
{
get
;
}
/// <summary>
/// Value to use in the declaration of an optional parameter.
/// E.g. the "3" in M(int x = 3);
/// </summary>
public
string
DefaultValue
{
get
;
}
/// <summary>
/// When introducing an argument, this indicates whether it
/// should be named even if not required to be named. Often
/// useful for literal callsite values like "true" or "null".
/// </summary>
public
bool
UseNamedArguments
{
get
;
}
/// <summary>
/// When an optional parameter is added, passing an argument for
/// it is not required. This indicates that the corresponding argument
/// should be omitted. This often results in subsequent arguments needing
/// to become named arguments
/// </summary>
public
bool
IsCallsiteOmitted
{
get
;
}
public
bool
IsCallsiteError
{
get
;
}
/// <summary>
/// Indicates whether a "TODO" should be introduced at callsites
/// to cause errors that the user can then go visit and fix up.
/// </summary>
public
bool
IsCallsiteTodo
{
get
;
}
// For test purposes: to display assert failure details in tests.
public
override
string
ToString
()
=>
$"
{
Type
.
ToDisplayString
(
new
SymbolDisplayFormat
(
genericsOptions
:
SymbolDisplayGenericsOptions
.
IncludeTypeParameters
))}
{
Name
}
(
{
CallSiteValue
}
)"
;
...
...
src/VisualStudio/Core/Def/Implementation/ChangeSignature/AddParameterDialog.xaml
浏览文件 @
498172dc
...
...
@@ -115,7 +115,7 @@
Grid.Column="0"
GroupName="CallsiteKind"
VerticalContentAlignment="Center"
IsChecked="{Binding IsCallsite
Error
, Mode=TwoWay}"
IsChecked="{Binding IsCallsite
Todo
, Mode=TwoWay}"
Content="{Binding ElementName=dialog, Path=IntroduceUndefinedTodoVariables}"/>
<RadioButton x:Name="OmitArgumentRadioButton"
Grid.Row="11"
...
...
src/VisualStudio/Core/Def/Implementation/ChangeSignature/AddParameterDialogViewModel.cs
浏览文件 @
498172dc
...
...
@@ -110,7 +110,7 @@ public bool IsOptional
}
public
string
DefaultValue
{
get
;
set
;
}
public
bool
IsCallsite
Error
{
get
;
set
;
}
public
bool
IsCallsite
Todo
{
get
;
set
;
}
public
bool
IsCallsiteOmitted
{
get
;
set
;
}
public
bool
IsCallsiteRegularValue
{
get
;
set
;
}
=
true
;
...
...
src/VisualStudio/Core/Def/Implementation/ChangeSignature/ChangeSignatureDialog.xaml.cs
浏览文件 @
498172dc
...
...
@@ -144,7 +144,7 @@ private void Add_Click(object sender, RoutedEventArgs e)
addParameterViewModel
.
DefaultValue
,
addParameterViewModel
.
UseNamedArguments
,
addParameterViewModel
.
IsCallsiteOmitted
,
addParameterViewModel
.
IsCallsite
Error
,
addParameterViewModel
.
IsCallsite
Todo
,
addParameterViewModel
.
TypeBinds
);
_viewModel
.
AddParameter
(
addedParameter
);
...
...
src/VisualStudio/Core/Test/ChangeSignature/AddParameterViewModelTests.vb
浏览文件 @
498172dc
...
...
@@ -273,7 +273,7 @@ class MyClass
Assert.True(viewModel.IsCallsiteRegularValue)
Assert.Equal(String.Empty, viewModel.CallSiteValue)
Assert.False(viewModel.UseNamedArguments)
Assert.False(viewModel.IsCallsite
Error
)
Assert.False(viewModel.IsCallsite
Todo
)
Assert.False(viewModel.IsCallsiteOmitted)
Assert.False(viewModel.TrySubmit)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录