Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
35c09ad7
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,发现更多精彩内容 >>
提交
35c09ad7
编写于
2月 12, 2016
作者:
C
CyrusNajmabadi
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #8657 from CyrusNajmabadi/moveGlyphBack
Moving the Glyph enum back to the 'Features' dll.
上级
037d1e8f
beaa2a63
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
30 addition
and
12 deletion
+30
-12
src/EditorFeatures/Core/Implementation/Suggestions/SuggestedAction.cs
...atures/Core/Implementation/Suggestions/SuggestedAction.cs
+3
-1
src/Features/Core/Portable/CodeFixes/AddImport/AbstractAddImportCodeFixProvider.cs
...e/CodeFixes/AddImport/AbstractAddImportCodeFixProvider.cs
+1
-1
src/Features/Core/Portable/Common/Glyph.cs
src/Features/Core/Portable/Common/Glyph.cs
+0
-0
src/Features/Core/Portable/Features.csproj
src/Features/Core/Portable/Features.csproj
+2
-0
src/Features/Core/Portable/Shared/Extensions/ProjectExtensions.cs
...ures/Core/Portable/Shared/Extensions/ProjectExtensions.cs
+19
-0
src/Workspaces/Core/Portable/CodeActions/CodeAction.cs
src/Workspaces/Core/Portable/CodeActions/CodeAction.cs
+5
-1
src/Workspaces/Core/Portable/Shared/Extensions/ProjectExtensions.cs
...aces/Core/Portable/Shared/Extensions/ProjectExtensions.cs
+0
-8
src/Workspaces/Core/Portable/Workspaces.csproj
src/Workspaces/Core/Portable/Workspaces.csproj
+0
-1
未找到文件。
src/EditorFeatures/Core/Implementation/Suggestions/SuggestedAction.cs
浏览文件 @
35c09ad7
...
...
@@ -259,7 +259,9 @@ void IDisposable.Dispose()
// same as display text
string
ISuggestedAction
.
IconAutomationText
=>
DisplayText
;
ImageMoniker
ISuggestedAction
.
IconMoniker
=>
CodeAction
.
Glyph
?.
GetImageMoniker
()
??
default
(
ImageMoniker
);
ImageMoniker
ISuggestedAction
.
IconMoniker
=>
CodeAction
.
Glyph
.
HasValue
?
((
Glyph
)
CodeAction
.
Glyph
.
Value
).
GetImageMoniker
()
:
default
(
ImageMoniker
);
string
ISuggestedAction
.
InputGestureText
{
...
...
src/Features/Core/Portable/CodeFixes/AddImport/AbstractAddImportCodeFixProvider.cs
浏览文件 @
35c09ad7
...
...
@@ -398,7 +398,7 @@ private class MyCodeAction : CodeAction.SolutionChangeAction
_glyph
=
glyph
;
}
internal
override
Glyph
?
Glyph
=>
_glyph
;
internal
override
int
?
Glyph
=>
_glyph
.
HasValue
?
(
int
)
_glyph
.
Value
:
(
int
?)
null
;
}
private
struct
SearchResult
<
T
>
where
T
:
ISymbol
...
...
src/
Workspaces/Core/Portable/Shared
/Glyph.cs
→
src/
Features/Core/Portable/Common
/Glyph.cs
浏览文件 @
35c09ad7
文件已移动
src/Features/Core/Portable/Features.csproj
浏览文件 @
35c09ad7
...
...
@@ -147,6 +147,7 @@
<Compile
Include=
"CodeRefactorings\PredefinedCodeRefactoringProviderNames.cs"
/>
<Compile
Include=
"CodeRefactorings\ServicesLayerCodeActionHelpersService.cs"
/>
<Compile
Include=
"CodeRefactorings\WorkspaceServices\IAddMetadataReferenceCodeActionOperationFactoryWorkspaceService.cs"
/>
<Compile
Include=
"Common\Glyph.cs"
/>
<Compile
Include=
"Completion\AbstractCompletionService.cs"
/>
<Compile
Include=
"Completion\CommonCompletionUtilities.cs"
/>
<Compile
Include=
"Completion\CompletionFilterReason.cs"
/>
...
...
@@ -253,6 +254,7 @@
<Compile
Include=
"RemoveUnnecessaryImports\AbstractRemoveUnnecessaryImportsService.cs"
/>
<Compile
Include=
"ReplaceMethodWithProperty\ReplaceMethodWithPropertyCodeRefactoringProvider.cs"
/>
<Compile
Include=
"ReplaceMethodWithProperty\IReplaceMethodWithPropertyService.cs"
/>
<Compile
Include=
"Shared\Extensions\ProjectExtensions.cs"
/>
<Compile
Include=
"Shared\Options\OrganizerOptionsProvider.cs"
/>
<Compile
Include=
"Shared\Options\RuntimeOptions.cs"
/>
<Compile
Include=
"Shared\Options\RuntimeOptionsProvider.cs"
/>
...
...
src/Features/Core/Portable/Shared/Extensions/ProjectExtensions.cs
0 → 100644
浏览文件 @
35c09ad7
using
System
;
using
System.Collections.Generic
;
using
System.Linq
;
using
System.Text
;
using
System.Threading.Tasks
;
namespace
Microsoft.CodeAnalysis.Shared.Extensions
{
internal
static
class
ProjectExtensions
{
public
static
Glyph
GetGlyph
(
this
Project
project
)
{
// TODO: Get the glyph from the hierarchy
return
project
.
Language
==
LanguageNames
.
CSharp
?
Glyph
.
CSharpProject
:
project
.
Language
==
LanguageNames
.
VisualBasic
?
Glyph
.
BasicProject
:
Glyph
.
Assembly
;
}
}
}
src/Workspaces/Core/Portable/CodeActions/CodeAction.cs
浏览文件 @
35c09ad7
...
...
@@ -47,7 +47,11 @@ public abstract class CodeAction
internal
virtual
bool
IsInvokable
=>
true
;
internal
virtual
Glyph
?
Glyph
=>
null
;
/// <summary>
/// Will map this int to the Glyph enum in 'Features'. Once a proper image abstration moves
/// to the workspace layer we can appropriately use that here instead of a raw int.
/// </summary>
internal
virtual
int
?
Glyph
=>
null
;
internal
virtual
ImmutableArray
<
CodeAction
>
GetCodeActions
()
{
...
...
src/Workspaces/Core/Portable/Shared/Extensions/ProjectExtensions.cs
浏览文件 @
35c09ad7
...
...
@@ -38,13 +38,5 @@ public static async Task<VersionStamp> GetVersionAsync(this Project project, Can
return
version
.
GetNewerVersion
(
latestVersion
);
}
public
static
Glyph
GetGlyph
(
this
Project
project
)
{
// TODO: Get the glyph from the hierarchy
return
project
.
Language
==
LanguageNames
.
CSharp
?
Glyph
.
CSharpProject
:
project
.
Language
==
LanguageNames
.
VisualBasic
?
Glyph
.
BasicProject
:
Glyph
.
Assembly
;
}
}
}
\ No newline at end of file
src/Workspaces/Core/Portable/Workspaces.csproj
浏览文件 @
35c09ad7
...
...
@@ -385,7 +385,6 @@
<Compile
Include=
"FindSymbols\FindReferences\Finders\ILanguageServiceReferenceFinder.cs"
/>
<Compile
Include=
"FindSymbols\SymbolTree\ISymbolTreeInfoCacheService.cs"
/>
<Compile
Include=
"FindSymbols\FindReferences\MetadataUnifyingEquivalenceComparer.cs"
/>
<Compile
Include=
"Shared\Glyph.cs"
/>
<Compile
Include=
"Utilities\ArraySlice.cs"
/>
<Compile
Include=
"Utilities\BKTree.cs"
/>
<Compile
Include=
"FindSymbols\SyntaxTree\AbstractSyntaxTreeInfo.cs"
/>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录