Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
87a2fa27
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,发现更多精彩内容 >>
提交
87a2fa27
编写于
7月 15, 2016
作者:
C
CyrusNajmabadi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Object creation providers don't need ot compute insertion text after the fact.
上级
d6ddfe77
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
25 addition
and
32 deletion
+25
-32
src/Features/CSharp/Portable/Completion/CompletionProviders/ObjectCreationCompletionProvider.cs
...n/CompletionProviders/ObjectCreationCompletionProvider.cs
+0
-11
src/Features/CSharp/Portable/Completion/CompletionProviders/SymbolCompletionProvider.cs
...ompletion/CompletionProviders/SymbolCompletionProvider.cs
+2
-1
src/Features/Core/Portable/Completion/Providers/AbstractObjectCreationCompletionProvider.cs
...ion/Providers/AbstractObjectCreationCompletionProvider.cs
+11
-2
src/Features/Core/Portable/Completion/Providers/AbstractSymbolCompletionProvider.cs
.../Completion/Providers/AbstractSymbolCompletionProvider.cs
+2
-2
src/Features/VisualBasic/Portable/Completion/CompletionProviders/EnumCompletionProvider.vb
.../Completion/CompletionProviders/EnumCompletionProvider.vb
+3
-4
src/Features/VisualBasic/Portable/Completion/CompletionProviders/HandlesClauseCompletionProvider.vb
...on/CompletionProviders/HandlesClauseCompletionProvider.vb
+3
-4
src/Features/VisualBasic/Portable/Completion/CompletionProviders/ImplementsClauseCompletionProvider.vb
...CompletionProviders/ImplementsClauseCompletionProvider.vb
+3
-3
src/Features/VisualBasic/Portable/Completion/CompletionProviders/ObjectCreationCompletionProvider.vb
...n/CompletionProviders/ObjectCreationCompletionProvider.vb
+0
-4
src/Features/VisualBasic/Portable/Completion/CompletionProviders/SymbolCompletionProvider.vb
...ompletion/CompletionProviders/SymbolCompletionProvider.vb
+1
-1
未找到文件。
src/Features/CSharp/Portable/Completion/CompletionProviders/ObjectCreationCompletionProvider.cs
浏览文件 @
87a2fa27
...
...
@@ -21,17 +21,6 @@ namespace Microsoft.CodeAnalysis.CSharp.Completion.Providers
{
internal
partial
class
ObjectCreationCompletionProvider
:
AbstractObjectCreationCompletionProvider
{
protected
override
string
GetInsertionText
(
ISymbol
symbol
,
AbstractSyntaxContext
context
,
char
ch
)
{
if
(
symbol
is
IAliasSymbol
)
{
return
((
IAliasSymbol
)
symbol
).
Name
;
}
var
displayService
=
context
.
GetLanguageService
<
ISymbolDisplayService
>();
return
displayService
.
ToMinimalDisplayString
(
context
.
SemanticModel
,
context
.
Position
,
symbol
);
}
internal
override
bool
IsInsertionTrigger
(
SourceText
text
,
int
characterPosition
,
OptionSet
options
)
{
return
CompletionUtilities
.
IsTriggerAfterSpaceOrStartOfWordCharacter
(
text
,
characterPosition
,
options
);
...
...
src/Features/CSharp/Portable/Completion/CompletionProviders/SymbolCompletionProvider.cs
浏览文件 @
87a2fa27
...
...
@@ -32,7 +32,8 @@ protected override bool IsInstrinsic(ISymbol s)
return
ts
!=
null
&&
ts
.
IsIntrinsicType
();
}
protected
override
string
GetInsertionText
(
ISymbol
symbol
,
AbstractSyntaxContext
context
,
char
ch
)
protected
override
string
GetInsertionText
(
CompletionItem
item
,
ISymbol
symbol
,
AbstractSyntaxContext
context
,
char
ch
)
{
return
GetInsertionText
(
symbol
,
context
);
}
...
...
src/Features/Core/Portable/Completion/Providers/AbstractObjectCreationCompletionProvider.cs
浏览文件 @
87a2fa27
...
...
@@ -10,9 +10,9 @@
using
Microsoft.CodeAnalysis.Recommendations
;
using
Microsoft.CodeAnalysis.Shared.Extensions
;
using
Microsoft.CodeAnalysis.Shared.Extensions.ContextQuery
;
using
Microsoft.CodeAnalysis.Text
;
using
Roslyn.Utilities
;
using
Microsoft.CodeAnalysis.Shared.Utilities
;
using
System
;
namespace
Microsoft.CodeAnalysis.Completion.Providers
{
...
...
@@ -122,11 +122,20 @@ protected override Task<IEnumerable<ISymbol>> GetPreselectedSymbolsWorker(Abstra
return
Task
.
FromResult
(
SpecializedCollections
.
SingletonEnumerable
((
ISymbol
)
type
));
}
protected
override
ValueTuple
<
string
,
string
>
GetDisplayAndInsertionText
(
ISymbol
symbol
,
AbstractSyntaxContext
context
)
protected
override
ValueTuple
<
string
,
string
>
GetDisplayAndInsertionText
(
ISymbol
symbol
,
AbstractSyntaxContext
context
)
{
var
displayService
=
context
.
GetLanguageService
<
ISymbolDisplayService
>();
var
displayString
=
displayService
.
ToMinimalDisplayString
(
context
.
SemanticModel
,
context
.
Position
,
symbol
);
return
ValueTuple
.
Create
(
displayString
,
displayString
);
}
protected
override
string
GetInsertionText
(
CompletionItem
item
,
ISymbol
symbol
,
AbstractSyntaxContext
context
,
char
ch
)
{
// The insertion text we put in the completion item is already the right text
// to insert.
return
SymbolCompletionItem
.
GetInsertionText
(
item
);
}
}
}
src/Features/Core/Portable/Completion/Providers/AbstractSymbolCompletionProvider.cs
浏览文件 @
87a2fa27
...
...
@@ -344,7 +344,7 @@ private Task<AbstractSyntaxContext> GetOrCreateContext(Document document, int po
var
symbols
=
await
SymbolCompletionItem
.
GetSymbolsAsync
(
selectedItem
,
document
,
cancellationToken
).
ConfigureAwait
(
false
);
if
(
symbols
.
Length
>
0
)
{
insertionText
=
GetInsertionText
(
symbols
[
0
],
context
,
ch
.
Value
);
insertionText
=
GetInsertionText
(
s
electedItem
,
s
ymbols
[
0
],
context
,
ch
.
Value
);
}
else
{
...
...
@@ -355,6 +355,6 @@ private Task<AbstractSyntaxContext> GetOrCreateContext(Document document, int po
return
new
TextChange
(
selectedItem
.
Span
,
insertionText
);
}
protected
abstract
string
GetInsertionText
(
ISymbol
symbol
,
AbstractSyntaxContext
context
,
char
ch
);
protected
abstract
string
GetInsertionText
(
CompletionItem
item
,
ISymbol
symbol
,
AbstractSyntaxContext
context
,
char
ch
);
}
}
src/Features/VisualBasic/Portable/Completion/CompletionProviders/EnumCompletionProvider.vb
浏览文件 @
87a2fa27
' Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
Imports
System.Collections.Immutable
Imports
System.Threading
Imports
Microsoft.CodeAnalysis.Completion
Imports
Microsoft.CodeAnalysis.Completion.Providers
...
...
@@ -136,9 +135,9 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Completion.Providers
Return
Task
.
FromResult
(
Of
TextChange
?
)(
New
TextChange
(
selectedItem
.
Span
,
insertionText
))
End
Function
Protected
Overrides
Function
GetInsertionText
(
symbol
As
ISymbol
,
context
As
AbstractSyntaxContext
,
ch
As
Char
)
As
String
Protected
Overrides
Function
GetInsertionText
(
item
As
CompletionItem
,
symbol
As
ISymbol
,
context
As
AbstractSyntaxContext
,
ch
As
Char
)
As
String
Return
CompletionUtilities
.
GetInsertionTextAtInsertionTime
(
symbol
,
context
,
ch
)
End
Function
End
Class
End
Namespace
End
Namespace
\ No newline at end of file
src/Features/VisualBasic/Portable/Completion/CompletionProviders/HandlesClauseCompletionProvider.vb
浏览文件 @
87a2fa27
...
...
@@ -9,7 +9,6 @@ Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
Imports
Microsoft.CodeAnalysis.VisualBasic.Extensions.ContextQuery
Imports
Microsoft.CodeAnalysis.Options
Imports
Microsoft.CodeAnalysis.Shared.Extensions.ContextQuery
Imports
System.Collections.Immutable
Namespace
Microsoft.CodeAnalysis.VisualBasic.Completion.Providers
Partial
Friend
Class
HandlesClauseCompletionProvider
...
...
@@ -148,9 +147,9 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Completion.Providers
Return
CompletionItemRules
.
Default
End
Function
Protected
Overrides
Function
GetInsertionText
(
symbol
As
ISymbol
,
context
As
AbstractSyntaxContext
,
ch
As
Char
)
As
String
Protected
Overrides
Function
GetInsertionText
(
item
As
CompletionItem
,
symbol
As
ISymbol
,
context
As
AbstractSyntaxContext
,
ch
As
Char
)
As
String
Return
CompletionUtilities
.
GetInsertionTextAtInsertionTime
(
symbol
,
context
,
ch
)
End
Function
End
Class
End
Namespace
End
Namespace
\ No newline at end of file
src/Features/VisualBasic/Portable/Completion/CompletionProviders/ImplementsClauseCompletionProvider.vb
浏览文件 @
87a2fa27
...
...
@@ -295,9 +295,9 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Completion.Providers
Return
Await
MyBase
.
GetTextChangeAsync
(
document
,
selectedItem
,
ch
,
cancellationToken
).
ConfigureAwait
(
False
)
End
Function
Protected
Overrides
Function
GetInsertionText
(
symbol
As
ISymbol
,
context
As
AbstractSyntaxContext
,
ch
As
Char
)
As
String
Protected
Overrides
Function
GetInsertionText
(
item
As
CompletionItem
,
symbol
As
ISymbol
,
context
As
AbstractSyntaxContext
,
ch
As
Char
)
As
String
Return
CompletionUtilities
.
GetInsertionTextAtInsertionTime
(
symbol
,
context
,
ch
)
End
Function
End
Class
End
Namespace
End
Namespace
\ No newline at end of file
src/Features/VisualBasic/Portable/Completion/CompletionProviders/ObjectCreationCompletionProvider.vb
浏览文件 @
87a2fa27
...
...
@@ -14,10 +14,6 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Completion.Providers
Partial
Friend
Class
ObjectCreationCompletionProvider
Inherits
AbstractObjectCreationCompletionProvider
Protected
Overrides
Function
GetInsertionText
(
symbol
As
ISymbol
,
context
As
AbstractSyntaxContext
,
ch
As
Char
)
As
String
Return
CompletionUtilities
.
GetInsertionTextAtInsertionTime
(
symbol
,
context
,
ch
)
End
Function
Friend
Overrides
Function
IsInsertionTrigger
(
text
As
SourceText
,
characterPosition
As
Integer
,
options
As
OptionSet
)
As
Boolean
Return
CompletionUtilities
.
IsTriggerAfterSpaceOrStartOfWordCharacter
(
text
,
characterPosition
,
options
)
End
Function
...
...
src/Features/VisualBasic/Portable/Completion/CompletionProviders/SymbolCompletionProvider.vb
浏览文件 @
87a2fa27
...
...
@@ -15,7 +15,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Completion.Providers
Partial
Friend
Class
SymbolCompletionProvider
Inherits
AbstractRecommendationServiceBasedCompletionProvider
Protected
Overrides
Function
GetInsertionText
(
symbol
As
ISymbol
,
context
As
AbstractSyntaxContext
,
ch
As
Char
)
As
String
Protected
Overrides
Function
GetInsertionText
(
item
As
CompletionItem
,
symbol
As
ISymbol
,
context
As
AbstractSyntaxContext
,
ch
As
Char
)
As
String
Return
CompletionUtilities
.
GetInsertionTextAtInsertionTime
(
symbol
,
context
,
ch
)
End
Function
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录