Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
7d15682d
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,发现更多精彩内容 >>
提交
7d15682d
编写于
12月 19, 2019
作者:
A
Allison Chou
提交者:
Ivan Basov
1月 15, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Changed UI (made Add higher) and fixed bug with callsites
上级
684008cb
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
25 addition
and
24 deletion
+25
-24
src/Features/CSharp/Portable/ChangeSignature/CSharpChangeSignatureService.cs
.../Portable/ChangeSignature/CSharpChangeSignatureService.cs
+8
-5
src/Features/Core/Portable/ChangeSignature/AbstractChangeSignatureService.cs
...ortable/ChangeSignature/AbstractChangeSignatureService.cs
+3
-3
src/VisualStudio/Core/Def/Implementation/ChangeSignature/AddParameterDialog.xaml.cs
...Implementation/ChangeSignature/AddParameterDialog.xaml.cs
+3
-2
src/VisualStudio/Core/Def/Implementation/ChangeSignature/ChangeSignatureDialog.xaml
...Implementation/ChangeSignature/ChangeSignatureDialog.xaml
+11
-14
未找到文件。
src/Features/CSharp/Portable/ChangeSignature/CSharpChangeSignatureService.cs
浏览文件 @
7d15682d
...
@@ -383,7 +383,7 @@ private SyntaxNode GetNodeContainingTargetNode(SyntaxNode matchingNode)
...
@@ -383,7 +383,7 @@ private SyntaxNode GetNodeContainingTargetNode(SyntaxNode matchingNode)
if
(
updatedNode
.
IsKind
(
SyntaxKind
.
InvocationExpression
))
if
(
updatedNode
.
IsKind
(
SyntaxKind
.
InvocationExpression
))
{
{
var
invocation
=
(
InvocationExpressionSyntax
)
updatedNode
;
var
invocation
=
(
InvocationExpressionSyntax
)
updatedNode
;
var
semanticModel
=
document
.
GetSemanticModelAsync
(
cancellationToken
).
WaitAndGetResult
(
cancellationToken
);
var
semanticModel
=
document
.
GetSemanticModelAsync
(
cancellationToken
).
WaitAndGetResult
_CanCallOnBackground
(
cancellationToken
);
var
symbolInfo
=
semanticModel
.
GetSymbolInfo
((
InvocationExpressionSyntax
)
originalNode
,
cancellationToken
);
var
symbolInfo
=
semanticModel
.
GetSymbolInfo
((
InvocationExpressionSyntax
)
originalNode
,
cancellationToken
);
var
isReducedExtensionMethod
=
false
;
var
isReducedExtensionMethod
=
false
;
...
@@ -465,12 +465,15 @@ private SeparatedSyntaxList<ArgumentSyntax> AddNewArgumentsToList(Document docum
...
@@ -465,12 +465,15 @@ private SeparatedSyntaxList<ArgumentSyntax> AddNewArgumentsToList(Document docum
for
(
int
i
=
0
;
i
<
updatedParameters
.
Count
;
i
++)
for
(
int
i
=
0
;
i
<
updatedParameters
.
Count
;
i
++)
{
{
if
(
updatedParameters
[
i
]
is
AddedParameter
addedParameter
)
if
(
updatedParameters
[
i
]
is
AddedParameter
addedParameter
)
{
if
(
addedParameter
.
CallsiteValue
!=
null
)
{
{
fullList
.
Add
(
SyntaxFactory
.
Argument
(
fullList
.
Add
(
SyntaxFactory
.
Argument
(
seenNameEquals
?
SyntaxFactory
.
NameColon
(
addedParameter
.
Name
)
:
default
,
seenNameEquals
?
SyntaxFactory
.
NameColon
(
addedParameter
.
Name
)
:
default
,
refKindKeyword
:
default
,
refKindKeyword
:
default
,
expression
:
SyntaxFactory
.
ParseExpression
(
addedParameter
.
CallsiteValue
)));
expression
:
SyntaxFactory
.
ParseExpression
(
addedParameter
.
CallsiteValue
)));
}
}
}
else
else
{
{
if
(
newArguments
[
indexInExistingList
].
NameColon
!=
default
)
if
(
newArguments
[
indexInExistingList
].
NameColon
!=
default
)
...
...
src/Features/Core/Portable/ChangeSignature/AbstractChangeSignatureService.cs
浏览文件 @
7d15682d
...
@@ -61,11 +61,11 @@ public async Task<ImmutableArray<ChangeSignatureCodeAction>> GetChangeSignatureC
...
@@ -61,11 +61,11 @@ public async Task<ImmutableArray<ChangeSignatureCodeAction>> GetChangeSignatureC
internal
ChangeSignatureResult
ChangeSignature
(
Document
document
,
int
position
,
Action
<
string
,
NotificationSeverity
>
errorHandler
,
CancellationToken
cancellationToken
)
internal
ChangeSignatureResult
ChangeSignature
(
Document
document
,
int
position
,
Action
<
string
,
NotificationSeverity
>
errorHandler
,
CancellationToken
cancellationToken
)
{
{
var
context
=
GetContextAsync
(
document
,
position
,
restrictToDeclarations
:
false
,
cancellationToken
:
cancellationToken
).
WaitAndGetResult
(
cancellationToken
);
var
context
=
GetContextAsync
(
document
,
position
,
restrictToDeclarations
:
false
,
cancellationToken
:
cancellationToken
).
WaitAndGetResult
_CanCallOnBackground
(
cancellationToken
);
if
(
context
.
CanChangeSignature
)
if
(
context
.
CanChangeSignature
)
{
{
return
ChangeSignatureWithContextAsync
(
context
,
cancellationToken
).
WaitAndGetResult
(
cancellationToken
);
return
ChangeSignatureWithContextAsync
(
context
,
cancellationToken
).
WaitAndGetResult
_CanCallOnBackground
(
cancellationToken
);
}
}
else
else
{
{
...
@@ -209,7 +209,7 @@ internal ChangeSignatureOptionsResult GetChangeSignatureOptions(ChangeSignatureA
...
@@ -209,7 +209,7 @@ internal ChangeSignatureOptionsResult GetChangeSignatureOptions(ChangeSignatureA
var
symbols
=
FindChangeSignatureReferencesAsync
(
var
symbols
=
FindChangeSignatureReferencesAsync
(
SymbolAndProjectId
.
Create
(
declaredSymbol
,
context
.
Project
.
Id
),
SymbolAndProjectId
.
Create
(
declaredSymbol
,
context
.
Project
.
Id
),
context
.
Solution
,
cancellationToken
).
WaitAndGetResult
(
cancellationToken
);
context
.
Solution
,
cancellationToken
).
WaitAndGetResult
_CanCallOnBackground
(
cancellationToken
);
foreach
(
var
symbol
in
symbols
)
foreach
(
var
symbol
in
symbols
)
{
{
...
...
src/VisualStudio/Core/Def/Implementation/ChangeSignature/AddParameterDialog.xaml.cs
浏览文件 @
7d15682d
...
@@ -56,11 +56,12 @@ private void AddParameterDialog_Loaded(object sender, RoutedEventArgs e)
...
@@ -56,11 +56,12 @@ private void AddParameterDialog_Loaded(object sender, RoutedEventArgs e)
}
}
private
void
OK_Click
(
object
sender
,
RoutedEventArgs
e
)
private
void
OK_Click
(
object
sender
,
RoutedEventArgs
e
)
{
if
(
ViewModel
.
TrySubmit
())
{
{
ViewModel
.
TypeName
=
((
IntellisenseTextBox
)
TypeContentControl
.
Content
).
Text
;
ViewModel
.
TypeName
=
((
IntellisenseTextBox
)
TypeContentControl
.
Content
).
Text
;
ViewModel
.
ParameterName
=
((
IntellisenseTextBox
)
NameContentControl
.
Content
).
Text
;
ViewModel
.
ParameterName
=
((
IntellisenseTextBox
)
NameContentControl
.
Content
).
Text
;
if
(
ViewModel
.
TrySubmit
())
{
DialogResult
=
true
;
DialogResult
=
true
;
}
}
}
}
...
...
src/VisualStudio/Core/Def/Implementation/ChangeSignature/ChangeSignatureDialog.xaml
浏览文件 @
7d15682d
...
@@ -277,36 +277,33 @@
...
@@ -277,36 +277,33 @@
Width="16"
Width="16"
Moniker="{x:Static imagecatalog:KnownMonikers.MoveDown}"
Moniker="{x:Static imagecatalog:KnownMonikers.MoveDown}"
Grayscale="{Binding IsEnabled, ElementName=DownButton, Converter={StaticResource NegateBooleanConverter}}"/>
Grayscale="{Binding IsEnabled, ElementName=DownButton, Converter={StaticResource NegateBooleanConverter}}"/>
</vs:DialogButton>
</vs:DialogButton>
<vs:DialogButton
<vs:DialogButton
Name="
Remove
Button"
Name="
Add
Button"
Margin="9 29 0 0"
Margin="9 29 0 0"
AutomationProperties.Name="{Binding AddAutomationText}"
Click="Add_Click"
AutomationProperties.AutomationId="AddButton"
Content="{Binding ElementName=dialog, Path=Add}"
Height="Auto" Width="Auto"/>
<vs:DialogButton
Name="RemoveButton"
Margin="9 9 0 0"
IsEnabled="{Binding CanRemove, Mode=OneWay}"
IsEnabled="{Binding CanRemove, Mode=OneWay}"
AutomationProperties.Name="{Binding RemoveAutomationText}"
AutomationProperties.Name="{Binding RemoveAutomationText}"
Click="Remove_Click"
Click="Remove_Click"
AutomationProperties.AutomationId="RemoveButton"
AutomationProperties.AutomationId="RemoveButton"
Content="{Binding ElementName=dialog, Path=Remove}"
Content="{Binding ElementName=dialog, Path=Remove}"
Height="Auto" Width="Auto">
Height="Auto" Width="Auto"/>
</vs:DialogButton>
<vs:DialogButton
<vs:DialogButton
Name="RestoreButton"
Name="RestoreButton"
Margin="9 9 0 0"
Margin="9
2
9 0 0"
IsEnabled="{Binding CanRestore, Mode=OneWay}"
IsEnabled="{Binding CanRestore, Mode=OneWay}"
Click="Restore_Click"
Click="Restore_Click"
AutomationProperties.AutomationId="RestoreButton"
AutomationProperties.AutomationId="RestoreButton"
AutomationProperties.Name="{Binding RestoreAutomationText}"
AutomationProperties.Name="{Binding RestoreAutomationText}"
Content="{Binding ElementName=dialog, Path=Restore}"
Content="{Binding ElementName=dialog, Path=Restore}"
Height="Auto" Width="Auto"/>
Height="Auto" Width="Auto"/>
<vs:DialogButton
Margin="9 29 0 0"
AutomationProperties.Name="{Binding AddAutomationText}"
Click="Add_Click"
AutomationProperties.AutomationId="AddButton"
Content="{Binding ElementName=dialog, Path=Add}"
Height="Auto" Width="Auto"/>
</StackPanel>
</StackPanel>
</Grid>
</Grid>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录