Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
63201e71
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,发现更多精彩内容 >>
提交
63201e71
编写于
9月 21, 2015
作者:
J
Jason Malinowski
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Deduplicate code to generate the symbol display string for navigation
上级
54b06504
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
25 addition
and
29 deletion
+25
-29
src/EditorFeatures/Core/Extensibility/Navigation/NavigableItemFactory.DeclaredSymbolNavigableItem.cs
...ation/NavigableItemFactory.DeclaredSymbolNavigableItem.cs
+1
-14
src/EditorFeatures/Core/Extensibility/Navigation/NavigableItemFactory.SymbolLocationNavigableItem.cs
...ation/NavigableItemFactory.SymbolLocationNavigableItem.cs
+1
-15
src/EditorFeatures/Core/Extensibility/Navigation/NavigableItemFactory.cs
...res/Core/Extensibility/Navigation/NavigableItemFactory.cs
+21
-0
src/EditorFeatures/Test/TestExportProvider.cs
src/EditorFeatures/Test/TestExportProvider.cs
+2
-0
未找到文件。
src/EditorFeatures/Core/Extensibility/Navigation/NavigableItemFactory.DeclaredSymbolNavigableItem.cs
浏览文件 @
63201e71
...
...
@@ -44,20 +44,7 @@ public DeclaredSymbolNavigableItem(Document document, DeclaredSymbolInfo declare
return
null
;
}
var
symbolDisplayService
=
Document
.
GetLanguageService
<
ISymbolDisplayService
>();
switch
(
Symbol
.
Kind
)
{
case
SymbolKind
.
NamedType
:
return
symbolDisplayService
.
ToDisplayString
(
Symbol
,
s_shortFormatWithModifiers
);
case
SymbolKind
.
Method
:
return
Symbol
.
IsStaticConstructor
()
?
symbolDisplayService
.
ToDisplayString
(
Symbol
,
s_shortFormatWithModifiers
)
:
symbolDisplayService
.
ToDisplayString
(
Symbol
,
s_shortFormat
);
default
:
return
symbolDisplayService
.
ToDisplayString
(
Symbol
,
s_shortFormat
);
}
return
GetSymbolDisplayString
(
Document
.
Project
,
Symbol
);
}
catch
(
Exception
e
)
when
(
FatalError
.
Report
(
e
))
{
...
...
src/EditorFeatures/Core/Extensibility/Navigation/NavigableItemFactory.SymbolLocationNavigableItem.cs
浏览文件 @
63201e71
...
...
@@ -28,21 +28,7 @@ private class SymbolLocationNavigableItem : INavigableItem
_lazyDisplayName
=
new
Lazy
<
string
>(()
=>
{
var
symbolDisplayService
=
this
.
Document
.
Project
.
LanguageServices
.
GetService
<
ISymbolDisplayService
>();
switch
(
symbol
.
Kind
)
{
case
SymbolKind
.
NamedType
:
return
symbolDisplayService
.
ToDisplayString
(
_symbol
,
s_shortFormatWithModifiers
);
case
SymbolKind
.
Method
:
return
_symbol
.
IsStaticConstructor
()
?
symbolDisplayService
.
ToDisplayString
(
_symbol
,
s_shortFormatWithModifiers
)
:
symbolDisplayService
.
ToDisplayString
(
_symbol
,
s_shortFormat
);
default
:
return
symbolDisplayService
.
ToDisplayString
(
_symbol
,
s_shortFormat
);
}
return
GetSymbolDisplayString
(
Document
.
Project
,
_symbol
);
});
}
...
...
src/EditorFeatures/Core/Extensibility/Navigation/NavigableItemFactory.cs
浏览文件 @
63201e71
...
...
@@ -2,8 +2,10 @@
using
System.Collections.Generic
;
using
System.Linq
;
using
System.Threading
;
using
Microsoft.CodeAnalysis.FindSymbols
;
using
Microsoft.CodeAnalysis.GeneratedCodeRecognition
;
using
Microsoft.CodeAnalysis.LanguageServices
;
using
Microsoft.CodeAnalysis.Shared.Extensions
;
using
Roslyn.Utilities
;
...
...
@@ -21,6 +23,7 @@ public static INavigableItem GetItemFromDeclaredSymbolInfo(DeclaredSymbolInfo de
return
new
DeclaredSymbolNavigableItem
(
document
,
declaredSymbolInfo
);
}
public
static
IEnumerable
<
INavigableItem
>
GetItemsFromPreferredSourceLocations
(
Solution
solution
,
ISymbol
symbol
)
{
var
locations
=
GetPreferredSourceLocations
(
solution
,
symbol
);
...
...
@@ -57,6 +60,24 @@ private static IEnumerable<Location> GetPreferredSourceLocations(ISymbol symbol)
:
locations
.
Where
(
loc
=>
loc
.
IsInSource
);
}
public
static
string
GetSymbolDisplayString
(
Project
project
,
ISymbol
symbol
)
{
var
symbolDisplayService
=
project
.
LanguageServices
.
GetRequiredService
<
ISymbolDisplayService
>();
switch
(
symbol
.
Kind
)
{
case
SymbolKind
.
NamedType
:
return
symbolDisplayService
.
ToDisplayString
(
symbol
,
s_shortFormatWithModifiers
);
case
SymbolKind
.
Method
:
return
symbol
.
IsStaticConstructor
()
?
symbolDisplayService
.
ToDisplayString
(
symbol
,
s_shortFormatWithModifiers
)
:
symbolDisplayService
.
ToDisplayString
(
symbol
,
s_shortFormat
);
default
:
return
symbolDisplayService
.
ToDisplayString
(
symbol
,
s_shortFormat
);
}
}
private
static
readonly
SymbolDisplayFormat
s_shortFormat
=
new
SymbolDisplayFormat
(
globalNamespaceStyle
:
SymbolDisplayGlobalNamespaceStyle
.
OmittedAsContaining
,
...
...
src/EditorFeatures/Test/TestExportProvider.cs
浏览文件 @
63201e71
...
...
@@ -96,6 +96,8 @@ private static Type[] GetNeutralAndCSharpAndVisualBasicTypes()
typeof
(
Microsoft
.
CodeAnalysis
.
VisualBasic
.
VisualBasicSyntaxFactsService
),
typeof
(
CodeAnalysis
.
CSharp
.
CSharpSymbolDeclarationService
),
typeof
(
CodeAnalysis
.
VisualBasic
.
VisualBasicSymbolDeclarationService
),
typeof
(
CodeAnalysis
.
Editor
.
CSharp
.
LanguageServices
.
CSharpSymbolDisplayServiceFactory
),
typeof
(
CodeAnalysis
.
Editor
.
VisualBasic
.
LanguageServices
.
VisualBasicSymbolDisplayServiceFactory
),
typeof
(
CodeAnalysis
.
CSharp
.
Simplification
.
CSharpSimplificationService
),
typeof
(
CodeAnalysis
.
VisualBasic
.
Simplification
.
VisualBasicSimplificationService
),
typeof
(
CodeAnalysis
.
CSharp
.
Rename
.
CSharpRenameConflictLanguageService
),
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录