Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
b0588b11
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,发现更多精彩内容 >>
提交
b0588b11
编写于
12月 12, 2018
作者:
C
Cyrus Najmabadi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Use new class.
上级
967c141f
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
939 addition
and
1 deletion
+939
-1
src/EditorFeatures/CSharpTest/Wrapping/BinaryWrappingTests.cs
...EditorFeatures/CSharpTest/Wrapping/BinaryWrappingTests.cs
+938
-0
src/EditorFeatures/Core/Wrapping/BinaryExpression/AbstractBinaryExpressionWrapper.cs
...pping/BinaryExpression/AbstractBinaryExpressionWrapper.cs
+1
-1
未找到文件。
src/EditorFeatures/CSharpTest/Wrapping/BinaryWrappingTests.cs
0 → 100644
浏览文件 @
b0588b11
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using
System.Threading.Tasks
;
using
Microsoft.CodeAnalysis.CodeRefactorings
;
using
Microsoft.CodeAnalysis.Editor.CSharp.Wrapping
;
using
Microsoft.CodeAnalysis.Test.Utilities
;
using
Xunit
;
namespace
Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Wrapping
{
public
class
BinaryWrappingTests
:
AbstractWrappingTests
{
protected
override
CodeRefactoringProvider
CreateCodeRefactoringProvider
(
Workspace
workspace
,
TestParameters
parameters
)
=>
new
CSharpWrappingCodeRefactoringProvider
();
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsWrapping
)]
public
async
Task
TestMissingWithSyntaxError
()
{
await
TestMissingAsync
(
@"class C {
void Bar() {
if ([||]i && j
}
}"
);
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsWrapping
)]
public
async
Task
TestMissingWithSelection
()
{
await
TestMissingAsync
(
@"class C {
void Bar() {
if ([|i|] && j) {
}
}
}"
);
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsWrapping
)]
public
async
Task
TestMissingBeforeExpr
()
{
await
TestMissingAsync
(
@"class C {
void Bar() {
[||]if (i && j) {
}
}
}"
);
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsWrapping
)]
public
async
Task
TestMissingWithSingleExpr
()
{
await
TestMissingAsync
(
@"class C {
void Bar() {
if ([||]i) {
}
}
}"
);
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsWrapping
)]
public
async
Task
TestMissingWithMultiLineExpression
()
{
await
TestMissingAsync
(
@"class C {
void Bar() {
if ([||]i && (j +
k)) {
}
}
}"
);
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsWrapping
)]
public
async
Task
TestMissingWithMultiLineExpr2
()
{
await
TestMissingAsync
(
@"class C {
void Bar() {
if ([||]i && @""
"") {
}
}
}"
);
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsWrapping
)]
public
async
Task
TestInIf
()
{
await
TestInRegularAndScript1Async
(
@"class C {
void Bar() {
if ([||]i && j) {
}
}
}"
,
@"class C {
void Bar() {
if (i &&
j) {
}
}
}"
);
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsWrapping
)]
public
async
Task
TestInIf_IncludingOp
()
{
await
TestInRegularAndScript1Async
(
@"class C {
void Bar() {
if ([||]i && j) {
}
}
}"
,
@"class C {
void Bar() {
if (i
&& j) {
}
}
}"
,
index
:
1
);
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsWrapping
)]
public
async
Task
TestInIf2
()
{
await
TestInRegularAndScript1Async
(
@"class C {
void Bar() {
if (i[||] && j) {
}
}
}"
,
@"class C {
void Bar() {
if (i &&
j) {
}
}
}"
);
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsWrapping
)]
public
async
Task
TestInIf3
()
{
await
TestInRegularAndScript1Async
(
@"class C {
void Bar() {
if (i [||]&& j) {
}
}
}"
,
@"class C {
void Bar() {
if (i &&
j) {
}
}
}"
);
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsWrapping
)]
public
async
Task
TestInIf4
()
{
await
TestInRegularAndScript1Async
(
@"class C {
void Bar() {
if (i &&[||] j) {
}
}
}"
,
@"class C {
void Bar() {
if (i &&
j) {
}
}
}"
);
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsWrapping
)]
public
async
Task
TestInIf5
()
{
await
TestInRegularAndScript1Async
(
@"class C {
void Bar() {
if (i && [||]j) {
}
}
}"
,
@"class C {
void Bar() {
if (i &&
j) {
}
}
}"
);
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsWrapping
)]
public
async
Task
TestTwoParamWrappingCases
()
{
await
TestAllWrappingCasesAsync
(
@"class C {
void Bar() {
a.Goobar([||]i, j);
}
}"
,
@"class C {
void Bar() {
a.Goobar(i,
j);
}
}"
,
@"class C {
void Bar() {
a.Goobar(
i,
j);
}
}"
,
@"class C {
void Bar() {
a.Goobar(i,
j);
}
}"
,
@"class C {
void Bar() {
a.Goobar(
i, j);
}
}"
);
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsWrapping
)]
public
async
Task
TestThreeParamWrappingCases
()
{
await
TestAllWrappingCasesAsync
(
@"class C {
void Bar() {
a.Goobar([||]i, j, k);
}
}"
,
@"class C {
void Bar() {
a.Goobar(i,
j,
k);
}
}"
,
@"class C {
void Bar() {
a.Goobar(
i,
j,
k);
}
}"
,
@"class C {
void Bar() {
a.Goobar(i,
j,
k);
}
}"
,
@"class C {
void Bar() {
a.Goobar(
i, j, k);
}
}"
);
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsWrapping
)]
public
async
Task
Test_AllOptions_NoInitialMatches
()
{
await
TestAllWrappingCasesAsync
(
@"class C {
void Bar() {
a.Goobar(
[||]i,
j,
k);
}
}"
,
@"class C {
void Bar() {
a.Goobar(i,
j,
k);
}
}"
,
@"class C {
void Bar() {
a.Goobar(
i,
j,
k);
}
}"
,
@"class C {
void Bar() {
a.Goobar(i,
j,
k);
}
}"
,
@"class C {
void Bar() {
a.Goobar(i, j, k);
}
}"
,
@"class C {
void Bar() {
a.Goobar(
i, j, k);
}
}"
);
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsWrapping
)]
public
async
Task
Test_LongWrapping_ShortIds
()
{
await
TestAllWrappingCasesAsync
(
@"class C {
void Goo() {
this.Goobar([||]
i, j, k, l, m, n, o, p,
n);
}
}"
,
GetIndentionColumn
(
30
),
@"class C {
void Goo() {
this.Goobar(i,
j,
k,
l,
m,
n,
o,
p,
n);
}
}"
,
@"class C {
void Goo() {
this.Goobar(
i,
j,
k,
l,
m,
n,
o,
p,
n);
}
}"
,
@"class C {
void Goo() {
this.Goobar(i,
j,
k,
l,
m,
n,
o,
p,
n);
}
}"
,
@"class C {
void Goo() {
this.Goobar(i, j, k, l, m, n, o, p, n);
}
}"
,
@"class C {
void Goo() {
this.Goobar(
i, j, k, l, m, n, o, p, n);
}
}"
,
@"class C {
void Goo() {
this.Goobar(i, j, k, l,
m, n, o, p,
n);
}
}"
,
@"class C {
void Goo() {
this.Goobar(
i, j, k, l, m, n,
o, p, n);
}
}"
,
@"class C {
void Goo() {
this.Goobar(i, j, k, l,
m, n, o, p, n);
}
}"
);
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsWrapping
)]
public
async
Task
Test_LongWrapping_VariadicLengthIds
()
{
await
TestAllWrappingCasesAsync
(
@"class C {
void Goo() {
this.Goobar([||]
i, jj, kkkkk, llllllll, mmmmmmmmmmmmmmmmmm,
nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn);
}
}"
,
GetIndentionColumn
(
30
),
@"class C {
void Goo() {
this.Goobar(i,
jj,
kkkkk,
llllllll,
mmmmmmmmmmmmmmmmmm,
nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn);
}
}"
,
@"class C {
void Goo() {
this.Goobar(
i,
jj,
kkkkk,
llllllll,
mmmmmmmmmmmmmmmmmm,
nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn);
}
}"
,
@"class C {
void Goo() {
this.Goobar(i,
jj,
kkkkk,
llllllll,
mmmmmmmmmmmmmmmmmm,
nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn);
}
}"
,
@"class C {
void Goo() {
this.Goobar(i, jj, kkkkk, llllllll, mmmmmmmmmmmmmmmmmm, nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn);
}
}"
,
@"class C {
void Goo() {
this.Goobar(
i, jj, kkkkk, llllllll, mmmmmmmmmmmmmmmmmm, nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn);
}
}"
,
@"class C {
void Goo() {
this.Goobar(i, jj,
kkkkk,
llllllll,
mmmmmmmmmmmmmmmmmm,
nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn);
}
}"
,
@"class C {
void Goo() {
this.Goobar(
i, jj, kkkkk,
llllllll,
mmmmmmmmmmmmmmmmmm,
nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn);
}
}"
,
@"class C {
void Goo() {
this.Goobar(i, jj,
kkkkk, llllllll,
mmmmmmmmmmmmmmmmmm,
nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn);
}
}"
);
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsWrapping
)]
public
async
Task
Test_DoNotOfferLongWrappingOptionThatAlreadyAppeared
()
{
await
TestAllWrappingCasesAsync
(
@"class C {
void Goo() {
this.Goobar([||]
iiiii, jjjjj, kkkkk, lllll, mmmmm,
nnnnn);
}
}"
,
GetIndentionColumn
(
25
),
@"class C {
void Goo() {
this.Goobar(iiiii,
jjjjj,
kkkkk,
lllll,
mmmmm,
nnnnn);
}
}"
,
@"class C {
void Goo() {
this.Goobar(
iiiii,
jjjjj,
kkkkk,
lllll,
mmmmm,
nnnnn);
}
}"
,
@"class C {
void Goo() {
this.Goobar(iiiii,
jjjjj,
kkkkk,
lllll,
mmmmm,
nnnnn);
}
}"
,
@"class C {
void Goo() {
this.Goobar(iiiii, jjjjj, kkkkk, lllll, mmmmm, nnnnn);
}
}"
,
@"class C {
void Goo() {
this.Goobar(
iiiii, jjjjj, kkkkk, lllll, mmmmm, nnnnn);
}
}"
,
@"class C {
void Goo() {
this.Goobar(
iiiii, jjjjj,
kkkkk, lllll,
mmmmm, nnnnn);
}
}"
,
@"class C {
void Goo() {
this.Goobar(iiiii,
jjjjj, kkkkk,
lllll, mmmmm,
nnnnn);
}
}"
);
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsWrapping
)]
public
async
Task
Test_DoNotOfferAllLongWrappingOptionThatAlreadyAppeared
()
{
await
TestAllWrappingCasesAsync
(
@"class C {
void Bar() {
a.[||]Goobar(
iiiii, jjjjj, kkkkk, lllll, mmmmm,
nnnnn);
}
}"
,
GetIndentionColumn
(
20
),
@"class C {
void Bar() {
a.Goobar(iiiii,
jjjjj,
kkkkk,
lllll,
mmmmm,
nnnnn);
}
}"
,
@"class C {
void Bar() {
a.Goobar(
iiiii,
jjjjj,
kkkkk,
lllll,
mmmmm,
nnnnn);
}
}"
,
@"class C {
void Bar() {
a.Goobar(iiiii,
jjjjj,
kkkkk,
lllll,
mmmmm,
nnnnn);
}
}"
,
@"class C {
void Bar() {
a.Goobar(iiiii, jjjjj, kkkkk, lllll, mmmmm, nnnnn);
}
}"
,
@"class C {
void Bar() {
a.Goobar(
iiiii, jjjjj, kkkkk, lllll, mmmmm, nnnnn);
}
}"
);
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsWrapping
)]
public
async
Task
Test_LongWrapping_VariadicLengthIds2
()
{
await
TestAllWrappingCasesAsync
(
@"class C {
void Bar() {
a.[||]Goobar(
i, jj, kkkk, lll, mm,
n) {
}
}"
,
GetIndentionColumn
(
30
),
@"class C {
void Bar() {
a.Goobar(i,
jj,
kkkk,
lll,
mm,
n) {
}
}"
,
@"class C {
void Bar() {
a.Goobar(
i,
jj,
kkkk,
lll,
mm,
n) {
}
}"
,
@"class C {
void Bar() {
a.Goobar(i,
jj,
kkkk,
lll,
mm,
n) {
}
}"
,
@"class C {
void Bar() {
a.Goobar(i, jj, kkkk, lll, mm, n) {
}
}"
,
@"class C {
void Bar() {
a.Goobar(
i, jj, kkkk, lll, mm, n) {
}
}"
,
@"class C {
void Bar() {
a.Goobar(i, jj, kkkk,
lll, mm, n) {
}
}"
,
@"class C {
void Bar() {
a.Goobar(
i, jj, kkkk, lll,
mm, n) {
}
}"
,
@"class C {
void Bar() {
a.Goobar(i, jj, kkkk,
lll, mm, n) {
}
}"
);
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsWrapping
)]
public
async
Task
Test_DoNotOfferExistingOption1
()
{
await
TestAllWrappingCasesAsync
(
@"class C {
void Bar() {
a.[||]Goobar(iiiii,
jjjjj,
kkkkk,
lllll,
mmmmm,
nnnnn);
}
}"
,
GetIndentionColumn
(
30
),
@"class C {
void Bar() {
a.Goobar(
iiiii,
jjjjj,
kkkkk,
lllll,
mmmmm,
nnnnn);
}
}"
,
@"class C {
void Bar() {
a.Goobar(iiiii,
jjjjj,
kkkkk,
lllll,
mmmmm,
nnnnn);
}
}"
,
@"class C {
void Bar() {
a.Goobar(iiiii, jjjjj, kkkkk, lllll, mmmmm, nnnnn);
}
}"
,
@"class C {
void Bar() {
a.Goobar(
iiiii, jjjjj, kkkkk, lllll, mmmmm, nnnnn);
}
}"
,
@"class C {
void Bar() {
a.Goobar(iiiii, jjjjj,
kkkkk, lllll,
mmmmm, nnnnn);
}
}"
,
@"class C {
void Bar() {
a.Goobar(
iiiii, jjjjj,
kkkkk, lllll,
mmmmm, nnnnn);
}
}"
,
@"class C {
void Bar() {
a.Goobar(iiiii, jjjjj,
kkkkk, lllll,
mmmmm, nnnnn);
}
}"
);
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsWrapping
)]
public
async
Task
Test_DoNotOfferExistingOption2
()
{
await
TestAllWrappingCasesAsync
(
@"class C {
void Bar() {
a.Goobar([||]
i,
jj,
kkkk,
lll,
mm,
n);
}
}"
,
GetIndentionColumn
(
30
),
@"class C {
void Bar() {
a.Goobar(i,
jj,
kkkk,
lll,
mm,
n);
}
}"
,
@"class C {
void Bar() {
a.Goobar(i,
jj,
kkkk,
lll,
mm,
n);
}
}"
,
@"class C {
void Bar() {
a.Goobar(i, jj, kkkk, lll, mm, n);
}
}"
,
@"class C {
void Bar() {
a.Goobar(
i, jj, kkkk, lll, mm, n);
}
}"
,
@"class C {
void Bar() {
a.Goobar(i, jj, kkkk,
lll, mm, n);
}
}"
,
@"class C {
void Bar() {
a.Goobar(
i, jj, kkkk, lll,
mm, n);
}
}"
,
@"class C {
void Bar() {
a.Goobar(i, jj, kkkk,
lll, mm, n);
}
}"
);
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsWrapping
)]
public
async
Task
TestInElementAccess1
()
{
await
TestInRegularAndScript1Async
(
@"class C {
void Goo() {
var v = this[[||]a, b, c];
}
}"
,
@"class C {
void Goo() {
var v = this[a,
b,
c];
}
}"
);
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsWrapping
)]
public
async
Task
TestInElementAccess2
()
{
await
TestInRegularAndScript1Async
(
@"class C {
void Goo() {
var v = [||]this[a, b, c];
}
}"
,
@"class C {
void Goo() {
var v = this[a,
b,
c];
}
}"
);
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsWrapping
)]
public
async
Task
TestInObjectCreation1
()
{
await
TestInRegularAndScript1Async
(
@"class C {
void Goo() {
var v = [||]new Bar(a, b, c);
}
}"
,
@"class C {
void Goo() {
var v = new Bar(a,
b,
c);
}
}"
);
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsWrapping
)]
public
async
Task
TestInObjectCreation2
()
{
await
TestInRegularAndScript1Async
(
@"class C {
void Goo() {
var v = new Bar([||]a, b, c);
}
}"
,
@"class C {
void Goo() {
var v = new Bar(a,
b,
c);
}
}"
);
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsWrapping
)]
public
async
Task
TestInConstructorInitializer1
()
{
await
TestInRegularAndScript1Async
(
@"class C {
public C() : base([||]a, b, c) {
}
}"
,
@"class C {
public C() : base(a,
b,
c) {
}
}"
);
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsWrapping
)]
public
async
Task
TestInConstructorInitializer2
()
{
await
TestInRegularAndScript1Async
(
@"class C {
public C() : [||]base(a, b, c) {
}
}"
,
@"class C {
public C() : base(a,
b,
c) {
}
}"
);
}
}
}
src/EditorFeatures/Core/Wrapping/BinaryExpression/AbstractBinaryExpressionWrapper.cs
浏览文件 @
b0588b11
...
...
@@ -9,7 +9,7 @@
namespace
Microsoft.CodeAnalysis.Editor.Wrapping.BinaryExpression
{
internal
abstract
partial
class
AbstractBinaryExpressionWrapper
<
TBinaryExpressionSyntax
>
:
AbstractWrapper
internal
abstract
partial
class
AbstractBinaryExpressionWrapper
<
TBinaryExpressionSyntax
>
:
Abstract
Syntax
Wrapper
where
TBinaryExpressionSyntax
:
SyntaxNode
{
private
readonly
bool
_supportsOperatorWrapping
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录