Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
34a7e3f4
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,发现更多精彩内容 >>
提交
34a7e3f4
编写于
10月 17, 2016
作者:
R
Ravi Chande
提交者:
GitHub
10月 17, 2016
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #14251 from rchande/myFormsCompletion
My forms completion
上级
c9f2edfa
85d48eb8
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
94 addition
and
12 deletion
+94
-12
src/EditorFeatures/Test/Completion/AbstractCompletionProviderTests.cs
...atures/Test/Completion/AbstractCompletionProviderTests.cs
+5
-5
src/EditorFeatures/Test/Workspaces/TestWorkspace_XmlConsumption.cs
...rFeatures/Test/Workspaces/TestWorkspace_XmlConsumption.cs
+12
-6
src/EditorFeatures/VisualBasicTest/Completion/CompletionProviders/SuggestionModeCompletionProviderTests.vb
...pletionProviders/SuggestionModeCompletionProviderTests.vb
+1
-1
src/EditorFeatures/VisualBasicTest/Completion/CompletionProviders/SymbolCompletionProviderTests.vb
...tion/CompletionProviders/SymbolCompletionProviderTests.vb
+66
-0
src/Workspaces/VisualBasic/Portable/Recommendations/VisualBasicRecommendationService.vb
...table/Recommendations/VisualBasicRecommendationService.vb
+10
-0
未找到文件。
src/EditorFeatures/Test/Completion/AbstractCompletionProviderTests.cs
浏览文件 @
34a7e3f4
...
...
@@ -79,8 +79,8 @@ internal static CompletionHelper GetCompletionHelper(Document document)
return
service
.
GetCompletionsAsync
(
document
,
position
,
triggerInfo
,
options
:
options
);
}
pr
ivate
async
Task
CheckResultsAsync
(
Document
document
,
int
position
,
string
expectedItemOrNull
,
string
expectedDescriptionOrNull
,
bool
usePreviousCharAsTrigger
,
bool
checkForAbsence
,
Glyph
?
glyph
,
int
?
matchPriority
)
pr
otected
async
Task
CheckResultsAsync
(
Document
document
,
int
position
,
string
expectedItemOrNull
,
string
expectedDescriptionOrNull
,
bool
usePreviousCharAsTrigger
,
bool
checkForAbsence
,
int
?
glyph
,
int
?
matchPriority
)
{
var
code
=
(
await
document
.
GetTextAsync
()).
ToString
();
...
...
@@ -124,7 +124,7 @@ internal static CompletionHelper GetCompletionHelper(Document document)
{
AssertEx
.
Any
(
items
,
c
=>
CompareItems
(
c
.
DisplayText
,
expectedItemOrNull
)
&&
(
expectedDescriptionOrNull
!=
null
?
completionService
.
GetDescriptionAsync
(
document
,
c
).
Result
.
Text
==
expectedDescriptionOrNull
:
true
)
&&
(
glyph
.
HasValue
?
c
.
Tags
.
SequenceEqual
(
GlyphTags
.
GetTags
(
glyph
.
Value
))
:
true
)
&&
(
glyph
.
HasValue
?
c
.
Tags
.
SequenceEqual
(
GlyphTags
.
GetTags
(
(
Glyph
)
glyph
.
Value
))
:
true
)
&&
(
matchPriority
.
HasValue
?
(
int
)
c
.
Rules
.
MatchPriority
==
matchPriority
.
Value
:
true
));
}
}
...
...
@@ -269,12 +269,12 @@ protected async Task VerifyNoItemsExistAsync(string markup, SourceCodeKind? sour
}
var
document1
=
await
WorkspaceFixture
.
UpdateDocumentAsync
(
code
,
sourceCodeKind
);
await
CheckResultsAsync
(
document1
,
position
,
expectedItemOrNull
,
expectedDescriptionOrNull
,
usePreviousCharAsTrigger
,
checkForAbsence
,
expectedG
lyph
,
matchPriority
);
await
CheckResultsAsync
(
document1
,
position
,
expectedItemOrNull
,
expectedDescriptionOrNull
,
usePreviousCharAsTrigger
,
checkForAbsence
,
g
lyph
,
matchPriority
);
if
(
await
CanUseSpeculativeSemanticModelAsync
(
document1
,
position
))
{
var
document2
=
await
WorkspaceFixture
.
UpdateDocumentAsync
(
code
,
sourceCodeKind
,
cleanBeforeUpdate
:
false
);
await
CheckResultsAsync
(
document2
,
position
,
expectedItemOrNull
,
expectedDescriptionOrNull
,
usePreviousCharAsTrigger
,
checkForAbsence
,
expectedG
lyph
,
matchPriority
);
await
CheckResultsAsync
(
document2
,
position
,
expectedItemOrNull
,
expectedDescriptionOrNull
,
usePreviousCharAsTrigger
,
checkForAbsence
,
g
lyph
,
matchPriority
);
}
}
...
...
src/EditorFeatures/Test/Workspaces/TestWorkspace_XmlConsumption.cs
浏览文件 @
34a7e3f4
...
...
@@ -291,8 +291,8 @@ public static Task<TestWorkspace> CreateAsync(string xmlDefinition, bool complet
var
contentTypeRegistryService
=
exportProvider
.
GetExportedValue
<
IContentTypeRegistryService
>();
var
languageServices
=
workspace
.
Services
.
GetLanguageServices
(
language
);
var
compilationOptions
=
CreateCompilationOptions
(
workspace
,
projectElement
,
language
);
var
parseOptions
=
GetParseOptions
(
projectElement
,
language
,
languageServices
);
var
compilationOptions
=
CreateCompilationOptions
(
workspace
,
projectElement
,
language
,
parseOptions
);
var
references
=
CreateReferenceList
(
workspace
,
projectElement
);
var
analyzers
=
CreateAnalyzerList
(
workspace
,
projectElement
);
...
...
@@ -454,15 +454,16 @@ private static string GetLanguage(TestWorkspace workspace, XElement projectEleme
private
static
CompilationOptions
CreateCompilationOptions
(
TestWorkspace
workspace
,
XElement
projectElement
,
string
language
)
string
language
,
ParseOptions
parseOptions
)
{
var
compilationOptionsElement
=
projectElement
.
Element
(
CompilationOptionsElementName
);
return
language
==
LanguageNames
.
CSharp
||
language
==
LanguageNames
.
VisualBasic
?
CreateCompilationOptions
(
workspace
,
language
,
compilationOptionsElement
)
?
CreateCompilationOptions
(
workspace
,
language
,
compilationOptionsElement
,
parseOptions
)
:
null
;
}
private
static
CompilationOptions
CreateCompilationOptions
(
TestWorkspace
workspace
,
string
language
,
XElement
compilationOptionsElement
)
private
static
CompilationOptions
CreateCompilationOptions
(
TestWorkspace
workspace
,
string
language
,
XElement
compilationOptionsElement
,
ParseOptions
parseOptions
)
{
var
rootNamespace
=
new
VisualBasicCompilationOptions
(
OutputKind
.
ConsoleApplication
).
RootNamespace
;
var
globalImports
=
new
List
<
GlobalImport
>();
...
...
@@ -493,9 +494,11 @@ private static CompilationOptions CreateCompilationOptions(TestWorkspace workspa
rootNamespace
=
new
VisualBasicCompilationOptions
(
OutputKind
.
WindowsRuntimeMetadata
).
RootNamespace
;
}
// VB needs Compilation.ParseOptions set (we do the same at the VS layer)
return
language
==
LanguageNames
.
CSharp
?
(
CompilationOptions
)
new
CSharpCompilationOptions
(
OutputKind
.
WindowsRuntimeMetadata
)
:
new
VisualBasicCompilationOptions
(
OutputKind
.
WindowsRuntimeMetadata
).
WithGlobalImports
(
globalImports
).
WithRootNamespace
(
rootNamespace
);
:
new
VisualBasicCompilationOptions
(
OutputKind
.
WindowsRuntimeMetadata
).
WithGlobalImports
(
globalImports
).
WithRootNamespace
(
rootNamespace
)
.
WithParseOptions
((
VisualBasicParseOptions
)
parseOptions
??
VisualBasicParseOptions
.
Default
);
}
}
else
...
...
@@ -519,8 +522,11 @@ private static CompilationOptions CreateCompilationOptions(TestWorkspace workspa
if
(
language
==
LanguageNames
.
VisualBasic
)
{
// VB needs Compilation.ParseOptions set (we do the same at the VS layer)
compilationOptions
=
((
VisualBasicCompilationOptions
)
compilationOptions
).
WithRootNamespace
(
rootNamespace
)
.
WithGlobalImports
(
globalImports
);
.
WithGlobalImports
(
globalImports
)
.
WithParseOptions
((
VisualBasicParseOptions
)
parseOptions
??
VisualBasicParseOptions
.
Default
);
}
return
compilationOptions
;
...
...
src/EditorFeatures/VisualBasicTest/Completion/CompletionProviders/SuggestionModeCompletionProviderTests.vb
浏览文件 @
34a7e3f4
...
...
@@ -402,7 +402,7 @@ End Class</a>
End
Using
End
Function
Private
Async
Function
CheckResultsAsync
(
document
As
Document
,
position
As
Integer
,
isBuilder
As
Boolean
,
triggerInfo
As
CompletionTrigger
?
,
options
As
OptionSet
)
As
Task
Private
Overloads
Async
Function
CheckResultsAsync
(
document
As
Document
,
position
As
Integer
,
isBuilder
As
Boolean
,
triggerInfo
As
CompletionTrigger
?
,
options
As
OptionSet
)
As
Task
triggerInfo
=
If
(
triggerInfo
,
CompletionTrigger
.
CreateInsertionTrigger
(
"a"
c
))
Dim
service
=
GetCompletionService
(
document
.
Project
.
Solution
.
Workspace
)
...
...
src/EditorFeatures/VisualBasicTest/Completion/CompletionProviders/SymbolCompletionProviderTests.vb
浏览文件 @
34a7e3f4
...
...
@@ -7583,5 +7583,71 @@ End Namespace
Await VerifyItemIsAbsentAsync(text, "
Rest
")
End Function
<Fact, Trait(Traits.Feature, Traits.Features.Completion)>
Public Async Function WinformsInstanceMembers() As Task
' Setting the the preprocessor symbol _MyType=WindowsForms will cause the
' compiler to automatically generate the My Template. See
' GroupClassTests.vb for the compiler layer equivalent of these tests.
Dim input =
<Workspace>
<Project Language="
Visual
Basic
" CommonReferences="
true
" PreprocessorSymbols="
_MyType
=
WindowsForms
">
<Document name="
Form
.
vb
">
<![CDATA[
Namespace Global.System.Windows.Forms
Public Class Form
Implements IDisposable
Public Sub InstanceMethod()
End Sub
Public Shared Sub SharedMethod()
End Sub
Public Sub Dispose() Implements IDisposable.Dispose
End Sub
Public ReadOnly Property IsDisposed As Boolean
Get
Return False
End Get
End Property
End Class
End Namespace
]]></Document>
<Document name="
types
.
vb
"><![CDATA[
Imports System
Namespace Global.WindowsApplication1
Public Class Form2
Inherits System.Windows.Forms.Form
End Class
End Namespace
Namespace Global.WindowsApplication1
Public Class Form1
Inherits System.Windows.Forms.Form
Private Sub Foo()
Form2.$$
End Sub
End Class
End Namespace
]]></Document>
</Project>
</Workspace>
Using workspace = Await TestWorkspace.CreateAsync(input)
Dim document = workspace.CurrentSolution.GetDocument(workspace.DocumentWithCursor.Id)
Dim position = workspace.DocumentWithCursor.CursorPosition.Value
Await CheckResultsAsync(document, position, "
InstanceMethod
", expectedDescriptionOrNull:=Nothing, usePreviousCharAsTrigger:=False, checkForAbsence:=False,
glyph:=Nothing, matchPriority:=Nothing)
Await CheckResultsAsync(document, position, "
SharedMethod
", expectedDescriptionOrNull:=Nothing, usePreviousCharAsTrigger:=False, checkForAbsence:=False,
glyph:=Nothing, matchPriority:=Nothing)
End Using
End Function
End Class
End Namespace
src/Workspaces/VisualBasic/Portable/Recommendations/VisualBasicRecommendationService.vb
浏览文件 @
34a7e3f4
...
...
@@ -247,6 +247,16 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Recommendations
Dim
leftHandTypeInfo
=
context
.
SemanticModel
.
GetTypeInfo
(
leftExpression
,
cancellationToken
)
Dim
leftHandSymbolInfo
=
context
.
SemanticModel
.
GetSymbolInfo
(
leftExpression
,
cancellationToken
)
' https://github.com/dotnet/roslyn/issues/9087: Try to speculatively bind a type as an expression for My namespace
' We'll get a type contained in the My Namespace if this is successful
If
leftHandTypeInfo
.
Type
IsNot
Nothing
AndAlso
leftHandTypeInfo
.
Type
.
Equals
(
leftHandSymbolInfo
.
Symbol
)
Then
Dim
leftHandSpeculativeBinding
=
context
.
SemanticModel
.
GetSpeculativeSymbolInfo
(
context
.
Position
,
leftExpression
,
SpeculativeBindingOption
.
BindAsExpression
)
If
leftHandSpeculativeBinding
.
Symbol
IsNot
Nothing
AndAlso
leftHandSpeculativeBinding
.
Symbol
.
ContainingNamespace
?
.
IsMyNamespace
(
context
.
SemanticModel
.
Compilation
)
Then
leftHandSymbolInfo
=
leftHandSpeculativeBinding
End
If
End
If
Dim
excludeInstance
=
False
Dim
excludeShared
=
True
' do not show shared members by default
Dim
useBaseReferenceAccessibility
=
False
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录