Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
100234ca
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,发现更多精彩内容 >>
提交
100234ca
编写于
12月 05, 2015
作者:
C
Cyrus Najmabadi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
We should never match with a namespace if the user has provided generic type args.
上级
1665ebc0
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
30 addition
and
3 deletion
+30
-3
src/EditorFeatures/VisualBasicTest/Diagnostics/AddImport/AddImportTests.vb
...s/VisualBasicTest/Diagnostics/AddImport/AddImportTests.vb
+9
-2
src/Features/Core/Portable/CodeFixes/AddImport/AbstractAddImportCodeFixProvider.cs
...e/CodeFixes/AddImport/AbstractAddImportCodeFixProvider.cs
+5
-0
src/Features/VisualBasic/Portable/CodeFixes/AddImport/VisualBasicAddImportCodeFixProvider.vb
...odeFixes/AddImport/VisualBasicAddImportCodeFixProvider.vb
+16
-1
未找到文件。
src/EditorFeatures/VisualBasicTest/Diagnostics/AddImport/AddImportTests.vb
浏览文件 @
100234ca
...
@@ -159,9 +159,16 @@ NewLines("Imports System.Collections.Generic \n Class Foo \n Function F() As Lis
...
@@ -159,9 +159,16 @@ NewLines("Imports System.Collections.Generic \n Class Foo \n Function F() As Lis
End
Function
End
Function
<
WpfFact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsAddImport
)
>
<
WpfFact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsAddImport
)
>
Public
Async
Function
TestGenericWithWrongArgs
()
As
Task
Public
Async
Function
TestGenericWithWrongArgs
1
()
As
Task
Await
TestMissingAsync
(
Await
TestMissingAsync
(
NewLines
(
"Class Foo \n Function F() As [|List(Of Integer, String)|] \n End Function \n End Class"
))
NewLines
(
"Class Foo \n Function F() As [|List(Of Integer, String, Boolean)|] \n End Function \n End Class"
))
End
Function
<
WpfFact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsAddImport
)
>
Public
Async
Function
TestGenericWithWrongArgs2
()
As
Task
Await
TestAsync
(
NewLines
(
"Class Foo \n Function F() As [|List(Of Integer, String)|] \n End Function \n End Class"
),
NewLines
(
"Imports System.Collections.Generic \n Class Foo \n Function F() As SortedList(Of Integer, String) \n End Function \n End Class"
))
End
Function
End
Function
<
WpfFact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsAddImport
)
>
<
WpfFact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsAddImport
)
>
...
...
src/Features/Core/Portable/CodeFixes/AddImport/AbstractAddImportCodeFixProvider.cs
浏览文件 @
100234ca
...
@@ -508,6 +508,11 @@ private async Task<IList<SymbolReference>> GetNamespacesForMatchingNamespacesAsy
...
@@ -508,6 +508,11 @@ private async Task<IList<SymbolReference>> GetNamespacesForMatchingNamespacesAsy
int
arity
;
int
arity
;
_syntaxFacts
.
GetNameAndArityOfSimpleName
(
_node
,
out
name
,
out
arity
);
_syntaxFacts
.
GetNameAndArityOfSimpleName
(
_node
,
out
name
,
out
arity
);
if
(
arity
>
0
)
{
return
null
;
}
if
(
ExpressionBinds
(
checkForExtensionMethods
:
false
))
if
(
ExpressionBinds
(
checkForExtensionMethods
:
false
))
{
{
return
null
;
return
null
;
...
...
src/Features/VisualBasic/Portable/CodeFixes/AddImport/VisualBasicAddImportCodeFixProvider.vb
浏览文件 @
100234ca
...
@@ -293,13 +293,28 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.CodeFixes.AddImport
...
@@ -293,13 +293,28 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.CodeFixes.AddImport
placeSystemNamespaceFirst
As
Boolean
,
placeSystemNamespaceFirst
As
Boolean
,
cancellationToken
As
CancellationToken
)
As
Task
(
Of
Document
)
cancellationToken
As
CancellationToken
)
As
Task
(
Of
Document
)
Dim
originalDocument
=
document
Dim
originalContextNode
=
contextNode
Dim
originalRoot
=
DirectCast
(
contextNode
.
SyntaxTree
.
GetRoot
(
cancellationToken
),
CompilationUnitSyntax
)
Dim
root
=
originalRoot
If
Not
String
.
IsNullOrEmpty
(
desiredName
)
Then
Dim
firstToken
=
contextNode
.
GetFirstToken
()
If
firstToken
.
IsKind
(
SyntaxKind
.
IdentifierToken
)
AndAlso
firstToken
.
ValueText
<>
desiredName
Then
Dim
annotation
=
New
SyntaxAnnotation
()
root
=
root
.
ReplaceToken
(
firstToken
,
SyntaxFactory
.
Identifier
(
desiredName
).
WithTriviaFrom
(
firstToken
).
WithAdditionalAnnotations
(
annotation
))
document
=
document
.
WithSyntaxRoot
(
root
)
contextNode
=
root
.
GetAnnotatedTokens
(
annotation
).
First
().
Parent
End
If
End
If
Dim
memberImportsClause
=
Dim
memberImportsClause
=
SyntaxFactory
.
SimpleImportsClause
(
name
:
=
DirectCast
(
symbol
.
GenerateTypeSyntax
(
addGlobal
:
=
False
),
NameSyntax
).
WithAdditionalAnnotations
(
Simplifier
.
Annotation
))
SyntaxFactory
.
SimpleImportsClause
(
name
:
=
DirectCast
(
symbol
.
GenerateTypeSyntax
(
addGlobal
:
=
False
),
NameSyntax
).
WithAdditionalAnnotations
(
Simplifier
.
Annotation
))
Dim
newImport
=
SyntaxFactory
.
ImportsStatement
(
Dim
newImport
=
SyntaxFactory
.
ImportsStatement
(
importsClauses
:
=
SyntaxFactory
.
SingletonSeparatedList
(
Of
ImportsClauseSyntax
)(
memberImportsClause
))
importsClauses
:
=
SyntaxFactory
.
SingletonSeparatedList
(
Of
ImportsClauseSyntax
)(
memberImportsClause
))
Dim
syntaxTree
=
contextNode
.
SyntaxTree
Dim
syntaxTree
=
contextNode
.
SyntaxTree
Dim
root
=
DirectCast
(
syntaxTree
.
GetRoot
(
cancellationToken
),
CompilationUnitSyntax
)
Return
Task
.
FromResult
(
Return
Task
.
FromResult
(
document
.
WithSyntaxRoot
(
document
.
WithSyntaxRoot
(
root
.
AddImportsStatement
(
newImport
,
placeSystemNamespaceFirst
,
root
.
AddImportsStatement
(
newImport
,
placeSystemNamespaceFirst
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录