Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
d33d2072
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,发现更多精彩内容 >>
提交
d33d2072
编写于
7月 15, 2016
作者:
C
CyrusNajmabadi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Don't resolve symbols at insertion time for Partial-Type-Completion.
上级
249ef344
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
34 addition
and
21 deletion
+34
-21
src/Features/CSharp/Portable/Completion/CompletionProviders/PartialTypeCompletionProvider.cs
...tion/CompletionProviders/PartialTypeCompletionProvider.cs
+16
-8
src/Features/Core/Portable/Completion/Providers/AbstractPartialTypeCompletionProvider.cs
...letion/Providers/AbstractPartialTypeCompletionProvider.cs
+10
-4
src/Features/VisualBasic/Portable/Completion/CompletionProviders/PartialTypeCompletionProvider.vb
...tion/CompletionProviders/PartialTypeCompletionProvider.vb
+8
-9
未找到文件。
src/Features/CSharp/Portable/Completion/CompletionProviders/PartialTypeCompletionProvider.cs
浏览文件 @
d33d2072
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using
System
;
using
System.Collections.Generic
;
using
System.Linq
;
using
System.Threading
;
...
...
@@ -18,6 +19,8 @@ namespace Microsoft.CodeAnalysis.CSharp.Completion.Providers
{
internal
partial
class
PartialTypeCompletionProvider
:
AbstractPartialTypeCompletionProvider
{
private
const
string
InsertionTextOnLessThan
=
nameof
(
InsertionTextOnLessThan
);
private
static
readonly
SymbolDisplayFormat
_symbolFormatWithGenerics
=
new
SymbolDisplayFormat
(
globalNamespaceStyle
:
SymbolDisplayGlobalNamespaceStyle
.
Omitted
,
...
...
@@ -51,7 +54,8 @@ protected override Task<AbstractSyntaxContext> CreateSyntaxContextAsync(Document
return
Task
.
FromResult
<
AbstractSyntaxContext
>(
CSharpSyntaxContext
.
CreateContext
(
document
.
Project
.
Solution
.
Workspace
,
semanticModel
,
position
,
cancellationToken
));
}
protected
override
ValueTuple
<
string
,
string
>
GetDisplayAndInsertionText
(
INamedTypeSymbol
symbol
,
AbstractSyntaxContext
context
)
protected
override
ValueTuple
<
string
,
string
>
GetDisplayAndInsertionText
(
INamedTypeSymbol
symbol
,
AbstractSyntaxContext
context
)
{
var
displayAndInsertionText
=
symbol
.
ToMinimalDisplayString
(
context
.
SemanticModel
,
context
.
Position
,
_symbolFormatWithGenerics
);
return
ValueTuple
.
Create
(
displayAndInsertionText
,
displayAndInsertionText
);
...
...
@@ -72,15 +76,19 @@ private static bool IsPartialTypeDeclaration(SyntaxNode syntax)
return
declarationSyntax
!=
null
&&
declarationSyntax
.
Modifiers
.
Any
(
modifier
=>
modifier
.
IsKind
(
SyntaxKind
.
PartialKeyword
));
}
public
async
override
Task
<
TextChange
?>
GetTextChangeAsync
(
Document
document
,
CompletionItem
selectedItem
,
char
?
ch
,
CancellationToken
cancellationToken
)
protected
override
CompletionItem
AddAdditionalProperties
(
CompletionItem
item
,
INamedTypeSymbol
symbol
,
AbstractSyntaxContext
context
)
{
return
item
.
AddProperty
(
InsertionTextOnLessThan
,
symbol
.
Name
.
EscapeIdentifier
());
}
public
async
override
Task
<
TextChange
?>
GetTextChangeAsync
(
Document
document
,
CompletionItem
selectedItem
,
char
?
ch
,
CancellationToken
cancellationToken
)
{
if
(
ch
==
'<'
)
{
var
symbols
=
await
SymbolCompletionItem
.
GetSymbolsAsync
(
selectedItem
,
document
,
cancellationToken
).
ConfigureAwait
(
false
);
if
(
symbols
.
Length
>
0
)
string
insertionText
;
if
(
selectedItem
.
Properties
.
TryGetValue
(
InsertionTextOnLessThan
,
out
insertionText
))
{
var
insertionText
=
symbols
[
0
].
Name
.
EscapeIdentifier
();
return
new
TextChange
(
selectedItem
.
Span
,
insertionText
);
}
}
...
...
src/Features/Core/Portable/Completion/Providers/AbstractPartialTypeCompletionProvider.cs
浏览文件 @
d33d2072
...
...
@@ -37,7 +37,7 @@ public async sealed override Task ProvideCompletionsAsync(CompletionContext comp
if
(
declaredSymbol
!=
null
)
{
var
symbols
=
LookupCandidateSymbols
(
syntaxContext
,
declaredSymbol
,
cancellationToken
);
var
items
=
symbols
?.
Select
(
s
ymbol
=>
CreateCompletionItem
(
symbol
,
completionContext
.
CompletionListSpan
,
position
,
syntaxContext
));
var
items
=
symbols
?.
Select
(
s
=>
CreateCompletionItem
(
s
,
syntaxContext
));
if
(
items
!=
null
)
{
...
...
@@ -47,19 +47,25 @@ public async sealed override Task ProvideCompletionsAsync(CompletionContext comp
}
}
private
CompletionItem
CreateCompletionItem
(
INamedTypeSymbol
symbol
,
TextSpan
textSpan
,
int
position
,
AbstractSyntaxContext
context
)
private
CompletionItem
CreateCompletionItem
(
INamedTypeSymbol
symbol
,
AbstractSyntaxContext
context
)
{
var
displayAndInsertionText
=
GetDisplayAndInsertionText
(
symbol
,
context
);
return
SymbolCompletionItem
.
Create
(
var
item
=
SymbolCompletionItem
.
Create
(
displayText
:
displayAndInsertionText
.
Item1
,
insertionText
:
displayAndInsertionText
.
Item2
,
symbol
:
symbol
,
contextPosition
:
context
.
Position
,
descriptionPosition
:
p
osition
,
descriptionPosition
:
context
.
P
osition
,
rules
:
CompletionItemRules
.
Default
);
item
=
AddAdditionalProperties
(
item
,
symbol
,
context
);
return
item
;
}
protected
abstract
CompletionItem
AddAdditionalProperties
(
CompletionItem
item
,
INamedTypeSymbol
symbol
,
AbstractSyntaxContext
context
);
protected
abstract
Task
<
AbstractSyntaxContext
>
CreateSyntaxContextAsync
(
Document
document
,
SemanticModel
semanticModel
,
...
...
src/Features/VisualBasic/Portable/Completion/CompletionProviders/PartialTypeCompletionProvider.vb
浏览文件 @
d33d2072
...
...
@@ -13,6 +13,8 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Completion.Providers
Partial
Friend
Class
PartialTypeCompletionProvider
Inherits
AbstractPartialTypeCompletionProvider
Private
Const
InsertionTextOnOpenParen
As
String
=
NameOf
(
InsertionTextOnOpenParen
)
Private
Shared
ReadOnly
_insertionTextFormatWithGenerics
As
SymbolDisplayFormat
=
New
SymbolDisplayFormat
(
globalNamespaceStyle
:
=
SymbolDisplayGlobalNamespaceStyle
.
Omitted
,
...
...
@@ -25,9 +27,6 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Completion.Providers
SymbolDisplayGenericsOptions
.
IncludeVariance
Or
SymbolDisplayGenericsOptions
.
IncludeTypeConstraints
)
Private
Shared
ReadOnly
_insertionTextFormatWithoutGenerics
As
SymbolDisplayFormat
=
_insertionTextFormatWithGenerics
.
WithGenericsOptions
(
SymbolDisplayGenericsOptions
.
None
)
Private
Shared
ReadOnly
_displayTextFormat
As
SymbolDisplayFormat
=
_insertionTextFormatWithGenerics
.
RemoveMiscellaneousOptions
(
SymbolDisplayMiscellaneousOptions
.
EscapeKeywordIdentifiers
)
...
...
@@ -50,19 +49,19 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Completion.Providers
Return
ValueTuple
.
Create
(
displayText
,
insertionText
)
End
Function
Protected
Overrides
Function
AddAdditionalProperties
(
item
As
CompletionItem
,
symbol
As
INamedTypeSymbol
,
context
As
AbstractSyntaxContext
)
As
CompletionItem
Return
item
.
AddProperty
(
InsertionTextOnOpenParen
,
symbol
.
Name
.
EscapeIdentifier
())
End
Function
Public
Overrides
Async
Function
GetTextChangeAsync
(
document
As
Document
,
selectedItem
As
CompletionItem
,
ch
As
Char
?
,
cancellationToken
As
CancellationToken
)
As
Task
(
Of
TextChange
?
)
If
ch
=
"("
c
Then
Dim
symbols
=
Await
SymbolCompletionItem
.
GetSymbolsAsync
(
selectedItem
,
document
,
cancellationToken
).
ConfigureAwait
(
False
)
If
symbols
.
Length
>
0
Then
Dim
position
=
SymbolCompletionItem
.
GetContextPosition
(
selectedItem
)
Dim
semanticModel
=
Await
document
.
GetSemanticModelForSpanAsync
(
New
TextSpan
(
position
,
0
),
cancellationToken
).
ConfigureAwait
(
False
)
Dim
insertionText
=
symbols
(
0
).
ToMinimalDisplayString
(
semanticModel
,
position
,
format
:
=
_insertionTextFormatWithoutGenerics
)
Dim
insertionText
As
String
=
Nothing
If
selectedItem
.
Properties
.
TryGetValue
(
InsertionTextOnOpenParen
,
insertionText
)
Then
Return
New
TextChange
(
selectedItem
.
Span
,
insertionText
)
End
If
End
If
Return
Await
MyBase
.
GetTextChangeAsync
(
document
,
selectedItem
,
ch
,
cancellationToken
).
ConfigureAwait
(
False
)
End
Function
End
Class
End
Namespace
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录