Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
6cbfec92
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,发现更多精彩内容 >>
提交
6cbfec92
编写于
2月 20, 2015
作者:
T
Tomas Matousek
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'upstream/master'
上级
b722d74a
a7f2f6a9
变更
8
显示空白变更内容
内联
并排
Showing
8 changed file
with
349 addition
and
40 deletion
+349
-40
src/Compilers/VisualBasic/Portable/Syntax/SyntaxFacts.vb
src/Compilers/VisualBasic/Portable/Syntax/SyntaxFacts.vb
+39
-22
src/EditorFeatures/CSharp/Formatting/CSharpEditorFormattingService.cs
...atures/CSharp/Formatting/CSharpEditorFormattingService.cs
+5
-2
src/EditorFeatures/CSharpTest/Formatting/FormattingEngineTests.cs
...orFeatures/CSharpTest/Formatting/FormattingEngineTests.cs
+221
-0
src/ExpressionEvaluator/Core/Source/Concord/Microsoft.VisualStudio.Debugger.Engine.il
.../Source/Concord/Microsoft.VisualStudio.Debugger.Engine.il
+2
-2
src/ExpressionEvaluator/Core/Source/Concord/Microsoft.VisualStudio.Debugger.Metadata.il
...ource/Concord/Microsoft.VisualStudio.Debugger.Metadata.il
+2
-2
src/Features/Core/Shared/Utilities/PatternMatcher.cs
src/Features/Core/Shared/Utilities/PatternMatcher.cs
+10
-11
src/Workspaces/CoreTest/CodeCleanup/RemoveUnnecessaryLineContinuationTests.cs
...est/CodeCleanup/RemoveUnnecessaryLineContinuationTests.cs
+69
-0
src/Workspaces/VisualBasic/Portable/CodeCleanup/Providers/RemoveUnnecessaryLineContinuationCodeCleanupProvider.vb
...s/RemoveUnnecessaryLineContinuationCodeCleanupProvider.vb
+1
-1
未找到文件。
src/Compilers/VisualBasic/Portable/Syntax/SyntaxFacts.vb
浏览文件 @
6cbfec92
...
...
@@ -833,15 +833,23 @@ Namespace Microsoft.CodeAnalysis.VisualBasic
Return
True
' After an open parenthesis (() or before a closing parenthesis ()).
' After an open curly brace ({) or before a closing curly brace (}).
' After an open embedded expression (<%=) or before the close of an embedded expression (%>) within an XML literal.
Case
SyntaxKind
.
OpenParenToken
,
SyntaxKind
.
OpenBraceToken
,
SyntaxKind
.
LessThanPercentEqualsToken
,
SyntaxKind
.
PercentGreaterThanToken
Return
True
' After an open curly brace ({) or before a closing curly brace (})
' However, a line-continuation character is required following the open curly brace of a string interpolation.
Case
SyntaxKind
.
OpenBraceToken
If
parentKind
=
SyntaxKind
.
Interpolation
Then
Return
False
End
If
Return
True
' After a member qualifier character (.) and before the member name.
' However, you must include a line-continuation character (_) following a member qualifier character when you are using the With statement or
' supplying values in the initialization list for a type.
...
...
@@ -1042,13 +1050,22 @@ Namespace Microsoft.CodeAnalysis.VisualBasic
Return
parentKind
=
SyntaxKind
.
AttributeList
' After an open parenthesis (() or before a closing parenthesis ()).
' After an open curly brace ({) or before a closing curly brace (}).
' After an open embedded expression (<%=) or before the close of an embedded expression (%>) within an XML literal.
Case
SyntaxKind
.
CloseParenToken
,
SyntaxKind
.
CloseBraceToken
,
SyntaxKind
.
PercentGreaterThanToken
Return
True
Return
True
' After an open curly brace ({) or before a closing curly brace (})
' However, a line-continuation character is required before the closing curly brace of a string interpolation.
Case
SyntaxKind
.
CloseBraceToken
If
parentKind
=
SyntaxKind
.
Interpolation
Then
Return
False
End
If
Return
True
' Before and after query operators (Aggregate, Distinct, From, Group By, Group Join, Join, Let,
' Order By, Select, Skip, Skip While, Take, Take While, Where, In, Into, On, Ascending, and Descending).
...
...
src/EditorFeatures/CSharp/Formatting/CSharpEditorFormattingService.cs
浏览文件 @
6cbfec92
...
...
@@ -142,7 +142,8 @@ private static bool TokenShouldNotFormatOnReturn(SyntaxToken token)
private
static
bool
TokenShouldNotFormatOnTypeChar
(
SyntaxToken
token
)
{
return
token
.
IsKind
(
SyntaxKind
.
CloseParenToken
)
&&
!
token
.
Parent
.
IsKind
(
SyntaxKind
.
UsingStatement
);
return
(
token
.
IsKind
(
SyntaxKind
.
CloseParenToken
)
&&
!
token
.
Parent
.
IsKind
(
SyntaxKind
.
UsingStatement
))
||
(
token
.
IsKind
(
SyntaxKind
.
ColonToken
)
&&
!(
token
.
Parent
.
IsKind
(
SyntaxKind
.
LabeledStatement
)
||
token
.
Parent
.
IsKind
(
SyntaxKind
.
CaseSwitchLabel
)
||
token
.
Parent
.
IsKind
(
SyntaxKind
.
DefaultSwitchLabel
)));
}
public
async
Task
<
IList
<
TextChange
>>
GetFormattingChangesAsync
(
Document
document
,
char
typedChar
,
int
caretPosition
,
CancellationToken
cancellationToken
)
...
...
@@ -165,7 +166,9 @@ public async Task<IList<TextChange>> GetFormattingChangesAsync(Document document
return
null
;
}
// Check to see if the token is ')' and also the parent is a using statement. If not, bail
// Check to see if any of the below. If not, bail.
// case 1: The token is ')' and the parent is an using statement.
// case 2: The token is ':' and the parent is either labelled statement or case switch or default switch
if
(
TokenShouldNotFormatOnTypeChar
(
token
))
{
return
null
;
...
...
src/EditorFeatures/CSharpTest/Formatting/FormattingEngineTests.cs
浏览文件 @
6cbfec92
...
...
@@ -834,6 +834,227 @@ static void Main(string[] args)
static void Main(string[] args)
{
}
}"
;
AssertFormatAfterTypeChar
(
code
,
expected
);
}
[
WorkItem
(
464
)]
[
WorkItem
(
908729
)]
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
Formatting
)]
public
void
ColonInSwitchCase
()
{
var
code
=
@"class Program
{
static void Main(string[] args)
{
int f = 0;
switch(f)
{
case 1 :$$ break;
}
}
}"
;
var
expected
=
@"class Program
{
static void Main(string[] args)
{
int f = 0;
switch(f)
{
case 1: break;
}
}
}"
;
AssertFormatAfterTypeChar
(
code
,
expected
);
}
[
WorkItem
(
464
)]
[
WorkItem
(
908729
)]
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
Formatting
)]
public
void
ColonInDefaultSwitchCase
()
{
var
code
=
@"class Program
{
static void Main(string[] args)
{
int f = 0;
switch(f)
{
case 1: break;
default :$$ break;
}
}
}"
;
var
expected
=
@"class Program
{
static void Main(string[] args)
{
int f = 0;
switch(f)
{
case 1: break;
default: break;
}
}
}"
;
AssertFormatAfterTypeChar
(
code
,
expected
);
}
[
WorkItem
(
464
)]
[
WorkItem
(
908729
)]
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
Formatting
)]
public
void
ColonInLabeledStatement
()
{
var
code
=
@"class Program
{
static void Main(string[] args)
{
label1 :$$ int s = 0;
}
}"
;
var
expected
=
@"class Program
{
static void Main(string[] args)
{
label1: int s = 0;
}
}"
;
AssertFormatAfterTypeChar
(
code
,
expected
);
}
[
WorkItem
(
464
)]
[
WorkItem
(
908729
)]
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
Formatting
)]
public
void
DoNotFormatColonInTargetAttribute
()
{
var
code
=
@"using System;
[method :$$ C]
class C : Attribute
{
}"
;
var
expected
=
@"using System;
[method : C]
class C : Attribute
{
}"
;
AssertFormatAfterTypeChar
(
code
,
expected
);
}
[
WorkItem
(
464
)]
[
WorkItem
(
908729
)]
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
Formatting
)]
public
void
DoNotFormatColonInBaseList
()
{
var
code
=
@"class C :$$ Attribute
{
}"
;
var
expected
=
@"class C : Attribute
{
}"
;
AssertFormatAfterTypeChar
(
code
,
expected
);
}
[
WorkItem
(
464
)]
[
WorkItem
(
908729
)]
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
Formatting
)]
public
void
DoNotFormatColonInThisConstructor
()
{
var
code
=
@"class Foo
{
Foo(int s) :$$ this()
{
}
Foo()
{
}
}"
;
var
expected
=
@"class Foo
{
Foo(int s) : this()
{
}
Foo()
{
}
}"
;
AssertFormatAfterTypeChar
(
code
,
expected
);
}
[
WorkItem
(
464
)]
[
WorkItem
(
908729
)]
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
Formatting
)]
public
void
DoNotFormatColonInConditionalOperator
()
{
var
code
=
@"class Program
{
static void Main(string[] args)
{
var vari = foo() ? true :$$ false;
}
}"
;
var
expected
=
@"class Program
{
static void Main(string[] args)
{
var vari = foo() ? true : false;
}
}"
;
AssertFormatAfterTypeChar
(
code
,
expected
);
}
[
WorkItem
(
464
)]
[
WorkItem
(
908729
)]
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
Formatting
)]
public
void
DoNotFormatColonInArgument
()
{
var
code
=
@"class Program
{
static void Main(string[] args)
{
Main(args :$$ args);
}
}"
;
var
expected
=
@"class Program
{
static void Main(string[] args)
{
Main(args : args);
}
}"
;
AssertFormatAfterTypeChar
(
code
,
expected
);
}
[
WorkItem
(
464
)]
[
WorkItem
(
908729
)]
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
Formatting
)]
public
void
DoNotFormatColonInTyepPararmeter
()
{
var
code
=
@"class Program<T>
{
class C1<U>
where T :$$ U
{
}
}"
;
var
expected
=
@"class Program<T>
{
class C1<U>
where T : U
{
}
}"
;
AssertFormatAfterTypeChar
(
code
,
expected
);
...
...
src/ExpressionEvaluator/Core/Source/Concord/Microsoft.VisualStudio.Debugger.Engine.il
浏览文件 @
6cbfec92
...
...
@@ -39,13 +39,13 @@
.ver 1:0:0:0
}
.module Microsoft.VisualStudio.Debugger.Engine.dll
// MVID: {
C3F504FB-22AF-4D5E-8F9E-94471D35BDB3
}
// MVID: {
6C44C082-16C7-4FDA-BDD9-290D72D500E8
}
.imagebase 0x00400000
.file alignment 0x00000200
.stackreserve 0x00100000
.subsystem 0x0003 // WINDOWS_CUI
.corflags 0x00000001 // ILONLY
// Image base: 0x0
283
0000
// Image base: 0x0
101
0000
// =============== CLASS MEMBERS DECLARATION ===================
src/ExpressionEvaluator/Core/Source/Concord/Microsoft.VisualStudio.Debugger.Metadata.il
浏览文件 @
6cbfec92
...
...
@@ -38,13 +38,13 @@
.ver 14:0:0:0
}
.module Microsoft.VisualStudio.Debugger.Metadata.dll
// MVID: {
A849A496-7C3A-4A0C-9391-02EE53F11055
}
// MVID: {
79F62A13-7C48-401B-9FC6-02D7CDCE84B8
}
.imagebase 0x00400000
.file alignment 0x00000200
.stackreserve 0x00100000
.subsystem 0x0003 // WINDOWS_CUI
.corflags 0x00000001 // ILONLY
// Image base: 0x00
91
0000
// Image base: 0x00
37
0000
// =============== CLASS MEMBERS DECLARATION ===================
...
...
src/Features/Core/Shared/Utilities/PatternMatcher.cs
浏览文件 @
6cbfec92
...
...
@@ -138,7 +138,7 @@ public TextChunk(string text)
private
readonly
bool
_invalidPattern
;
private
readonly
Segment
_fullPatternSegment
;
private
readonly
Segment
[]
_dotSeparatedSeg
e
ments
;
private
readonly
Segment
[]
_dotSeparatedSegments
;
private
readonly
Dictionary
<
string
,
List
<
TextSpan
>>
_stringToWordSpans
=
new
Dictionary
<
string
,
List
<
TextSpan
>>();
private
readonly
Func
<
string
,
List
<
TextSpan
>>
_breakIntoWordSpans
=
StringBreaker
.
BreakIntoWordParts
;
...
...
@@ -165,13 +165,13 @@ public PatternMatcher(string pattern, CultureInfo culture, bool verbatimIdentifi
_compareInfo
=
culture
.
CompareInfo
;
_fullPatternSegment
=
new
Segment
(
pattern
,
verbatimIdentifierPrefixIsWordCharacter
);
_dotSeparatedSeg
e
ments
=
pattern
.
Split
(
DotCharacterArray
,
StringSplitOptions
.
RemoveEmptyEntries
)
_dotSeparatedSegments
=
pattern
.
Split
(
DotCharacterArray
,
StringSplitOptions
.
RemoveEmptyEntries
)
.
Select
(
text
=>
new
Segment
(
text
.
Trim
(),
verbatimIdentifierPrefixIsWordCharacter
))
.
ToArray
();
_invalidPattern
=
_dotSeparatedSeg
ements
.
Length
==
0
||
_dotSeparatedSege
ments
.
Any
(
s
=>
s
.
IsInvalid
);
_invalidPattern
=
_dotSeparatedSeg
ments
.
Length
==
0
||
_dotSeparatedSeg
ments
.
Any
(
s
=>
s
.
IsInvalid
);
}
public
bool
IsDottedPattern
=>
_dotSeparatedSeg
e
ments
.
Length
>
1
;
public
bool
IsDottedPattern
=>
_dotSeparatedSegments
.
Length
>
1
;
private
bool
SkipMatch
(
string
candidate
)
{
...
...
@@ -202,7 +202,7 @@ public IEnumerable<PatternMatch> GetMatchesForLastSegmentOfPattern(string candid
return
null
;
}
return
MatchSegment
(
candidate
,
_dotSeparatedSeg
e
ments
.
Last
());
return
MatchSegment
(
candidate
,
_dotSeparatedSegments
.
Last
());
}
/// <summary>
...
...
@@ -227,7 +227,7 @@ public IEnumerable<PatternMatch> GetMatches(string candidate, string dottedConta
// First, check that the last part of the dot separated pattern matches the name of the
// candidate. If not, then there's no point in proceeding and doing the more
// expensive work.
var
candidateMatch
=
MatchSegment
(
candidate
,
_dotSeparatedSeg
e
ments
.
Last
());
var
candidateMatch
=
MatchSegment
(
candidate
,
_dotSeparatedSegments
.
Last
());
if
(
candidateMatch
==
null
)
{
return
null
;
...
...
@@ -238,7 +238,7 @@ public IEnumerable<PatternMatch> GetMatches(string candidate, string dottedConta
// -1 because the last part was checked against the name, and only the rest
// of the parts are checked against the container.
if
(
_dotSeparatedSeg
e
ments
.
Length
-
1
>
containerParts
.
Length
)
if
(
_dotSeparatedSegments
.
Length
-
1
>
containerParts
.
Length
)
{
// There weren't enough container parts to match against the pattern parts.
// So this definitely doesn't match.
...
...
@@ -249,11 +249,11 @@ public IEnumerable<PatternMatch> GetMatches(string candidate, string dottedConta
// the dotted parts match up correctly.
var
totalMatch
=
candidateMatch
.
ToList
();
for
(
int
i
=
_dotSeparatedSeg
e
ments
.
Length
-
2
,
j
=
containerParts
.
Length
-
1
;
for
(
int
i
=
_dotSeparatedSegments
.
Length
-
2
,
j
=
containerParts
.
Length
-
1
;
i
>=
0
;
i
--,
j
--)
{
var
segment
=
_dotSeparatedSeg
e
ments
[
i
];
var
segment
=
_dotSeparatedSegments
[
i
];
var
containerName
=
containerParts
[
j
];
var
containerMatch
=
MatchSegment
(
containerName
,
segment
);
if
(
containerMatch
==
null
)
...
...
@@ -403,8 +403,7 @@ private static bool ContainsUpperCaseLetter(string pattern)
// (Pattern: fogbar, Candidate: quuxfogbarFogBar).
if
(
chunk
.
Text
.
Length
<
candidate
.
Length
)
{
var
firstInstance
=
_compareInfo
.
IndexOf
(
candidate
,
chunk
.
Text
,
CompareOptions
.
IgnoreCase
);
if
(
firstInstance
!=
-
1
&&
char
.
IsUpper
(
candidate
[
firstInstance
]))
if
(
index
!=
-
1
&&
char
.
IsUpper
(
candidate
[
index
]))
{
return
new
PatternMatch
(
PatternMatchKind
.
Substring
,
punctuationStripped
,
isCaseSensitive
:
false
);
}
...
...
src/Workspaces/CoreTest/CodeCleanup/RemoveUnnecessaryLineContinuationTests.cs
浏览文件 @
6cbfec92
...
...
@@ -1307,6 +1307,75 @@ End Module
Verify
(
code
,
expected
);
}
[
Fact
]
[
WorkItem
(
710
,
"#710"
)]
[
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
RemoveUnnecessaryLineContinuation
)]
public
void
DontRemoveLineContinuationInStringInterpolation1
()
{
var
code
=
@"[|
Module Program
Dim x = $""{ _
1}""
End Module
|]"
;
var
expected
=
@"
Module Program
Dim x = $""{ _
1}""
End Module
"
;
Verify
(
code
,
expected
);
}
[
Fact
]
[
WorkItem
(
710
,
"#710"
)]
[
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
RemoveUnnecessaryLineContinuation
)]
public
void
DontRemoveLineContinuationInStringInterpolation2
()
{
var
code
=
@"[|
Module Program
Dim x = $""{1 _
}""
End Module
|]"
;
var
expected
=
@"
Module Program
Dim x = $""{1 _
}""
End Module
"
;
Verify
(
code
,
expected
);
}
[
Fact
]
[
WorkItem
(
710
,
"#710"
)]
[
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
RemoveUnnecessaryLineContinuation
)]
public
void
DontRemoveLineContinuationInStringInterpolation3
()
{
var
code
=
@"[|
Module Program
Dim x = $""{ _
1 _
}""
End Module
|]"
;
var
expected
=
@"
Module Program
Dim x = $""{ _
1 _
}""
End Module
"
;
Verify
(
code
,
expected
);
}
private
string
CreateMethod
(
string
body
)
{
return
@"Imports System
...
...
src/Workspaces/VisualBasic/Portable/CodeCleanup/Providers/RemoveUnnecessaryLineContinuationCodeCleanupProvider.vb
浏览文件 @
6cbfec92
...
...
@@ -106,7 +106,7 @@ Namespace Microsoft.CodeAnalysis.CodeCleanup.Providers
End
If
' check context
If
token1
.
IsLastTokenOfStatement
()
Then
If
token1
.
IsLastTokenOfStatement
()
AndAlso
Not
token1
.
IsMissing
Then
' check trivia
If
Not
GetTrailingTrivia
(
token1
).
Any
(
SyntaxKind
.
LineContinuationTrivia
)
AndAlso
Not
GetLeadingTrivia
(
token2
).
Any
(
SyntaxKind
.
LineContinuationTrivia
)
Then
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录