Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
6debbc35
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,发现更多精彩内容 >>
提交
6debbc35
编写于
8月 12, 2020
作者:
S
Shen Chen
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Use SemanticFactService to rewrite all the rename logic
上级
eb3dd391
变更
7
展开全部
隐藏空白更改
内联
并排
Showing
7 changed file
with
158 addition
and
183 deletion
+158
-183
src/EditorFeatures/CSharpTest/InlineMethod/CSharpInlineMethodTests.cs
...atures/CSharpTest/InlineMethod/CSharpInlineMethodTests.cs
+3
-3
src/Features/CSharp/Portable/CodeRefactorings/InlineMethod/CSharpInlineMethodRefactoringProvider.cs
...ngs/InlineMethod/CSharpInlineMethodRefactoringProvider.cs
+1
-1
src/Features/Core/Portable/InlineMethod/AbstractInlineMethodRefactoringProvider.InlineContext.cs
.../AbstractInlineMethodRefactoringProvider.InlineContext.cs
+122
-167
src/Features/Core/Portable/InlineMethod/AbstractInlineMethodRefactoringProvider.cs
...e/InlineMethod/AbstractInlineMethodRefactoringProvider.cs
+4
-1
src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/LanguageServices/SemanticsFactsService/AbstractSemanticFactsService.cs
...ces/SemanticsFactsService/AbstractSemanticFactsService.cs
+19
-11
src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/LanguageServices/SemanticsFactsService/ISemanticFactsService.cs
...geServices/SemanticsFactsService/ISemanticFactsService.cs
+4
-0
src/Workspaces/SharedUtilitiesAndExtensions/Workspace/VisualBasic/LanguageServices/VisualBasicSemanticFactsService.vb
...Basic/LanguageServices/VisualBasicSemanticFactsService.vb
+5
-0
未找到文件。
src/EditorFeatures/CSharpTest/InlineMethod/CSharpInlineMethodTests.cs
浏览文件 @
6debbc35
...
...
@@ -288,9 +288,9 @@ public class TestClass
{
private void Caller(float s1, float s2)
{
float s
3
= SomeCaculation(s1);
float s
4
= SomeCaculation(s2);
System.Console.WriteLine(""This is s1"" + s
3 + ""This is s2"" + s4
);
float s
11
= SomeCaculation(s1);
float s
21
= SomeCaculation(s2);
System.Console.WriteLine(""This is s1"" + s
11 + ""This is s2"" + s21
);
}
private void Callee(float s1, float s2)
...
...
src/Features/CSharp/Portable/CodeRefactorings/InlineMethod/CSharpInlineMethodRefactoringProvider.cs
浏览文件 @
6debbc35
...
...
@@ -44,7 +44,7 @@ internal sealed class CSharpInlineMethodRefactoringProvider :
[
ImportingConstructor
]
[
Obsolete
(
MefConstruction
.
ImportingConstructorMessage
,
error
:
true
)]
public
CSharpInlineMethodRefactoringProvider
()
:
base
(
CSharpSyntaxFacts
.
Instance
)
public
CSharpInlineMethodRefactoringProvider
()
:
base
(
CSharpSyntaxFacts
.
Instance
,
CSharpSemanticFactsService
.
Instance
)
{
}
...
...
src/Features/Core/Portable/InlineMethod/AbstractInlineMethodRefactoringProvider.InlineContext.cs
浏览文件 @
6debbc35
此差异已折叠。
点击以展开。
src/Features/Core/Portable/InlineMethod/AbstractInlineMethodRefactoringProvider.cs
浏览文件 @
6debbc35
...
...
@@ -22,6 +22,7 @@ internal abstract partial class AbstractInlineMethodRefactoringProvider<TInvocat
where
TArgumentSyntax
:
SyntaxNode
{
private
readonly
ISyntaxFacts
_syntaxFacts
;
private
readonly
ISemanticFactsService
_semanticFactsService
;
/// <summary>
/// Check if the <param name="calleeMethodDeclarationSyntaxNode"/> has only one expression or it is using arrow expression.
...
...
@@ -34,9 +35,10 @@ internal abstract partial class AbstractInlineMethodRefactoringProvider<TInvocat
protected
abstract
bool
IsStatementConsideredAsInvokingStatement
(
SyntaxNode
node
);
protected
abstract
TExpressionSyntax
Parenthesize
(
TExpressionSyntax
node
);
protected
AbstractInlineMethodRefactoringProvider
(
ISyntaxFacts
syntaxFacts
)
protected
AbstractInlineMethodRefactoringProvider
(
ISyntaxFacts
syntaxFacts
,
ISemanticFactsService
semanticFactsService
)
{
_syntaxFacts
=
syntaxFacts
;
_semanticFactsService
=
semanticFactsService
;
}
public
override
async
Task
ComputeRefactoringsAsync
(
CodeRefactoringContext
context
)
...
...
@@ -121,6 +123,7 @@ private static bool IsExpressionSyntax(SyntaxNode syntaxNode)
var
inlineContext
=
await
InlineMethodContext
.
GetInlineContextAsync
(
this
,
_syntaxFacts
,
_semanticFactsService
,
document
,
semanticModel
,
calleeMethodInvocationSyntaxNode
,
...
...
src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/LanguageServices/SemanticsFactsService/AbstractSemanticFactsService.cs
浏览文件 @
6debbc35
...
...
@@ -19,6 +19,17 @@ internal abstract class AbstractSemanticFactsService : ISemanticFacts
protected
abstract
SyntaxToken
ToIdentifierToken
(
string
identifier
);
// local name can be same as field or property. but that will hide
// those and can cause semantic change later in some context.
// so to be safe, we consider field and property in scope when
// creating unique name for local
private
static
Func
<
ISymbol
,
bool
>
s_LocalNameFilter
=
s
=>
s
.
Kind
==
SymbolKind
.
Local
||
s
.
Kind
==
SymbolKind
.
Parameter
||
s
.
Kind
==
SymbolKind
.
RangeVariable
||
s
.
Kind
==
SymbolKind
.
Field
||
s
.
Kind
==
SymbolKind
.
Property
;
public
SyntaxToken
GenerateUniqueName
(
SemanticModel
semanticModel
,
SyntaxNode
location
,
SyntaxNode
containerOpt
,
string
baseName
,
CancellationToken
cancellationToken
)
...
...
@@ -39,19 +50,16 @@ internal abstract class AbstractSemanticFactsService : ISemanticFacts
SemanticModel
semanticModel
,
SyntaxNode
location
,
SyntaxNode
containerOpt
,
string
baseName
,
CancellationToken
cancellationToken
)
{
// local name can be same as field or property. but that will hide
// those and can cause semantic change later in some context.
// so to be safe, we consider field and property in scope when
// creating unique name for local
Func
<
ISymbol
,
bool
>
filter
=
s
=>
s
.
Kind
==
SymbolKind
.
Local
||
s
.
Kind
==
SymbolKind
.
Parameter
||
s
.
Kind
==
SymbolKind
.
RangeVariable
||
s
.
Kind
==
SymbolKind
.
Field
||
s
.
Kind
==
SymbolKind
.
Property
;
return
GenerateUniqueName
(
semanticModel
,
location
,
containerOpt
,
baseName
,
s_LocalNameFilter
,
usedNames
:
Enumerable
.
Empty
<
string
>(),
cancellationToken
);
}
public
SyntaxToken
GenerateUniqueLocalName
(
SemanticModel
semanticModel
,
SyntaxNode
location
,
SyntaxNode
containerOpt
,
string
baseName
,
IEnumerable
<
string
>
usedNames
,
CancellationToken
cancellationToken
)
{
return
GenerateUniqueName
(
semanticModel
,
location
,
containerOpt
,
baseName
,
filter
,
usedNames
:
Enumerable
.
Empty
<
string
>()
,
cancellationToken
);
semanticModel
,
location
,
containerOpt
,
baseName
,
s_LocalNameFilter
,
usedNames
:
usedNames
,
cancellationToken
);
}
public
SyntaxToken
GenerateUniqueName
(
...
...
src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/LanguageServices/SemanticsFactsService/ISemanticFactsService.cs
浏览文件 @
6debbc35
...
...
@@ -39,6 +39,10 @@ internal interface ISemanticFactsService : ISemanticFacts, ILanguageService
SemanticModel
semanticModel
,
SyntaxNode
location
,
SyntaxNode
containerOpt
,
string
baseName
,
CancellationToken
cancellationToken
);
SyntaxToken
GenerateUniqueLocalName
(
SemanticModel
semanticModel
,
SyntaxNode
location
,
SyntaxNode
containerOpt
,
string
baseName
,
IEnumerable
<
string
>
usedNames
,
CancellationToken
cancellationToken
);
SyntaxToken
GenerateUniqueName
(
string
baseName
,
IEnumerable
<
string
>
usedNames
);
}
}
src/Workspaces/SharedUtilitiesAndExtensions/Workspace/VisualBasic/LanguageServices/VisualBasicSemanticFactsService.vb
浏览文件 @
6debbc35
...
...
@@ -118,6 +118,11 @@ Namespace Microsoft.CodeAnalysis.VisualBasic
Return
MyBase
.
GenerateUniqueLocalName
(
semanticModel
,
location
,
containerOpt
,
baseName
,
cancellationToken
)
End
Function
Private
Function
ISemanticFactsService_GenerateUniqueLocalName
(
semanticModel
As
SemanticModel
,
location
As
SyntaxNode
,
containerOpt
As
SyntaxNode
,
baseName
As
String
,
usedName
As
IEnumerable
(
Of
String
),
cancellationToken
As
CancellationToken
)
As
SyntaxToken
Implements
ISemanticFactsService
.
GenerateUniqueLocalName
Return
MyBase
.
GenerateUniqueLocalName
(
semanticModel
,
location
,
containerOpt
,
baseName
,
usedName
,
cancellationToken
)
End
Function
Private
Function
ISemanticFactsService_GenerateUniqueName
(
semanticModel
As
SemanticModel
,
location
As
SyntaxNode
,
containerOpt
As
SyntaxNode
,
baseName
As
String
,
filter
As
Func
(
Of
ISymbol
,
Boolean
),
usedNames
As
IEnumerable
(
Of
String
),
cancellationToken
As
CancellationToken
)
As
SyntaxToken
Implements
ISemanticFactsService
.
GenerateUniqueName
Return
MyBase
.
GenerateUniqueName
(
semanticModel
,
location
,
containerOpt
,
baseName
,
filter
,
usedNames
,
cancellationToken
)
End
Function
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录