Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
39d23223
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,发现更多精彩内容 >>
提交
39d23223
编写于
6月 22, 2020
作者:
G
Gen Lu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Use constants for complex receiver type names
上级
968f15db
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
28 addition
and
16 deletion
+28
-16
src/Features/Core/Portable/Completion/Providers/ImportCompletionProvider/ExtensionMethodImportCompletionHelper.cs
...mpletionProvider/ExtensionMethodImportCompletionHelper.cs
+6
-6
src/Workspaces/Core/Portable/FindSymbols/Extensions.cs
src/Workspaces/Core/Portable/FindSymbols/Extensions.cs
+4
-0
src/Workspaces/Core/Portable/FindSymbols/SymbolTree/SymbolTreeInfo.Node.cs
...re/Portable/FindSymbols/SymbolTree/SymbolTreeInfo.Node.cs
+5
-1
src/Workspaces/Core/Portable/FindSymbols/SymbolTree/SymbolTreeInfo_Metadata.cs
...ortable/FindSymbols/SymbolTree/SymbolTreeInfo_Metadata.cs
+4
-4
src/Workspaces/Core/Portable/FindSymbols/SyntaxTree/SyntaxTreeIndex.ExtensionMethodInfo.cs
...Symbols/SyntaxTree/SyntaxTreeIndex.ExtensionMethodInfo.cs
+1
-1
src/Workspaces/Core/Portable/FindSymbols/SyntaxTree/SyntaxTreeIndex_Create.cs
...Portable/FindSymbols/SyntaxTree/SyntaxTreeIndex_Create.cs
+1
-1
src/Workspaces/Core/Portable/LanguageServices/DeclaredSymbolFactoryService/AbstractDeclaredSymbolInfoFactoryService.cs
...actoryService/AbstractDeclaredSymbolInfoFactoryService.cs
+7
-3
未找到文件。
src/Features/Core/Portable/Completion/Providers/ImportCompletionProvider/ExtensionMethodImportCompletionHelper.cs
浏览文件 @
39d23223
...
...
@@ -120,11 +120,11 @@ private static string GetReceiverTypeName(ITypeSymbol typeSymbol)
// We do not differentiate array of different kinds sicne they are all represented in the indices as "NonArrayElementTypeName[]"
// e.g. int[], int[][], int[,], etc. are all represented as "int[]", whereas array of complex type such as T[] is "[]".
return
elementTypeName
+
"[]"
;
return
elementTypeName
+
FindSymbols
.
Extensions
.
ArrayReceiverTypeNameSuffix
;
default
:
// Complex types are represented by "";
return
string
.
Empty
;
return
FindSymbols
.
Extensions
.
ComplexReceiverTypeName
;
}
}
...
...
@@ -237,14 +237,14 @@ private static string GetReceiverTypeName(ITypeSymbol typeSymbol)
return
completionItemsbuilder
.
ToImmutable
();
// Add strings represent complex types (i.e. ""
and "[]") to the receiver type, so we would include in the filter
// info about extension methods with complex receiver type.
// Add strings represent complex types (i.e. ""
for non-array types and "[]" for array types) to the receiver type,
//
so we would include in the filter
info about extension methods with complex receiver type.
static
ImmutableArray
<
string
>
AttachComplexTypes
(
ImmutableArray
<
string
>
receiverTypeNames
)
{
using
var
_
=
ArrayBuilder
<
string
>.
GetInstance
(
receiverTypeNames
.
Length
+
2
,
out
var
receiverTypeNamesBuilder
);
receiverTypeNamesBuilder
.
AddRange
(
receiverTypeNames
);
receiverTypeNamesBuilder
.
Add
(
string
.
Empty
);
receiverTypeNamesBuilder
.
Add
(
"[]"
);
receiverTypeNamesBuilder
.
Add
(
FindSymbols
.
Extensions
.
ComplexReceiverTypeName
);
receiverTypeNamesBuilder
.
Add
(
FindSymbols
.
Extensions
.
ComplexArrayReceiverTypeName
);
return
receiverTypeNamesBuilder
.
ToImmutable
();
}
...
...
src/Workspaces/Core/Portable/FindSymbols/Extensions.cs
浏览文件 @
39d23223
...
...
@@ -13,6 +13,10 @@ namespace Microsoft.CodeAnalysis.FindSymbols
{
internal
static
partial
class
Extensions
{
public
const
string
ComplexReceiverTypeName
=
""
;
public
const
string
ComplexArrayReceiverTypeName
=
"[]"
;
public
const
string
ArrayReceiverTypeNameSuffix
=
"[]"
;
public
static
async
Task
<
IEnumerable
<
SyntaxToken
>>
GetConstructorInitializerTokensAsync
(
this
Document
document
,
SemanticModel
model
,
CancellationToken
cancellationToken
)
{
var
root
=
await
model
.
SyntaxTree
.
GetRootAsync
(
cancellationToken
).
ConfigureAwait
(
false
);
...
...
src/Workspaces/Core/Portable/FindSymbols/SymbolTree/SymbolTreeInfo.Node.cs
浏览文件 @
39d23223
...
...
@@ -87,7 +87,11 @@ private string GetDebuggerDisplay()
public
readonly
string
Name
;
/// <summary>
/// Indicate if the type of parameter is any kind of array (used for both simple and complex types)
/// Indicate if the type of parameter is any kind of array.
/// This is relevant for both simple and complex types. For example:
/// - array of simple type like int[], int[][], int[][,], etc. are all ultimately represented as "int[]" in index.
/// - array of complex type like T[], T[][], etc are all represented as "[]" in index,
/// in contrast to just "" for non-array types.
/// </summary>
public
readonly
bool
IsArray
;
...
...
src/Workspaces/Core/Portable/FindSymbols/SymbolTree/SymbolTreeInfo_Metadata.cs
浏览文件 @
39d23223
...
...
@@ -730,10 +730,10 @@ private ImmutableArray<BuilderNode> GenerateUnsortedNodes(MultiDictionary<string
// similar for complex receiver types, "[]" means it's an array type, "" otherwise.
var
parameterTypeName
=
(
parameterTypeInfo
.
IsComplexType
,
parameterTypeInfo
.
IsArray
)
switch
{
(
true
,
true
)
=>
"[]"
,
(
true
,
false
)
=>
string
.
Empty
,
(
false
,
true
)
=>
parameterTypeInfo
.
Name
+
"[]"
,
(
false
,
false
)
=>
parameterTypeInfo
.
Name
(
true
,
true
)
=>
Extensions
.
ComplexArrayReceiverTypeName
,
// complex array type, e.g. "T[,]"
(
true
,
false
)
=>
Extensions
.
ComplexReceiverTypeName
,
// complex non-array type, e.g. "T"
(
false
,
true
)
=>
parameterTypeInfo
.
Name
+
Extensions
.
ArrayReceiverTypeNameSuffix
,
// simple array type, e.g. "int[][,]"
(
false
,
false
)
=>
parameterTypeInfo
.
Name
// simple non-array type, e.g. "int"
};
receiverTypeNameToMethodMap
.
Add
(
parameterTypeName
,
new
ExtensionMethodInfo
(
fullyQualifiedContainerName
,
child
.
Name
));
...
...
src/Workspaces/Core/Portable/FindSymbols/SyntaxTree/SyntaxTreeIndex.ExtensionMethodInfo.cs
浏览文件 @
39d23223
...
...
@@ -43,7 +43,7 @@ internal partial class SyntaxTreeIndex
/// </summary>
public
readonly
ImmutableDictionary
<
string
,
ImmutableArray
<
int
>>
ReceiverTypeNameToExtensionMethodMap
{
get
;
}
public
bool
ContainsExtensionMethod
=>
ReceiverTypeNameToExtensionMethodMap
.
Count
>
0
;
public
bool
ContainsExtensionMethod
=>
!
ReceiverTypeNameToExtensionMethodMap
.
IsEmpty
;
public
ExtensionMethodInfo
(
ImmutableDictionary
<
string
,
ImmutableArray
<
int
>>
receiverTypeNameToExtensionMethodMap
)
{
...
...
src/Workspaces/Core/Portable/FindSymbols/SyntaxTree/SyntaxTreeIndex_Create.cs
浏览文件 @
39d23223
...
...
@@ -314,7 +314,7 @@ internal sealed partial class SyntaxTreeIndex
// simply treat it as a complex method.
if
(
originalName
==
null
)
{
receiverTypeName
=
string
.
Empty
;
receiverTypeName
=
Extensions
.
ComplexReceiverTypeName
;
}
else
{
...
...
src/Workspaces/Core/Portable/LanguageServices/DeclaredSymbolFactoryService/AbstractDeclaredSymbolInfoFactoryService.cs
浏览文件 @
39d23223
...
...
@@ -36,13 +36,17 @@ internal abstract class AbstractDeclaredSymbolInfoFactoryService : IDeclaredSymb
// e.g. int[], int[][], int[,], etc. are all represented as int[] in the index.
protected
static
string
CreateReceiverTypeString
(
string
typeName
,
bool
isArray
)
{
if
(
typeName
==
null
)
if
(
string
.
IsNullOrEmpty
(
typeName
)
)
{
return
isArray
?
"[]"
:
string
.
Empty
;
return
isArray
?
FindSymbols
.
Extensions
.
ComplexArrayReceiverTypeName
:
FindSymbols
.
Extensions
.
ComplexReceiverTypeName
;
}
else
{
return
isArray
?
typeName
+
"[]"
:
typeName
;
return
isArray
?
typeName
+
FindSymbols
.
Extensions
.
ArrayReceiverTypeNameSuffix
:
typeName
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录