Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
7827464f
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,发现更多精彩内容 >>
提交
7827464f
编写于
7月 10, 2017
作者:
R
Ravi Chande
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Suggest names for aliases
上级
120df9af
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
33 addition
and
8 deletion
+33
-8
src/Features/CSharp/Portable/Completion/CompletionProviders/DeclarationNameCompletionProvider.DeclarationInfo.cs
...ders/DeclarationNameCompletionProvider.DeclarationInfo.cs
+13
-4
src/Features/CSharp/Portable/Completion/CompletionProviders/DeclarationNameCompletionProvider.cs
.../CompletionProviders/DeclarationNameCompletionProvider.cs
+20
-4
未找到文件。
src/Features/CSharp/Portable/Completion/CompletionProviders/DeclarationNameCompletionProvider.DeclarationInfo.cs
浏览文件 @
7827464f
...
...
@@ -24,17 +24,20 @@ internal struct NameDeclarationInfo
ImmutableArray
<
SymbolKind
>
possibleSymbolKinds
,
Accessibility
accessibility
,
DeclarationModifiers
declarationModifiers
,
ITypeSymbol
type
)
ITypeSymbol
type
,
IAliasSymbol
alias
)
{
PossibleSymbolKinds
=
possibleSymbolKinds
;
DeclaredAccessibility
=
accessibility
;
Modifiers
=
declarationModifiers
;
Type
=
type
;
Alias
=
alias
;
}
public
ImmutableArray
<
SymbolKind
>
PossibleSymbolKinds
{
get
;
}
public
DeclarationModifiers
Modifiers
{
get
;
}
public
ITypeSymbol
Type
{
get
;
}
public
IAliasSymbol
Alias
{
get
;
}
public
Accessibility
DeclaredAccessibility
{
get
;
}
internal
static
async
Task
<
NameDeclarationInfo
>
GetDeclarationInfo
(
Document
document
,
int
position
,
CancellationToken
cancellationToken
)
...
...
@@ -136,11 +139,15 @@ internal static async Task<NameDeclarationInfo> GetDeclarationInfo(Document docu
return
default
(
NameDeclarationInfo
);
}
var
alias
=
semanticModel
.
GetAliasInfo
(
typeSyntax
,
cancellationToken
);
var
type
=
semanticModel
.
GetTypeInfo
(
typeSyntax
,
cancellationToken
).
Type
;
return
new
NameDeclarationInfo
(
possibleDeclarationComputer
(
GetDeclarationModifiers
(
modifiers
.
Value
)),
GetAccessibility
(
modifiers
.
Value
),
GetDeclarationModifiers
(
modifiers
.
Value
),
semanticModel
.
GetTypeInfo
(
typeSyntax
,
cancellationToken
).
Type
);
type
,
alias
);
}
private
static
NameDeclarationInfo
IsLastTokenOfType
<
TSyntaxNode
>(
...
...
@@ -178,7 +185,8 @@ internal static async Task<NameDeclarationInfo> GetDeclarationInfo(Document docu
possibleDeclarationComputer
(
GetDeclarationModifiers
(
modifiers
.
Value
)),
GetAccessibility
(
modifiers
.
Value
),
GetDeclarationModifiers
(
modifiers
.
Value
),
semanticModel
.
GetTypeInfo
(
typeSyntax
,
cancellationToken
).
Type
);
semanticModel
.
GetTypeInfo
(
typeSyntax
,
cancellationToken
).
Type
,
semanticModel
.
GetAliasInfo
(
typeSyntax
,
cancellationToken
));
}
private
static
bool
IsFieldDeclaration
(
SyntaxToken
token
,
SemanticModel
semanticModel
,
...
...
@@ -224,7 +232,8 @@ internal static async Task<NameDeclarationInfo> GetDeclarationInfo(Document docu
ImmutableArray
.
Create
(
SymbolKind
.
TypeParameter
),
Accessibility
.
NotApplicable
,
new
DeclarationModifiers
(),
type
:
null
);
type
:
null
,
alias
:
null
);
return
true
;
}
...
...
src/Features/CSharp/Portable/Completion/CompletionProviders/DeclarationNameCompletionProvider.cs
浏览文件 @
7827464f
...
...
@@ -12,6 +12,7 @@
using
Microsoft.CodeAnalysis.Shared.Extensions
;
using
Microsoft.CodeAnalysis.Simplification
;
using
Microsoft.CodeAnalysis.Text
;
using
Roslyn.Utilities
;
using
static
Microsoft
.
CodeAnalysis
.
Diagnostics
.
Analyzers
.
NamingStyles
.
SymbolSpecification
;
namespace
Microsoft.CodeAnalysis.CSharp.Completion.Providers
...
...
@@ -37,14 +38,12 @@ public override async Task ProvideCompletionsAsync(CompletionContext completionC
}
var
nameInfo
=
await
NameDeclarationInfo
.
GetDeclarationInfo
(
document
,
position
,
cancellationToken
).
ConfigureAwait
(
false
);
if
(
!
IsValidType
(
nameInfo
.
Type
)
)
var
baseNames
=
GetBaseNames
(
semanticModel
,
nameInfo
);
if
(
baseNames
==
default
)
{
return
;
}
var
type
=
UnwrapType
(
nameInfo
.
Type
,
semanticModel
.
Compilation
);
var
baseNames
=
NameGenerator
.
GetBaseNames
(
type
);
var
recommendedNames
=
await
GetRecommendedNamesAsync
(
baseNames
,
nameInfo
,
context
,
document
,
cancellationToken
).
ConfigureAwait
(
false
);
int
sortValue
=
0
;
foreach
(
var
(
name
,
kind
)
in
recommendedNames
)
...
...
@@ -57,6 +56,23 @@ public override async Task ProvideCompletionsAsync(CompletionContext completionC
completionContext
.
SuggestionModeItem
=
CommonCompletionItem
.
Create
(
CSharpFeaturesResources
.
Name
,
CompletionItemRules
.
Default
);
}
private
ImmutableArray
<
IEnumerable
<
string
>>
GetBaseNames
(
SemanticModel
semanticModel
,
NameDeclarationInfo
nameInfo
)
{
if
(
nameInfo
.
Alias
!=
null
)
{
return
ImmutableArray
.
Create
(
SpecializedCollections
.
SingletonEnumerable
(
nameInfo
.
Alias
.
Name
));
}
if
(!
IsValidType
(
nameInfo
.
Type
))
{
return
default
;
}
var
type
=
UnwrapType
(
nameInfo
.
Type
,
semanticModel
.
Compilation
);
var
baseNames
=
NameGenerator
.
GetBaseNames
(
type
);
return
baseNames
;
}
private
bool
IsValidType
(
ITypeSymbol
type
)
{
if
(
type
==
null
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录