Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
17a9a685
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,发现更多精彩内容 >>
提交
17a9a685
编写于
5月 24, 2019
作者:
D
David Barbet
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Rename filter to descendInto to better convey its meaning.
上级
64be2a31
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
12 addition
and
13 deletion
+12
-13
src/Features/CSharp/Portable/Completion/CompletionProviders/DeclarationNameCompletionProvider.cs
.../CompletionProviders/DeclarationNameCompletionProvider.cs
+1
-2
src/Workspaces/CSharp/Portable/LanguageServices/CSharpSemanticFactsService.cs
...p/Portable/LanguageServices/CSharpSemanticFactsService.cs
+5
-5
src/Workspaces/Core/Portable/Shared/Extensions/SemanticModelExtensions.cs
...ore/Portable/Shared/Extensions/SemanticModelExtensions.cs
+6
-6
未找到文件。
src/Features/CSharp/Portable/Completion/CompletionProviders/DeclarationNameCompletionProvider.cs
浏览文件 @
17a9a685
...
...
@@ -221,7 +221,6 @@ private Glyph GetGlyph(SymbolKind kind, Accessibility? declaredAccessibility)
var
rules
=
await
document
.
GetNamingRulesAsync
(
FallbackNamingRules
.
CompletionOfferingRules
,
cancellationToken
).
ConfigureAwait
(
false
);
var
result
=
new
Dictionary
<
string
,
SymbolKind
>();
var
semanticFactsService
=
context
.
GetLanguageService
<
ISemanticFactsService
>();
var
syntaxFactsService
=
context
.
GetLanguageService
<
ISyntaxFactsService
>();
foreach
(
var
kind
in
declarationInfo
.
PossibleSymbolKinds
)
{
...
...
@@ -245,7 +244,7 @@ private Glyph GetGlyph(SymbolKind kind, Accessibility? declaredAccessibility)
var
targetToken
=
context
.
TargetToken
;
var
uniqueName
=
semanticFactsService
.
GenerateUniqueName
(
context
.
SemanticModel
,
t
argetToken
.
Parent
,
context
.
T
argetToken
.
Parent
,
containerOpt
:
null
,
baseName
:
name
,
filter
:
IsRelevantSymbolKind
,
...
...
src/Workspaces/CSharp/Portable/LanguageServices/CSharpSemanticFactsService.cs
浏览文件 @
17a9a685
...
...
@@ -33,12 +33,12 @@ protected override IEnumerable<ISymbol> GetUsedSymbols(SemanticModel semanticMod
// Some symbols in the enclosing block could cause conflicts even if they are not available at the location.
// E.g. symbols inside if statements / try catch statements.
// Walk through the enclosing block to find them, but
make sure to exclude
local functions because
// a) Visible local function symbols would be returned from LookupSymbols
(e.g. location is inside a local function).
//
b) Local function symbols are only in scope inside the local function
.
//
Relevant ones (e.g. method name) would be returned by a)
.
// Walk through the enclosing block to find them, but
avoid exploring
local functions because
// a) Visible local function symbols would be returned from LookupSymbols
//
(e.g. location is inside a local function or the local function method name)
.
//
b) Local function symbols are not affected by outer variables and do not contribute to the outer scope
.
var
symbolsInBlock
=
semanticModel
.
GetExistingSymbols
(
container
,
cancellationToken
,
filter
:
(
SyntaxNode
n
)
=>
!
n
.
IsKind
(
SyntaxKind
.
LocalFunctionStatement
));
descendInto
:
n
=>
!
n
.
IsKind
(
SyntaxKind
.
LocalFunctionStatement
));
return
symbolsInBlock
.
Concat
(
visibleSymbols
);
}
...
...
src/Workspaces/Core/Portable/Shared/Extensions/SemanticModelExtensions.cs
浏览文件 @
17a9a685
...
...
@@ -234,17 +234,17 @@ public static SemanticModel GetOriginalSemanticModel(this SemanticModel semantic
}
public
static
IEnumerable
<
ISymbol
>
GetExistingSymbols
(
this
SemanticModel
semanticModel
,
SyntaxNode
container
,
CancellationToken
cancellationToken
,
Func
<
SyntaxNode
,
bool
>
filter
=
null
)
this
SemanticModel
semanticModel
,
SyntaxNode
container
,
CancellationToken
cancellationToken
,
Func
<
SyntaxNode
,
bool
>
descendInto
=
null
)
{
// Ignore an anonymous type property or tuple field. It's ok if they have a name that
// matches the name of the local we're introducing.
return
semanticModel
.
GetAllDeclaredSymbols
(
container
,
cancellationToken
,
filter
)
return
semanticModel
.
GetAllDeclaredSymbols
(
container
,
cancellationToken
,
descendInto
)
.
Where
(
s
=>
!
s
.
IsAnonymousTypeProperty
()
&&
!
s
.
IsTupleField
());
}
private
static
void
GetAllDeclaredSymbols
(
SemanticModel
semanticModel
,
SyntaxNode
node
,
HashSet
<
ISymbol
>
symbols
,
CancellationToken
cancellationToken
,
Func
<
SyntaxNode
,
bool
>
filter
=
null
)
HashSet
<
ISymbol
>
symbols
,
CancellationToken
cancellationToken
,
Func
<
SyntaxNode
,
bool
>
descendInto
=
null
)
{
var
symbol
=
semanticModel
.
GetDeclaredSymbol
(
node
,
cancellationToken
);
...
...
@@ -258,14 +258,14 @@ public static SemanticModel GetOriginalSemanticModel(this SemanticModel semantic
if
(
child
.
IsNode
)
{
var
childNode
=
child
.
AsNode
();
if
(
ApplyFilter
(
childNode
,
filter
))
if
(
ShouldDescendInto
(
childNode
,
descendInto
))
{
GetAllDeclaredSymbols
(
semanticModel
,
child
.
AsNode
(),
symbols
,
cancellationToken
,
filter
);
GetAllDeclaredSymbols
(
semanticModel
,
child
.
AsNode
(),
symbols
,
cancellationToken
,
descendInto
);
}
}
}
static
bool
ApplyFilter
(
SyntaxNode
node
,
Func
<
SyntaxNode
,
bool
>
filter
)
static
bool
ShouldDescendInto
(
SyntaxNode
node
,
Func
<
SyntaxNode
,
bool
>
filter
)
=>
filter
!=
null
?
filter
(
node
)
:
true
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录