Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
93bc7340
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,发现更多精彩内容 >>
提交
93bc7340
编写于
3月 21, 2017
作者:
C
CyrusNajmabadi
提交者:
GitHub
3月 21, 2017
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #18030 from CyrusNajmabadi/moveTypeDirectivew
Don't create unbalanced trivia when moving types.
上级
e717d297
c3205a74
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
114 addition
and
4 deletion
+114
-4
src/EditorFeatures/CSharpTest/CodeActions/MoveType/MoveTypeTests.MoveToNewFile.cs
...pTest/CodeActions/MoveType/MoveTypeTests.MoveToNewFile.cs
+113
-3
src/Features/Core/Portable/CodeRefactorings/MoveType/AbstractMoveTypeService.MoveTypeEditor.cs
...orings/MoveType/AbstractMoveTypeService.MoveTypeEditor.cs
+1
-1
未找到文件。
src/EditorFeatures/CSharpTest/CodeActions/MoveType/MoveTypeTests.MoveToNewFile.cs
浏览文件 @
93bc7340
...
...
@@ -84,7 +84,7 @@ class Class2 { }
var
destinationDocumentText
=
@"class Class1 { }"
;
await
TestMoveTypeToNewFileAsync
(
code
,
codeAfterMove
,
expectedDocumentName
,
code
,
codeAfterMove
,
expectedDocumentName
,
destinationDocumentText
,
destinationDocumentContainers
:
ImmutableArray
.
Create
(
"A"
,
"B"
));
}
...
...
@@ -115,7 +115,7 @@ class Class2 { }";
[
WpfFact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsMoveType
)]
public
async
Task
MoveTypeWithNoContainerNamespace
()
{
var
code
=
var
code
=
@"[||]class Class1 { }
class Class2 { }"
;
var
codeAfterMove
=
@"class Class2 { }"
;
...
...
@@ -143,7 +143,7 @@ class Class2 { }";
class Class2 { }"
;
var
expectedDocumentName
=
"Class1.cs"
;
var
destinationDocumentText
=
var
destinationDocumentText
=
@"class Class1 { }"
;
await
TestMoveTypeToNewFileAsync
(
code
,
codeAfterMove
,
expectedDocumentName
,
destinationDocumentText
);
...
...
@@ -944,5 +944,115 @@ class Inner : IWhatever {
await
TestMoveTypeToNewFileAsync
(
code
,
codeAfterMove
,
expectedDocumentName
,
destinationDocumentText
);
}
[
WorkItem
(
17930
,
"https://github.com/dotnet/roslyn/issues/17930"
)]
[
WpfFact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsMoveType
)]
public
async
Task
MoveTypeWithDirectives1
()
{
var
code
=
@"using System;
namespace N
{
class Program
{
static void Main()
{
}
}
}
#if true
public class [||]Inner
{
}
#endif"
;
var
codeAfterMove
=
@"using System;
namespace N
{
class Program
{
static void Main()
{
}
}
}
#if true
#endif"
;
var
expectedDocumentName
=
"Inner.cs"
;
var
destinationDocumentText
=
@"#if true
public class Inner
{
}
#endif"
;
await
TestMoveTypeToNewFileAsync
(
code
,
codeAfterMove
,
expectedDocumentName
,
destinationDocumentText
,
ignoreTrivia
:
false
);
}
[
WorkItem
(
17930
,
"https://github.com/dotnet/roslyn/issues/17930"
)]
[
WpfFact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsMoveType
)]
public
async
Task
MoveTypeWithDirectives2
()
{
var
code
=
@"using System;
namespace N
{
class Program
{
static void Main()
{
}
#if true
public class [||]Inner
{
}
#endif
}
}"
;
var
codeAfterMove
=
@"using System;
namespace N
{
partial class Program
{
static void Main()
{
}
#if true
#endif
}
}"
;
var
expectedDocumentName
=
"Inner.cs"
;
var
destinationDocumentText
=
@"namespace N
{
partial class Program
{
#if true
public class Inner
{
}
#endif
}
}"
;
await
TestMoveTypeToNewFileAsync
(
code
,
codeAfterMove
,
expectedDocumentName
,
destinationDocumentText
,
ignoreTrivia
:
false
);
}
}
}
\ No newline at end of file
src/Features/Core/Portable/CodeRefactorings/MoveType/AbstractMoveTypeService.MoveTypeEditor.cs
浏览文件 @
93bc7340
...
...
@@ -157,7 +157,7 @@ private async Task<SyntaxNode> AddFinalNewLineIfDesired(Document document, Synta
// original attributes and we don't want to mess with them.
AddPartialModifiersToTypeChain
(
documentEditor
,
removeAttributesAndComments
:
false
,
removeTypeInheritance
:
false
);
documentEditor
.
RemoveNode
(
State
.
TypeNode
,
SyntaxRemoveOptions
.
Keep
NoTrivia
);
documentEditor
.
RemoveNode
(
State
.
TypeNode
,
SyntaxRemoveOptions
.
Keep
UnbalancedDirectives
);
var
updatedDocument
=
documentEditor
.
GetChangedDocument
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录