Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
48e26a84
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,发现更多精彩内容 >>
提交
48e26a84
编写于
2月 07, 2017
作者:
C
CyrusNajmabadi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix issue with inline-formatting changing indentation of multi-line constructs.
上级
7f38544a
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
63 addition
and
7 deletion
+63
-7
src/EditorFeatures/CSharpTest/InlineDeclaration/CSharpInlineDeclarationTests.cs
...arpTest/InlineDeclaration/CSharpInlineDeclarationTests.cs
+34
-0
src/Features/CSharp/Portable/InlineDeclaration/CSharpInlineDeclarationCodeFixProvider.cs
...lineDeclaration/CSharpInlineDeclarationCodeFixProvider.cs
+29
-7
未找到文件。
src/EditorFeatures/CSharpTest/InlineDeclaration/CSharpInlineDeclarationTests.cs
浏览文件 @
48e26a84
...
...
@@ -1161,6 +1161,40 @@ public static void Method(Expression<Action> expression)
{
}
}"
);
}
[
WorkItem
(
16198
,
"https://github.com/dotnet/roslyn/issues/16198"
)]
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsInlineDeclaration
)]
public
async
Task
TestIndentation1
()
{
await
TestAsync
(
@"
using System;
class C
{
private int Bar()
{
IProjectRuleSnapshot [|unresolvedReferenceSnapshot|] = null;
var itemType = GetUnresolvedReferenceItemType(originalItemSpec,
updatedUnresolvedSnapshots,
catalogs,
out unresolvedReferenceSnapshot);
}
}"
,
@"
using System;
class C
{
private int Bar()
{
var itemType = GetUnresolvedReferenceItemType(originalItemSpec,
updatedUnresolvedSnapshots,
catalogs,
out IProjectRuleSnapshot unresolvedReferenceSnapshot);
}
}"
);
}
}
...
...
src/Features/CSharp/Portable/InlineDeclaration/CSharpInlineDeclarationCodeFixProvider.cs
浏览文件 @
48e26a84
...
...
@@ -92,16 +92,14 @@ public override Task RegisterCodeFixesAsync(CodeFixContext context)
var
block
=
(
BlockSyntax
)
localDeclarationStatement
.
Parent
;
var
declarationIndex
=
block
.
Statements
.
IndexOf
(
localDeclarationStatement
);
// Comments on the local declaration will move to the next statement. Format it
// so that it the comments show up properly.
// Trivia on the local declaration will move to the next statement.
// use the callback form as the next statement may be hte place where we're
// inlining the declaration, and thus need to see the effects of that change.
editor
.
ReplaceNode
(
block
.
Statements
[
declarationIndex
+
1
],
(
s
,
g
)
=>
s
.
WithAdditionalAnnotations
(
Formatter
.
Annotation
));
(
s
,
g
)
=>
MoveNonIndentationTrivia
(
localDeclarationStatement
,
s
));
var
removeOptions
=
localDeclarationStatement
.
GetTrailingTrivia
().
Any
(
t
=>
t
.
IsRegularComment
())
?
SyntaxRemoveOptions
.
KeepLeadingTrivia
|
SyntaxRemoveOptions
.
KeepTrailingTrivia
:
SyntaxRemoveOptions
.
KeepLeadingTrivia
;
editor
.
RemoveNode
(
localDeclarationStatement
,
removeOptions
);
editor
.
RemoveNode
(
localDeclarationStatement
,
SyntaxRemoveOptions
.
KeepUnbalancedDirectives
);
}
else
{
...
...
@@ -165,6 +163,30 @@ public override Task RegisterCodeFixesAsync(CodeFixContext context)
editor
.
ReplaceNode
(
identifier
,
declarationExpression
);
}
private
static
SyntaxNode
MoveNonIndentationTrivia
(
SyntaxNode
from
,
SyntaxNode
to
)
{
// get all the preceding trivia from the 'from' node, not counting the leading
// indentation trivia is has.
var
finalTrivia
=
from
.
GetLeadingTrivia
().
ToList
();
while
(
finalTrivia
.
Count
>
0
&&
finalTrivia
.
Last
().
Kind
()
==
SyntaxKind
.
WhitespaceTrivia
)
{
finalTrivia
.
RemoveAt
(
finalTrivia
.
Count
-
1
);
}
// Also, add on hte trailing trivia if there are trailing comments.
var
hasTrailingComments
=
from
.
GetTrailingTrivia
().
Any
(
t
=>
t
.
IsRegularComment
());
if
(
hasTrailingComments
)
{
finalTrivia
.
AddRange
(
from
.
GetTrailingTrivia
());
}
// Merge this trivia with the existing trivia on the node. Format in case
// we added comments and need them indented properly.
return
to
.
WithPrependedLeadingTrivia
(
finalTrivia
)
.
WithAdditionalAnnotations
(
Formatter
.
Annotation
);
}
private
static
DeclarationExpressionSyntax
GetDeclarationExpression
(
SourceText
sourceText
,
IdentifierNameSyntax
identifier
,
TypeSyntax
newType
,
VariableDeclaratorSyntax
declaratorOpt
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录