Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
5d7f57b0
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,发现更多精彩内容 >>
提交
5d7f57b0
编写于
12月 18, 2018
作者:
C
Cyrus Najmabadi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Use the new precedence service.
上级
c9979d54
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
23 addition
and
17 deletion
+23
-17
src/EditorFeatures/CSharp/Wrapping/BinaryExpression/CSharpBinaryExpressionWrapper.cs
...rapping/BinaryExpression/CSharpBinaryExpressionWrapper.cs
+1
-1
src/EditorFeatures/Core/Wrapping/BinaryExpression/AbstractBinaryExpressionWrapper.cs
...pping/BinaryExpression/AbstractBinaryExpressionWrapper.cs
+21
-15
src/EditorFeatures/VisualBasic/Wrapping/BinaryExpression/VisualBasicBinaryExpressionWrapper.vb
...ng/BinaryExpression/VisualBasicBinaryExpressionWrapper.vb
+1
-1
未找到文件。
src/EditorFeatures/CSharp/Wrapping/BinaryExpression/CSharpBinaryExpressionWrapper.cs
浏览文件 @
5d7f57b0
...
...
@@ -9,7 +9,7 @@ namespace Microsoft.CodeAnalysis.Editor.CSharp.Wrapping.BinaryExpression
internal
class
CSharpBinaryExpressionWrapper
:
AbstractBinaryExpressionWrapper
<
BinaryExpressionSyntax
>
{
public
CSharpBinaryExpressionWrapper
()
:
base
(
CSharpSyntaxFactsService
.
Instance
)
:
base
(
CSharpSyntaxFactsService
.
Instance
,
CSharpPrecedenceService
.
Instance
)
{
}
...
...
src/EditorFeatures/Core/Wrapping/BinaryExpression/AbstractBinaryExpressionWrapper.cs
浏览文件 @
5d7f57b0
...
...
@@ -6,6 +6,7 @@
using
System.Threading.Tasks
;
using
Microsoft.CodeAnalysis.LanguageServices
;
using
Microsoft.CodeAnalysis.PooledObjects
;
using
Microsoft.CodeAnalysis.Shared.Extensions
;
namespace
Microsoft.CodeAnalysis.Editor.Wrapping.BinaryExpression
{
...
...
@@ -13,10 +14,14 @@ internal abstract partial class AbstractBinaryExpressionWrapper<TBinaryExpressio
where
TBinaryExpressionSyntax
:
SyntaxNode
{
private
readonly
ISyntaxFactsService
_syntaxFacts
;
private
readonly
IPrecedenceService
_precedenceService
;
protected
AbstractBinaryExpressionWrapper
(
ISyntaxFactsService
syntaxFacts
)
protected
AbstractBinaryExpressionWrapper
(
ISyntaxFactsService
syntaxFacts
,
IPrecedenceService
precedenceService
)
{
_syntaxFacts
=
syntaxFacts
;
_precedenceService
=
precedenceService
;
}
/// <summary>
...
...
@@ -34,15 +39,18 @@ protected AbstractBinaryExpressionWrapper(ISyntaxFactsService syntaxFacts)
return
null
;
}
if
(!
IsLogicalExpression
(
binaryExpr
))
var
precedence
=
_precedenceService
.
GetPrecedenceKind
(
binaryExpr
);
if
(
precedence
==
PrecedenceKind
.
Other
)
{
return
null
;
}
// Don't process this binary expression if it's in a parent logical expr. We'll just
// allow our caller to walk up to that and call back into us to handle. This way, we're
// always starting at the topmost logical binary expr.
if
(
IsLogicalExpression
(
binaryExpr
.
Parent
))
// Don't process this binary expression if it's in a parent binary expr of the same
// precedence. We'll just allow our caller to walk up to that and call back into us
// to handle. This way, we're always starting at the topmost binary expr of this
// precedence.
if
(
binaryExpr
.
Parent
is
TBinaryExpressionSyntax
parentBinary
&&
precedence
==
_precedenceService
.
GetPrecedenceKind
(
parentBinary
))
{
return
null
;
}
...
...
@@ -77,29 +85,27 @@ protected AbstractBinaryExpressionWrapper(ISyntaxFactsService syntaxFacts)
private
ImmutableArray
<
SyntaxNodeOrToken
>
GetExpressionsAndOperators
(
TBinaryExpressionSyntax
binaryExpr
)
{
var
result
=
ArrayBuilder
<
SyntaxNodeOrToken
>.
GetInstance
();
AddExpressionsAndOperators
(
binaryExpr
,
result
);
AddExpressionsAndOperators
(
_precedenceService
.
GetPrecedenceKind
(
binaryExpr
),
binaryExpr
,
result
);
return
result
.
ToImmutableAndFree
();
}
private
void
AddExpressionsAndOperators
(
SyntaxNode
expr
,
ArrayBuilder
<
SyntaxNodeOrToken
>
result
)
PrecedenceKind
precedence
,
SyntaxNode
expr
,
ArrayBuilder
<
SyntaxNodeOrToken
>
result
)
{
if
(
IsLogicalExpression
(
expr
))
if
(
expr
is
TBinaryExpressionSyntax
&&
precedence
==
_precedenceService
.
GetPrecedenceKind
(
expr
))
{
_syntaxFacts
.
GetPartsOfBinaryExpression
(
expr
,
out
var
left
,
out
var
opToken
,
out
var
right
);
AddExpressionsAndOperators
(
left
,
result
);
AddExpressionsAndOperators
(
precedence
,
left
,
result
);
result
.
Add
(
opToken
);
AddExpressionsAndOperators
(
right
,
result
);
AddExpressionsAndOperators
(
precedence
,
right
,
result
);
}
else
{
result
.
Add
(
expr
);
}
}
private
bool
IsLogicalExpression
(
SyntaxNode
node
)
=>
_syntaxFacts
.
IsLogicalAndExpression
(
node
)
||
_syntaxFacts
.
IsLogicalOrExpression
(
node
);
}
}
src/EditorFeatures/VisualBasic/Wrapping/BinaryExpression/VisualBasicBinaryExpressionWrapper.vb
浏览文件 @
5d7f57b0
...
...
@@ -8,7 +8,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.Wrapping.BinaryExpression
Inherits
AbstractBinaryExpressionWrapper
(
Of
BinaryExpressionSyntax
)
Public
Sub
New
()
MyBase
.
New
(
VisualBasicSyntaxFactsService
.
Instance
)
MyBase
.
New
(
VisualBasicSyntaxFactsService
.
Instance
,
VisualBasicPrecedenceService
.
Instance
)
End
Sub
Protected
Overrides
Function
GetNewLineBeforeOperatorTrivia
(
newLine
As
SyntaxTriviaList
)
As
SyntaxTriviaList
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录