From fc51a0f8cfd524d5c6cbc83ba66c6b6b4034db3b Mon Sep 17 00:00:00 2001 From: CyrusNajmabadi Date: Sun, 24 Jul 2016 19:10:39 -0700 Subject: [PATCH] Inline field. --- src/EditorFeatures/Core/EditorFeatures.csproj | 1 - .../FindReferences/FindReferencesUtilities.cs | 26 ------------------- .../IDefinitionsAndReferencesFactory.cs | 21 ++++++++++++++- 3 files changed, 20 insertions(+), 28 deletions(-) delete mode 100644 src/EditorFeatures/Core/Implementation/FindReferences/FindReferencesUtilities.cs diff --git a/src/EditorFeatures/Core/EditorFeatures.csproj b/src/EditorFeatures/Core/EditorFeatures.csproj index ad1d1fb7528..8ac233d8109 100644 --- a/src/EditorFeatures/Core/EditorFeatures.csproj +++ b/src/EditorFeatures/Core/EditorFeatures.csproj @@ -274,7 +274,6 @@ - diff --git a/src/EditorFeatures/Core/Implementation/FindReferences/FindReferencesUtilities.cs b/src/EditorFeatures/Core/Implementation/FindReferences/FindReferencesUtilities.cs deleted file mode 100644 index b7c7e5fb5a9..00000000000 --- a/src/EditorFeatures/Core/Implementation/FindReferences/FindReferencesUtilities.cs +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -namespace Microsoft.CodeAnalysis.Editor.Implementation.FindReferences -{ - internal static class FindReferencesUtilities - { - public static readonly SymbolDisplayFormat DefinitionDisplayFormat = - new SymbolDisplayFormat( - typeQualificationStyle: SymbolDisplayTypeQualificationStyle.NameOnly, - genericsOptions: SymbolDisplayGenericsOptions.IncludeTypeParameters, - parameterOptions: SymbolDisplayParameterOptions.IncludeType, - propertyStyle: SymbolDisplayPropertyStyle.ShowReadWriteDescriptor, - delegateStyle: SymbolDisplayDelegateStyle.NameAndSignature, - kindOptions: SymbolDisplayKindOptions.IncludeMemberKeyword | SymbolDisplayKindOptions.IncludeNamespaceKeyword | SymbolDisplayKindOptions.IncludeTypeKeyword, - localOptions: SymbolDisplayLocalOptions.IncludeType, - memberOptions: - SymbolDisplayMemberOptions.IncludeContainingType | - SymbolDisplayMemberOptions.IncludeExplicitInterface | - SymbolDisplayMemberOptions.IncludeModifiers | - SymbolDisplayMemberOptions.IncludeParameters | - SymbolDisplayMemberOptions.IncludeType, - miscellaneousOptions: - SymbolDisplayMiscellaneousOptions.EscapeKeywordIdentifiers | - SymbolDisplayMiscellaneousOptions.UseSpecialTypes); - } -} \ No newline at end of file diff --git a/src/EditorFeatures/Core/Implementation/FindReferences/IDefinitionsAndReferencesFactory.cs b/src/EditorFeatures/Core/Implementation/FindReferences/IDefinitionsAndReferencesFactory.cs index 1cf064b915f..7678c3e46c5 100644 --- a/src/EditorFeatures/Core/Implementation/FindReferences/IDefinitionsAndReferencesFactory.cs +++ b/src/EditorFeatures/Core/Implementation/FindReferences/IDefinitionsAndReferencesFactory.cs @@ -121,7 +121,7 @@ private static int GetPrecedence(ReferencedSymbol referencedSymbol) return null; } - var displayParts = definition.ToDisplayParts(FindReferencesUtilities.DefinitionDisplayFormat).ToTaggedText(); + var displayParts = definition.ToDisplayParts(s_definitionDisplayFormat).ToTaggedText(); return new DefinitionItem( GlyphTags.GetTags(definition.GetGlyph()), @@ -216,5 +216,24 @@ private static ImmutableArray FilterDefinitionLocations(ISymbol defini references.Add(referenceItem); } } + + public static readonly SymbolDisplayFormat s_definitionDisplayFormat = + new SymbolDisplayFormat( + typeQualificationStyle: SymbolDisplayTypeQualificationStyle.NameOnly, + genericsOptions: SymbolDisplayGenericsOptions.IncludeTypeParameters, + parameterOptions: SymbolDisplayParameterOptions.IncludeType, + propertyStyle: SymbolDisplayPropertyStyle.ShowReadWriteDescriptor, + delegateStyle: SymbolDisplayDelegateStyle.NameAndSignature, + kindOptions: SymbolDisplayKindOptions.IncludeMemberKeyword | SymbolDisplayKindOptions.IncludeNamespaceKeyword | SymbolDisplayKindOptions.IncludeTypeKeyword, + localOptions: SymbolDisplayLocalOptions.IncludeType, + memberOptions: + SymbolDisplayMemberOptions.IncludeContainingType | + SymbolDisplayMemberOptions.IncludeExplicitInterface | + SymbolDisplayMemberOptions.IncludeModifiers | + SymbolDisplayMemberOptions.IncludeParameters | + SymbolDisplayMemberOptions.IncludeType, + miscellaneousOptions: + SymbolDisplayMiscellaneousOptions.EscapeKeywordIdentifiers | + SymbolDisplayMiscellaneousOptions.UseSpecialTypes); } } \ No newline at end of file -- GitLab