Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
dotNET
Roslyn
提交
e65ae4c0
R
Roslyn
项目概览
dotNET
/
Roslyn
通知
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,发现更多精彩内容 >>
未验证
提交
e65ae4c0
编写于
6月 01, 2017
作者:
F
Fredric Silberberg
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Make BoundUsingStatement.Declarations follow documentation in VB, updated tests to match.
上级
ca69bc39
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
120 addition
and
102 deletion
+120
-102
src/Compilers/VisualBasic/Portable/BoundTree/Statement.vb
src/Compilers/VisualBasic/Portable/BoundTree/Statement.vb
+4
-1
src/Compilers/VisualBasic/Test/Semantic/BasicCompilerSemanticTest.vbproj
...isualBasic/Test/Semantic/BasicCompilerSemanticTest.vbproj
+1
-0
src/Compilers/VisualBasic/Test/Semantic/IOperation/IOperationTests.vb
...s/VisualBasic/Test/Semantic/IOperation/IOperationTests.vb
+0
-101
src/Compilers/VisualBasic/Test/Semantic/IOperation/IOperationTests_IUsingStatement.vb
...st/Semantic/IOperation/IOperationTests_IUsingStatement.vb
+115
-0
未找到文件。
src/Compilers/VisualBasic/Portable/BoundTree/Statement.vb
浏览文件 @
e65ae4c0
...
@@ -1461,7 +1461,10 @@ Namespace Microsoft.CodeAnalysis.VisualBasic
...
@@ -1461,7 +1461,10 @@ Namespace Microsoft.CodeAnalysis.VisualBasic
Return
s_variablesMappings
.
GetValue
(
Return
s_variablesMappings
.
GetValue
(
Me
,
Me
,
Function
(
BoundUsing
)
Function
(
BoundUsing
)
Dim
usingStatementSyntax
=
Syntax
.
ChildNodes
().
OfType
(
Of
UsingStatementSyntax
).
SingleOrDefault
()
If
(
BoundUsing
.
ResourceList
.
IsDefault
)
Then
Return
Nothing
End
If
Dim
usingStatementSyntax
=
DirectCast
(
Syntax
.
ChildNodes
()(
0
),
UsingStatementSyntax
)
Return
New
Variables
(
BoundUsing
.
ResourceList
.
As
(
Of
IVariableDeclaration
),
usingStatementSyntax
)
Return
New
Variables
(
BoundUsing
.
ResourceList
.
As
(
Of
IVariableDeclaration
),
usingStatementSyntax
)
End
Function
)
End
Function
)
End
Get
End
Get
...
...
src/Compilers/VisualBasic/Test/Semantic/BasicCompilerSemanticTest.vbproj
浏览文件 @
e65ae4c0
...
@@ -128,6 +128,7 @@
...
@@ -128,6 +128,7 @@
<Compile
Include=
"FlowAnalysis\RegionAnalysisTestsWithStaticLocals.vb"
/>
<Compile
Include=
"FlowAnalysis\RegionAnalysisTestsWithStaticLocals.vb"
/>
<Compile
Include=
"FlowAnalysis\StructureAnalysisTests.vb"
/>
<Compile
Include=
"FlowAnalysis\StructureAnalysisTests.vb"
/>
<Compile
Include=
"FlowAnalysis\TryLockUsingStatementTests.vb"
/>
<Compile
Include=
"FlowAnalysis\TryLockUsingStatementTests.vb"
/>
<Compile
Include=
"IOperation\IOperationTests_IUsingStatement.vb"
/>
<Compile
Include=
"IOperation\IOperationTests_IVariableDeclaration.vb"
/>
<Compile
Include=
"IOperation\IOperationTests_IVariableDeclaration.vb"
/>
<Compile
Include=
"Resource.Designer.vb"
>
<Compile
Include=
"Resource.Designer.vb"
>
<AutoGen>
True
</AutoGen>
<AutoGen>
True
</AutoGen>
...
...
src/Compilers/VisualBasic/Test/Semantic/IOperation/IOperationTests.vb
浏览文件 @
e65ae4c0
...
@@ -352,106 +352,5 @@ BC30581: 'AddressOf' expression cannot be converted to 'Integer' because 'Intege
...
@@ -352,106 +352,5 @@ BC30581: 'AddressOf' expression cannot be converted to 'Integer' because 'Intege
IObjectCreationExpression (Constructor: Sub System.Guid..ctor()) (OperationKind.ObjectCreationExpression, Type: System.Guid) (Syntax: 'New System.Guid()')
IObjectCreationExpression (Constructor: Sub System.Guid..ctor()) (OperationKind.ObjectCreationExpression, Type: System.Guid) (Syntax: 'New System.Guid()')
IOperation: (OperationKind.None) (Syntax: 'AddressOf Main')"
)
IOperation: (OperationKind.None) (Syntax: 'AddressOf Main')"
)
End
Sub
End
Sub
<
Fact
>
<
WorkItem
(
19819
,
"https://github.com/dotnet/roslyn/issues/19819"
)
>
Public
Sub
UsingDeclarationSyntaxNotNull
()
Dim
source
=
<
compilation
>
<
file
name
=
"c.vb"
>
<
!
[
CDATA
[
Imports
System
Module
Module1
Class
C1
Implements
IDisposable
Public
Sub
Dispose
()
Implements
IDisposable
.
Dispose
Throw
New
NotImplementedException
()
End
Sub
End
Class
Sub
S1
()
Using
D1
as
New
C1
()
End
Using
End
Sub
End
Module
]]
>
</
file
>
</
compilation
>
Dim
comp
=
CreateCompilationWithMscorlibAndVBRuntime
(
source
,
parseOptions
:
=
TestOptions
.
RegularWithIOperationFeature
)
Dim
tree
=
comp
.
SyntaxTrees
.
Single
()
Dim
node
=
tree
.
GetRoot
().
DescendantNodes
().
OfType
(
Of
UsingBlockSyntax
).
Single
()
Dim
op
=
DirectCast
(
comp
.
GetSemanticModel
(
tree
).
GetOperationInternal
(
node
),
IUsingStatement
)
Assert
.
NotNull
(
op
.
Declaration
.
Syntax
)
Assert
.
Equal
(
"Using D1 as New C1()"
,
op
.
Declaration
.
Syntax
.
ToString
())
End
Sub
<
Fact
>
<
WorkItem
(
19819
,
"https://github.com/dotnet/roslyn/issues/19819"
)
>
Public
Sub
UsingDeclarationIncompleteUsingNotNullSyntax
()
Dim
source
=
<
compilation
>
<
file
name
=
"c.vb"
>
<
!
[
CDATA
[
Imports
System
Module
Module1
Class
C1
Implements
IDisposable
Public
Sub
Dispose
()
Implements
IDisposable
.
Dispose
Throw
New
NotImplementedException
()
End
Sub
End
Class
Sub
S1
()
Using
End
Using
End
Sub
End
Module
]]
>
</
file
>
</
compilation
>
Dim
comp
=
CreateCompilationWithMscorlibAndVBRuntime
(
source
,
parseOptions
:
=
TestOptions
.
RegularWithIOperationFeature
)
Dim
tree
=
comp
.
SyntaxTrees
.
Single
()
Dim
node
=
tree
.
GetRoot
().
DescendantNodes
().
OfType
(
Of
UsingBlockSyntax
).
Single
()
Dim
op
=
DirectCast
(
comp
.
GetSemanticModel
(
tree
).
GetOperationInternal
(
node
),
IUsingStatement
)
Assert
.
NotNull
(
op
.
Declaration
.
Syntax
)
Assert
.
Equal
(
"Using"
,
op
.
Declaration
.
Syntax
.
ToString
())
End
Sub
<
Fact
>
Public
Sub
UsingDeclarationExistingVariableNonNullSyntax
()
' TODO: This will need to be removed when https://github.com/dotnet/roslyn/issues/19887 is fixed.
' The docs for IUsingStatement.Declaration state that it should be returning null when the
' using statement does not declare any variables. However, it currently does not. When that is
' fixed, this test should be updated to correctly reflect that assertion.
Dim
source
=
<
compilation
>
<
file
name
=
"c.vb"
>
<
!
[
CDATA
[
Imports
System
Module
Module1
Class
C1
Implements
IDisposable
Public
Sub
Dispose
()
Implements
IDisposable
.
Dispose
Throw
New
NotImplementedException
()
End
Sub
End
Class
Sub
S1
()
Dim
x
=
New
C1
()
Using
x
End
Using
End
Sub
End
Module
]]
>
</
file
>
</
compilation
>
Dim
comp
=
CreateCompilationWithMscorlibAndVBRuntime
(
source
,
parseOptions
:
=
TestOptions
.
RegularWithIOperationFeature
)
Dim
tree
=
comp
.
SyntaxTrees
.
Single
()
Dim
node
=
tree
.
GetRoot
().
DescendantNodes
().
OfType
(
Of
UsingBlockSyntax
).
Single
()
Dim
op
=
DirectCast
(
comp
.
GetSemanticModel
(
tree
).
GetOperationInternal
(
node
),
IUsingStatement
)
Assert
.
NotNull
(
op
.
Declaration
.
Syntax
)
Assert
.
Equal
(
"Using x"
,
op
.
Declaration
.
Syntax
.
ToString
())
End
Sub
End
Class
End
Class
End
Namespace
End
Namespace
src/Compilers/VisualBasic/Test/Semantic/IOperation/IOperationTests_IUsingStatement.vb
0 → 100644
浏览文件 @
e65ae4c0
Imports
Microsoft.CodeAnalysis.Semantics
Imports
Microsoft.CodeAnalysis.VisualBasic.Syntax
Imports
Roslyn.Test.Utilities
Namespace
Microsoft.CodeAnalysis.VisualBasic.UnitTests.Semantics
Partial
Public
Class
IOperationTests
Inherits
SemanticModelTestBase
<
Fact
>
<
WorkItem
(
19819
,
"https://github.com/dotnet/roslyn/issues/19819"
)
>
Public
Sub
UsingDeclarationSyntaxNotNull
()
Dim
source
=
<
compilation
>
<
file
name
=
"c.vb"
>
<
!
[
CDATA
[
Imports
System
Module
Module1
Class
C1
Implements
IDisposable
Public
Sub
Dispose
()
Implements
IDisposable
.
Dispose
Throw
New
NotImplementedException
()
End
Sub
End
Class
Sub
S1
()
Using
D1
as
New
C1
()
End
Using
End
Sub
End
Module
]]
>
</
file
>
</
compilation
>
Dim
comp
=
CreateCompilationWithMscorlibAndVBRuntime
(
source
,
parseOptions
:
=
TestOptions
.
RegularWithIOperationFeature
)
CompilationUtils
.
AssertNoDiagnostics
(
comp
)
Dim
tree
=
comp
.
SyntaxTrees
.
Single
()
Dim
node
=
tree
.
GetRoot
().
DescendantNodes
().
OfType
(
Of
UsingBlockSyntax
).
Single
()
Dim
op
=
DirectCast
(
comp
.
GetSemanticModel
(
tree
).
GetOperationInternal
(
node
),
IUsingStatement
)
Assert
.
NotNull
(
op
.
Declaration
.
Syntax
)
Assert
.
Same
(
node
.
UsingStatement
,
op
.
Declaration
.
Syntax
)
End
Sub
<
Fact
>
<
WorkItem
(
19887
,
"https://github.com/dotnet/roslyn/issues/19887"
)
>
Public
Sub
UsingDeclarationIncompleteUsingNullDeclaration
()
Dim
source
=
<
compilation
>
<
file
name
=
"c.vb"
>
<
!
[
CDATA
[
Imports
System
Module
Module1
Class
C1
Implements
IDisposable
Public
Sub
Dispose
()
Implements
IDisposable
.
Dispose
Throw
New
NotImplementedException
()
End
Sub
End
Class
Sub
S1
()
Using
End
Using
End
Sub
End
Module
]]
>
</
file
>
</
compilation
>
Dim
comp
=
CreateCompilationWithMscorlibAndVBRuntime
(
source
,
parseOptions
:
=
TestOptions
.
RegularWithIOperationFeature
)
CompilationUtils
.
AssertTheseDiagnostics
(
comp
,
<
expected
>
BC30201
:
Expression
expected
.
Using
~
</
expected
>
)
Dim
tree
=
comp
.
SyntaxTrees
.
Single
()
Dim
node
=
tree
.
GetRoot
().
DescendantNodes
().
OfType
(
Of
UsingBlockSyntax
).
Single
()
Dim
op
=
DirectCast
(
comp
.
GetSemanticModel
(
tree
).
GetOperationInternal
(
node
),
IUsingStatement
)
Assert
.
Null
(
op
.
Declaration
)
End
Sub
<
Fact
>
<
WorkItem
(
19887
,
"https://github.com/dotnet/roslyn/issues/19887"
)
>
Public
Sub
UsingDeclarationExistingVariableNullDeclaration
()
Dim
source
=
<
compilation
>
<
file
name
=
"c.vb"
>
<
!
[
CDATA
[
Imports
System
Module
Module1
Class
C1
Implements
IDisposable
Public
Sub
Dispose
()
Implements
IDisposable
.
Dispose
Throw
New
NotImplementedException
()
End
Sub
End
Class
Sub
S1
()
Dim
x
=
New
C1
()
Using
x
End
Using
End
Sub
End
Module
]]
>
</
file
>
</
compilation
>
Dim
comp
=
CreateCompilationWithMscorlibAndVBRuntime
(
source
,
parseOptions
:
=
TestOptions
.
RegularWithIOperationFeature
)
CompilationUtils
.
AssertNoDiagnostics
(
comp
)
Dim
tree
=
comp
.
SyntaxTrees
.
Single
()
Dim
node
=
tree
.
GetRoot
().
DescendantNodes
().
OfType
(
Of
UsingBlockSyntax
).
Single
()
Dim
op
=
DirectCast
(
comp
.
GetSemanticModel
(
tree
).
GetOperationInternal
(
node
),
IUsingStatement
)
Assert
.
Null
(
op
.
Declaration
)
End
Sub
End
Class
End
Namespace
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录