Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
b779b9cc
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,发现更多精彩内容 >>
提交
b779b9cc
编写于
2月 19, 2015
作者:
T
Tomas Matousek
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix an oversight in VB TryGetLambdaBodies and add a couple of tests to VB
上级
ab835f7d
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
63 addition
and
5 deletion
+63
-5
src/Compilers/VisualBasic/Portable/Syntax/SyntaxUtilities.vb
src/Compilers/VisualBasic/Portable/Syntax/SyntaxUtilities.vb
+7
-2
src/EditorFeatures/VisualBasicTest/EditAndContinue/ActiveStatementTests.vb
...s/VisualBasicTest/EditAndContinue/ActiveStatementTests.vb
+28
-0
src/EditorFeatures/VisualBasicTest/EditAndContinue/RudeEditTopLevelTests.vb
.../VisualBasicTest/EditAndContinue/RudeEditTopLevelTests.vb
+24
-0
src/Features/VisualBasic/EditAndContinue/SyntaxUtilities.vb
src/Features/VisualBasic/EditAndContinue/SyntaxUtilities.vb
+4
-3
未找到文件。
src/Compilers/VisualBasic/Portable/Syntax/SyntaxUtilities.vb
浏览文件 @
b779b9cc
...
...
@@ -23,19 +23,24 @@ Namespace Microsoft.CodeAnalysis.VisualBasic
Case
SyntaxKind
.
WhereClause
Return
DirectCast
(
newLambda
,
WhereClauseSyntax
).
Condition
' source sequence in From and Aggregate (other than the first in the query)
Case
SyntaxKind
.
CollectionRangeVariable
Return
DirectCast
(
newLambda
,
CollectionRangeVariableSyntax
).
Expression
' function call in Group By, Group Join, Aggregate: the argument
Case
SyntaxKind
.
FunctionAggregation
Return
DirectCast
(
newLambda
,
FunctionAggregationSyntax
).
Argument
' variable in Let, Select, Group By: the RHS
Case
SyntaxKind
.
ExpressionRangeVariable
Return
DirectCast
(
newLambda
,
ExpressionRangeVariableSyntax
).
Expression
Case
SyntaxKind
.
TakeWhileClause
,
SyntaxKind
.
SkipWhileClause
Case
SyntaxKind
.
TakeWhileClause
,
SyntaxKind
.
SkipWhileClause
Return
DirectCast
(
newLambda
,
PartitionWhileClauseSyntax
).
Condition
Case
SyntaxKind
.
AscendingOrdering
,
SyntaxKind
.
DescendingOrdering
Case
SyntaxKind
.
AscendingOrdering
,
SyntaxKind
.
DescendingOrdering
Return
DirectCast
(
newLambda
,
OrderingSyntax
).
Expression
Case
SyntaxKind
.
JoinCondition
...
...
src/EditorFeatures/VisualBasicTest/EditAndContinue/ActiveStatementTests.vb
浏览文件 @
b779b9cc
...
...
@@ -4166,6 +4166,34 @@ End Class
Diagnostic
(
RudeEditKind
.
RUDE_EDIT_LAMBDA_EXPRESSION
,
"Function(b)"
,
"method"
))
End
Sub
<
Fact
>
Public
Sub
Lambdas_ActiveStatementRemoved4
()
Dim
src1
=
"
Class C
Shared Sub Main()
Dim f = Function(a)
<AS:1>z(2)</AS:1>
return Function (b)
<AS:0>Return b</AS:0>
End Function
End Function
End Sub
End Class"
Dim
src2
=
"
Class C
<AS:0,1>Shared Sub Main()</AS:0,1>
End Sub
End Class
"
Dim
edits
=
GetTopEdits
(
src1
,
src2
)
Dim
active
=
GetActiveStatements
(
src1
,
src2
)
edits
.
VerifyRudeDiagnostics
(
active
,
Diagnostic
(
RudeEditKind
.
ActiveStatementLambdaRemoved
,
"Shared Sub Main()"
,
"lambda"
),
Diagnostic
(
RudeEditKind
.
ActiveStatementLambdaRemoved
,
"Shared Sub Main()"
,
"lambda"
))
End
Sub
<
Fact
>
Public
Sub
Queries_ActiveStatementRemoved_WhereClause
()
Dim
src1
=
"
...
...
src/EditorFeatures/VisualBasicTest/EditAndContinue/RudeEditTopLevelTests.vb
浏览文件 @
b779b9cc
...
...
@@ -2001,6 +2001,30 @@ End Class
Diagnostic
(
RudeEditKind
.
AwaitStatementUpdate
,
"a += Await F(1)"
))
End
Sub
<
Fact
(
Skip
:
=
"TODO: Enable lambda edits"
)
>
Public
Sub
MethodWithLambda_Update
()
Dim
src1
=
"
Class C
Shared Sub F()
Dim a = Function() 1
End Sub
End Class
"
Dim
src2
=
"
Class C
Shared Sub F()
Dim a = Function() 1
Console.WriteLine(1)
End Sub
End Class
"
Dim
edits
=
GetTopEdits
(
src1
,
src2
)
edits
.
VerifySemantics
(
ActiveStatementsDescription
.
Empty
,
{
SemanticEdit
(
SemanticEditKind
.
Update
,
Function
(
c
)
c
.
GetMember
(
"C.F"
),
preserveLocalVariables
:
=
True
)})
End
Sub
<
Fact
>
Public
Sub
MethodUpdate_AddAttribute
()
Dim
src1
=
"Class C : "
&
vbLf
&
"Sub F() : End Sub : End Class"
...
...
src/Features/VisualBasic/EditAndContinue/SyntaxUtilities.vb
浏览文件 @
b779b9cc
...
...
@@ -71,8 +71,9 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.EditAndContinue
Dim
body1
As
SyntaxNode
=
Nothing
Dim
body2
As
SyntaxNode
=
Nothing
Return
TryGetLambdaBodies
(
parent
,
body1
,
body2
)
AndAlso
(
node
Is
body1
OrElse
node
Is
body2
)
Dim
result
=
TryGetLambdaBodies
(
parent
,
body1
,
body2
)
body
=
If
(
node
Is
body2
,
body2
,
body1
)
Return
result
End
Function
Public
Shared
Function
TryGetLambdaBodies
(
node
As
SyntaxNode
,
<
Out
>
ByRef
body1
As
SyntaxNode
,
<
Out
>
ByRef
body2
As
SyntaxNode
)
As
Boolean
...
...
@@ -109,7 +110,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.EditAndContinue
' variable in Let, Select, Group By: the RHS
Case
SyntaxKind
.
ExpressionRangeVariable
body1
=
DirectCast
(
node
,
ExpressionRangeVariableSyntax
)
body1
=
DirectCast
(
node
,
ExpressionRangeVariableSyntax
)
.
Expression
Return
True
Case
SyntaxKind
.
TakeWhileClause
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录