diff --git a/src/EditorFeatures/Core/Implementation/InlineRename/AbstractEditorInlineRenameService.FailureInlineRenameInfo.cs b/src/EditorFeatures/Core/Implementation/InlineRename/AbstractEditorInlineRenameService.FailureInlineRenameInfo.cs index a0cc38738f3f85946787d00b730db75677c5116d..ffd346a2a40c3ba9f6b690ce13320261850d7d2c 100644 --- a/src/EditorFeatures/Core/Implementation/InlineRename/AbstractEditorInlineRenameService.FailureInlineRenameInfo.cs +++ b/src/EditorFeatures/Core/Implementation/InlineRename/AbstractEditorInlineRenameService.FailureInlineRenameInfo.cs @@ -31,7 +31,7 @@ public FailureInlineRenameInfo(string localizedErrorMessage) public string FullDisplayName { get { return null; } } - public Glyph Glyph { get { return default(Glyph); } } + public Glyph Glyph => Glyph.None; public string GetFinalSymbolName(string replacementText) { return null; } diff --git a/src/EditorFeatures/Core/Implementation/IntelliSense/Completion/Presentation/CustomCommitCompletion.cs b/src/EditorFeatures/Core/Implementation/IntelliSense/Completion/Presentation/CustomCommitCompletion.cs index 68decdf25ea5c9b42cb9c2ebb22ec431a4ccdb42..c4c010cb55f84f10d24c8a00ef3f00c0639393d0 100644 --- a/src/EditorFeatures/Core/Implementation/IntelliSense/Completion/Presentation/CustomCommitCompletion.cs +++ b/src/EditorFeatures/Core/Implementation/IntelliSense/Completion/Presentation/CustomCommitCompletion.cs @@ -87,13 +87,7 @@ public string GetDescription_TestingOnly() return GetDescriptionAsync(CancellationToken.None).WaitAndGetResult(CancellationToken.None).Text; } - public override ImageMoniker IconMoniker - { - get - { - return _imageMoniker; - } - } + public override ImageMoniker IconMoniker => _imageMoniker; public override string IconAutomationText { diff --git a/src/EditorFeatures/Core/Shared/Extensions/GlyphExtensions.cs b/src/EditorFeatures/Core/Shared/Extensions/GlyphExtensions.cs index c4a6355a20bbf51764b63a501bd39063b6a0812c..ea957d6e33af8086d1262deeca6bb74ec2d525f6 100644 --- a/src/EditorFeatures/Core/Shared/Extensions/GlyphExtensions.cs +++ b/src/EditorFeatures/Core/Shared/Extensions/GlyphExtensions.cs @@ -220,6 +220,9 @@ public static ImageMoniker GetImageMoniker(this Glyph glyph) { switch (glyph) { + case Glyph.None: + return default(ImageMoniker); + case Glyph.Assembly: return KnownMonikers.Assembly; @@ -638,7 +641,7 @@ public static Glyph GetGlyph(this ImmutableArray tags) } } - return default(Glyph); + return Glyph.None; } private static Accessibility GetAccessibility(ImmutableArray tags) diff --git a/src/Features/Core/Portable/Common/Glyph.cs b/src/Features/Core/Portable/Common/Glyph.cs index 35681606c3432b370b78c2cdf51997ce3fa0dd91..5a770af2af710b2835f8a7d1cbd8f873f5b081d0 100644 --- a/src/Features/Core/Portable/Common/Glyph.cs +++ b/src/Features/Core/Portable/Common/Glyph.cs @@ -4,6 +4,8 @@ namespace Microsoft.CodeAnalysis { internal enum Glyph { + None, + Assembly, BasicFile,