Skip to content
This repository was archived by the owner on Oct 16, 2020. It is now read-only.

Commit c3c6584

Browse files
only use fully qualified names for type and member definitions
1 parent 928aa02 commit c3c6584

3 files changed

Lines changed: 11 additions & 4 deletions

File tree

src/Libraries/NRefactory/ICSharpCode.NRefactory.CSharp/OutputVisitor/CSharpAmbience.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ void WriteTypeDeclarationName(ITypeDefinition typeDef, TokenWriter writer, CShar
167167
if (typeDef.DeclaringTypeDefinition != null) {
168168
WriteTypeDeclarationName(typeDef.DeclaringTypeDefinition, writer, formattingPolicy);
169169
writer.WriteToken(Roles.Dot, ".");
170-
} else if ((ConversionFlags & ConversionFlags.UseFullyQualifiedTypeNames) == ConversionFlags.UseFullyQualifiedTypeNames) {
170+
} else if ((ConversionFlags & ConversionFlags.UseFullyQualifiedMemberNames) == ConversionFlags.UseFullyQualifiedMemberNames) {
171171
WriteQualifiedName(typeDef.Namespace, writer, formattingPolicy);
172172
writer.WriteToken(Roles.Dot, ".");
173173
}
@@ -265,13 +265,15 @@ public string ConvertType(IType type)
265265
throw new ArgumentNullException("type");
266266

267267
TypeSystemAstBuilder astBuilder = CreateAstBuilder();
268+
astBuilder.AlwaysUseShortTypeNames = (ConversionFlags & ConversionFlags.UseFullyQualifiedMemberNames) != ConversionFlags.UseFullyQualifiedMemberNames;
268269
AstType astType = astBuilder.ConvertType(type);
269270
return astType.ToString();
270271
}
271272

272273
public void ConvertType(IType type, TokenWriter writer, CSharpFormattingOptions formattingPolicy)
273274
{
274275
TypeSystemAstBuilder astBuilder = CreateAstBuilder();
276+
astBuilder.AlwaysUseShortTypeNames = (ConversionFlags & ConversionFlags.UseFullyQualifiedMemberNames) != ConversionFlags.UseFullyQualifiedMemberNames;
275277
AstType astType = astBuilder.ConvertType(type);
276278
astType.AcceptVisitor(new CSharpOutputVisitor(writer, formattingPolicy));
277279
}

src/Libraries/NRefactory/ICSharpCode.NRefactory/TypeSystem/IAmbience.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,11 @@ public enum ConversionFlags
7070
/// </summary>
7171
ShowBody = 0x200,
7272

73+
/// <summary>
74+
/// Use fully qualified names for members.
75+
/// </summary>
76+
UseFullyQualifiedMemberNames = 0x400,
77+
7378
StandardConversionFlags = ShowParameterNames |
7479
ShowAccessibility |
7580
ShowParameterList |
@@ -79,7 +84,7 @@ public enum ConversionFlags
7984
ShowDefinitionKeyword |
8085
ShowBody,
8186

82-
All = 0x3ff,
87+
All = 0x7ff,
8388
}
8489

8590
public interface IAmbience

src/Main/Base/Project/Editor/XmlDocFormatter.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public static class XmlDocFormatter
1616
public static FlowDocument CreateTooltip(IType type)
1717
{
1818
var ambience = AmbienceService.GetCurrentAmbience();
19-
ambience.ConversionFlags = ConversionFlags.StandardConversionFlags | ConversionFlags.ShowDeclaringType | ConversionFlags.UseFullyQualifiedTypeNames;
19+
ambience.ConversionFlags = ConversionFlags.StandardConversionFlags | ConversionFlags.ShowDeclaringType | ConversionFlags.UseFullyQualifiedMemberNames;
2020
string header;
2121
if (type is ITypeDefinition)
2222
header = ambience.ConvertEntity((ITypeDefinition)type);
@@ -42,7 +42,7 @@ public static FlowDocument CreateTooltip(IType type)
4242
public static FlowDocument CreateTooltip(IEntity entity)
4343
{
4444
var ambience = AmbienceService.GetCurrentAmbience();
45-
ambience.ConversionFlags = ConversionFlags.StandardConversionFlags | ConversionFlags.ShowDeclaringType | ConversionFlags.UseFullyQualifiedTypeNames;
45+
ambience.ConversionFlags = ConversionFlags.StandardConversionFlags | ConversionFlags.ShowDeclaringType | ConversionFlags.UseFullyQualifiedMemberNames;
4646
string header = ambience.ConvertEntity(entity);
4747
var documentation = XmlDocumentationElement.Get(entity);
4848

0 commit comments

Comments
 (0)