Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
a47ea905
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,发现更多精彩内容 >>
提交
a47ea905
编写于
5月 20, 2016
作者:
C
CyrusNajmabadi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Move methods.
上级
4b890cc4
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
44 addition
and
58 deletion
+44
-58
src/EditorFeatures/Core/EditorFeatures.csproj
src/EditorFeatures/Core/EditorFeatures.csproj
+1
-2
src/EditorFeatures/Core/Implementation/NavigateTo/NavigateToSearchResultProvider.cs
...plementation/NavigateTo/NavigateToSearchResultProvider.cs
+43
-1
src/EditorFeatures/Core/Implementation/NavigateTo/NavigateToSymbolFinder.cs
.../Core/Implementation/NavigateTo/NavigateToSymbolFinder.cs
+0
-55
未找到文件。
src/EditorFeatures/Core/EditorFeatures.csproj
浏览文件 @
a47ea905
...
...
@@ -556,7 +556,6 @@
<Compile
Include=
"Implementation\NavigateTo\NavigateToItemProvider.NavigateToItemDisplay.cs"
/>
<Compile
Include=
"Implementation\NavigateTo\NavigateToItemProvider.Searcher.cs"
/>
<Compile
Include=
"Implementation\NavigateTo\NavigateToItemProviderFactory.cs"
/>
<Compile
Include=
"Implementation\NavigateTo\NavigateToSymbolFinder.cs"
/>
<Compile
Include=
"Implementation\NavigationBar\NavigationBarController.cs"
/>
<Compile
Include=
"Implementation\NavigationBar\NavigationBarController_ModelComputation.cs"
/>
<Compile
Include=
"Implementation\NavigationBar\NavigationBarControllerFactoryService.cs"
/>
...
...
@@ -804,4 +803,4 @@
<ImportGroup
Label=
"Targets"
>
<Import
Project=
"..\..\..\build\Targets\VSL.Imports.targets"
/>
</ImportGroup>
</Project>
</Project>
\ No newline at end of file
src/EditorFeatures/Core/Implementation/NavigateTo/NavigateToSearchResultProvider.cs
浏览文件 @
a47ea905
...
...
@@ -7,6 +7,7 @@
using
System.Threading.Tasks
;
using
Microsoft.CodeAnalysis.Editor.Navigation
;
using
Microsoft.CodeAnalysis.FindSymbols
;
using
Microsoft.CodeAnalysis.Shared.Extensions
;
using
Microsoft.CodeAnalysis.Shared.Utilities
;
using
Microsoft.VisualStudio.Language.NavigateTo.Interfaces
;
using
Roslyn.Utilities
;
...
...
@@ -18,11 +19,52 @@ internal sealed partial class NavigateToSearchResultProvider : INavigateToSearch
{
public
async
Task
<
IEnumerable
<
INavigateToSearchResult
>>
SearchProjectAsync
(
Project
project
,
string
searchPattern
,
CancellationToken
cancellationToken
)
{
var
results
=
await
NavigateToSymbolFinder
.
FindNavigableDeclaredSymbolInfos
(
project
,
searchPattern
,
cancellationToken
).
ConfigureAwait
(
false
);
var
results
=
await
FindNavigableDeclaredSymbolInfos
(
project
,
searchPattern
,
cancellationToken
).
ConfigureAwait
(
false
);
var
containsDots
=
searchPattern
.
IndexOf
(
'.'
)
>=
0
;
return
results
.
Select
(
r
=>
ConvertResult
(
containsDots
,
r
));
}
private
static
async
Task
<
IEnumerable
<
ValueTuple
<
DeclaredSymbolInfo
,
Document
,
IEnumerable
<
PatternMatch
>>>>
FindNavigableDeclaredSymbolInfos
(
Project
project
,
string
pattern
,
CancellationToken
cancellationToken
)
{
var
patternMatcher
=
new
PatternMatcher
(
pattern
);
var
result
=
new
List
<
ValueTuple
<
DeclaredSymbolInfo
,
Document
,
IEnumerable
<
PatternMatch
>>>();
foreach
(
var
document
in
project
.
Documents
)
{
cancellationToken
.
ThrowIfCancellationRequested
();
var
declarationInfo
=
await
document
.
GetDeclarationInfoAsync
(
cancellationToken
).
ConfigureAwait
(
false
);
foreach
(
var
declaredSymbolInfo
in
declarationInfo
.
DeclaredSymbolInfos
)
{
cancellationToken
.
ThrowIfCancellationRequested
();
var
patternMatches
=
patternMatcher
.
GetMatches
(
GetSearchName
(
declaredSymbolInfo
),
declaredSymbolInfo
.
FullyQualifiedContainerName
,
includeMatchSpans
:
false
);
if
(
patternMatches
!=
null
)
{
result
.
Add
(
ValueTuple
.
Create
(
declaredSymbolInfo
,
document
,
patternMatches
));
}
}
}
return
result
;
}
private
static
string
GetSearchName
(
DeclaredSymbolInfo
declaredSymbolInfo
)
{
if
(
declaredSymbolInfo
.
Kind
==
DeclaredSymbolInfoKind
.
Indexer
&&
declaredSymbolInfo
.
Name
==
WellKnownMemberNames
.
Indexer
)
{
return
"this"
;
}
else
{
return
declaredSymbolInfo
.
Name
;
}
}
private
INavigateToSearchResult
ConvertResult
(
bool
containsDots
,
ValueTuple
<
DeclaredSymbolInfo
,
Document
,
IEnumerable
<
PatternMatch
>>
result
)
{
var
declaredSymbolInfo
=
result
.
Item1
;
...
...
src/EditorFeatures/Core/Implementation/NavigateTo/NavigateToSymbolFinder.cs
已删除
100644 → 0
浏览文件 @
4b890cc4
// 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.Collections.Generic
;
using
System.Threading
;
using
System.Threading.Tasks
;
using
Microsoft.CodeAnalysis.FindSymbols
;
using
Microsoft.CodeAnalysis.Shared.Extensions
;
using
Microsoft.CodeAnalysis.Shared.Utilities
;
using
Roslyn.Utilities
;
namespace
Microsoft.CodeAnalysis.Editor.Implementation.NavigateTo
{
internal
static
class
NavigateToSymbolFinder
{
internal
static
async
Task
<
IEnumerable
<
ValueTuple
<
DeclaredSymbolInfo
,
Document
,
IEnumerable
<
PatternMatch
>>>>
FindNavigableDeclaredSymbolInfos
(
Project
project
,
string
pattern
,
CancellationToken
cancellationToken
)
{
var
patternMatcher
=
new
PatternMatcher
(
pattern
);
var
result
=
new
List
<
ValueTuple
<
DeclaredSymbolInfo
,
Document
,
IEnumerable
<
PatternMatch
>>>();
foreach
(
var
document
in
project
.
Documents
)
{
cancellationToken
.
ThrowIfCancellationRequested
();
var
declarationInfo
=
await
document
.
GetDeclarationInfoAsync
(
cancellationToken
).
ConfigureAwait
(
false
);
foreach
(
var
declaredSymbolInfo
in
declarationInfo
.
DeclaredSymbolInfos
)
{
cancellationToken
.
ThrowIfCancellationRequested
();
var
patternMatches
=
patternMatcher
.
GetMatches
(
GetSearchName
(
declaredSymbolInfo
),
declaredSymbolInfo
.
FullyQualifiedContainerName
,
includeMatchSpans
:
false
);
if
(
patternMatches
!=
null
)
{
result
.
Add
(
ValueTuple
.
Create
(
declaredSymbolInfo
,
document
,
patternMatches
));
}
}
}
return
result
;
}
private
static
string
GetSearchName
(
DeclaredSymbolInfo
declaredSymbolInfo
)
{
if
(
declaredSymbolInfo
.
Kind
==
DeclaredSymbolInfoKind
.
Indexer
&&
declaredSymbolInfo
.
Name
==
WellKnownMemberNames
.
Indexer
)
{
return
"this"
;
}
else
{
return
declaredSymbolInfo
.
Name
;
}
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录