Skip to content

Commit 5283488

Browse files
Andrei15193Andrei15193
committed
Removed declaring type from declaration node simple name
1 parent f332d04 commit 5283488

2 files changed

Lines changed: 19 additions & 84 deletions

File tree

‎CodeMap.Tests/Html/DeclarationNodeExtensions_GetSimpleNameReferenceTests.cs‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ public void GettingSimpleNameReferenceForConstantDeclarationReturnsDeclaringType
134134

135135
var simpleNameReference = constantDeclaration.GetSimpleNameReference();
136136

137-
Assert.Equal("TestClass<TParam>.ClassShadowedTestConstant", simpleNameReference);
137+
Assert.Equal("ClassShadowedTestConstant", simpleNameReference);
138138
}
139139

140140
[Fact]
@@ -152,7 +152,7 @@ public void GettingSimpleNameReferenceForFieldDeclarationReturnsDeclaringTypeNam
152152

153153
var simpleNameReference = fieldDeclaration.GetSimpleNameReference();
154154

155-
Assert.Equal("TestClass<TParam>.StaticTestField", simpleNameReference);
155+
Assert.Equal("StaticTestField", simpleNameReference);
156156
}
157157

158158
[Fact]
@@ -170,7 +170,7 @@ public void GettingSimpleNameReferenceForConstructorDeclarationReturnsDeclaringT
170170

171171
var simpleNameReference = constructorDeclaration.GetSimpleNameReference();
172172

173-
Assert.Equal("TestClass<TParam>.TestClass(int)", simpleNameReference);
173+
Assert.Equal("TestClass(int)", simpleNameReference);
174174
}
175175

176176
[Fact]
@@ -188,7 +188,7 @@ public void GettingSimpleNameReferenceForEventDeclarationReturnsDeclaringTypeNam
188188

189189
var simpleNameReference = eventDeclaration.GetSimpleNameReference();
190190

191-
Assert.Equal("TestClass<TParam>.AbstractTestEvent", simpleNameReference);
191+
Assert.Equal("AbstractTestEvent", simpleNameReference);
192192
}
193193

194194
[Fact]
@@ -206,7 +206,7 @@ public void GettingSimpleNameReferenceForPropertyDeclarationReturnsDeclaringType
206206

207207
var simpleNameReference = propertyDeclaration.GetSimpleNameReference();
208208

209-
Assert.Equal("TestClass<TParam>.InterfaceShadowedTestProperty", simpleNameReference);
209+
Assert.Equal("InterfaceShadowedTestProperty", simpleNameReference);
210210
}
211211

212212
[Fact]
@@ -224,7 +224,7 @@ public void GettingSimpleNameReferenceForIndexPropertyDeclarationReturnsDeclarin
224224

225225
var simpleNameReference = propertyDeclaration.GetSimpleNameReference();
226226

227-
Assert.Equal("TestClass<TParam>.Item[int]", simpleNameReference);
227+
Assert.Equal("Item[int]", simpleNameReference);
228228
}
229229

230230
[Fact]
@@ -242,7 +242,7 @@ public void GettingSimpleNameReferenceForMethodDeclarationReturnsDeclaringTypeNa
242242

243243
var simpleNameReference = methodDeclaration.GetSimpleNameReference();
244244

245-
Assert.Equal("TestClass<TParam>.TestMethod(int, string)", simpleNameReference);
245+
Assert.Equal("TestMethod(int, string)", simpleNameReference);
246246
}
247247

248248
[Fact]
@@ -260,7 +260,7 @@ public void GettingSimpleNameReferenceForGenericMethodDeclarationReturnsDeclarin
260260

261261
var simpleNameReference = methodDeclaration.GetSimpleNameReference();
262262

263-
Assert.Equal("TestClass<TParam>.TestMethod38<TMethodParam>(TMethodParam)", simpleNameReference);
263+
Assert.Equal("TestMethod38<TMethodParam>(TMethodParam)", simpleNameReference);
264264
}
265265

266266
[Fact]
@@ -278,7 +278,7 @@ public void GettingSimpleNameReferenceForNestedEnumReturnsDeclaringTypeNameAndOw
278278

279279
var simpleNameReference = typeDeclaration.GetSimpleNameReference();
280280

281-
Assert.Equal("TestClass<TParam>.NestedTestEnum", simpleNameReference);
281+
Assert.Equal("NestedTestEnum", simpleNameReference);
282282
}
283283

284284
[Fact]
@@ -296,7 +296,7 @@ public void GettingSimpleNameReferenceForNestedDelegateReturnsDeclaringTypeNameO
296296

297297
var simpleNameReference = typeDeclaration.GetSimpleNameReference();
298298

299-
Assert.Equal("TestClass<TParam>.NestedTestDelegate()", simpleNameReference);
299+
Assert.Equal("NestedTestDelegate()", simpleNameReference);
300300
}
301301

302302
[Fact]
@@ -314,7 +314,7 @@ public void GettingSimpleNameReferenceForNestedInterfaceReturnsDeclaringTypeName
314314

315315
var simpleNameReference = typeDeclaration.GetSimpleNameReference();
316316

317-
Assert.Equal("TestClass<TParam>.INestedTestInterface", simpleNameReference);
317+
Assert.Equal("INestedTestInterface", simpleNameReference);
318318
}
319319

320320
[Fact]
@@ -332,7 +332,7 @@ public void GettingSimpleNameReferenceForNestedInterfaceReturnsDeclaringTypeName
332332

333333
var simpleNameReference = typeDeclaration.GetSimpleNameReference();
334334

335-
Assert.Equal("TestClass<TParam>.NestedTestClass<TParam2, TParam3>", simpleNameReference);
335+
Assert.Equal("NestedTestClass<TParam2, TParam3>", simpleNameReference);
336336
}
337337

338338
[Fact]
@@ -350,7 +350,7 @@ public void GettingSimpleNameReferenceForNestedRecordReturnsDeclaringTypeNameAnd
350350

351351
var simpleNameReference = typeDeclaration.GetSimpleNameReference();
352352

353-
Assert.Equal("TestClass<TParam>.NestedTestRecord", simpleNameReference);
353+
Assert.Equal("NestedTestRecord", simpleNameReference);
354354
}
355355

356356
[Fact]
@@ -368,7 +368,7 @@ public void GettingSimpleNameReferenceForNestedStructReturnsDeclaringTypeNameAnd
368368

369369
var simpleNameReference = typeDeclaration.GetSimpleNameReference();
370370

371-
Assert.Equal("TestClass<TParam>.NestedTestStruct", simpleNameReference);
371+
Assert.Equal("NestedTestStruct", simpleNameReference);
372372
}
373373
}
374374
}

‎CodeMap/Html/SimpleNameDeclarationNodeVisitor.cs‎

Lines changed: 5 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
using System.Data;
21
using System.Linq;
32
using System.Text;
43
using CodeMap.DeclarationNodes;
@@ -10,9 +9,7 @@ internal class SimpleNameDeclarationNodeVisitor : DeclarationNodeVisitor
109
public StringBuilder StringBuilder { get; } = new StringBuilder();
1110

1211
protected internal override void VisitAssembly(AssemblyDeclaration assembly)
13-
{
14-
StringBuilder.Append(assembly.Name);
15-
}
12+
=> StringBuilder.Append(assembly.Name);
1613

1714
protected internal override void VisitNamespace(NamespaceDeclaration @namespace)
1815
{
@@ -22,12 +19,6 @@ protected internal override void VisitNamespace(NamespaceDeclaration @namespace)
2219

2320
protected internal override void VisitInterface(InterfaceDeclaration @interface)
2421
{
25-
if (@interface.DeclaringType is object)
26-
{
27-
@interface.DeclaringType.Accept(this);
28-
StringBuilder.Append('.');
29-
}
30-
3122
StringBuilder.Append(@interface.Name);
3223

3324
if (@interface.GenericParameters.Any())
@@ -48,12 +39,6 @@ protected internal override void VisitInterface(InterfaceDeclaration @interface)
4839

4940
protected internal override void VisitClass(ClassDeclaration @class)
5041
{
51-
if (@class.DeclaringType is object)
52-
{
53-
@class.DeclaringType.Accept(this);
54-
StringBuilder.Append('.');
55-
}
56-
5742
StringBuilder.Append(@class.Name);
5843
if (@class.GenericParameters.Any())
5944
{
@@ -73,12 +58,6 @@ protected internal override void VisitClass(ClassDeclaration @class)
7358

7459
protected internal override void VisitRecord(RecordDeclaration record)
7560
{
76-
if (record.DeclaringType is object)
77-
{
78-
record.DeclaringType.Accept(this);
79-
StringBuilder.Append('.');
80-
}
81-
8261
StringBuilder.Append(record.Name);
8362
if (record.GenericParameters.Any())
8463
{
@@ -98,12 +77,6 @@ protected internal override void VisitRecord(RecordDeclaration record)
9877

9978
protected internal override void VisitStruct(StructDeclaration @struct)
10079
{
101-
if (@struct.DeclaringType is object)
102-
{
103-
@struct.DeclaringType.Accept(this);
104-
StringBuilder.Append('.');
105-
}
106-
10780
StringBuilder.Append(@struct.Name);
10881
if (@struct.GenericParameters.Any())
10982
{
@@ -123,12 +96,6 @@ protected internal override void VisitStruct(StructDeclaration @struct)
12396

12497
protected internal override void VisitDelegate(DelegateDeclaration @delegate)
12598
{
126-
if (@delegate.DeclaringType is object)
127-
{
128-
@delegate.DeclaringType.Accept(this);
129-
StringBuilder.Append('.');
130-
}
131-
13299
StringBuilder.Append(@delegate.Name);
133100
if (@delegate.GenericParameters.Any())
134101
{
@@ -161,37 +128,16 @@ protected internal override void VisitDelegate(DelegateDeclaration @delegate)
161128
}
162129

163130
protected internal override void VisitEnum(EnumDeclaration @enum)
164-
{
165-
if (@enum.DeclaringType is object)
166-
{
167-
@enum.DeclaringType.Accept(this);
168-
StringBuilder.Append('.');
169-
}
170-
171-
StringBuilder.Append(@enum.Name);
172-
}
131+
=> StringBuilder.Append(@enum.Name);
173132

174133
protected internal override void VisitConstant(ConstantDeclaration constant)
175-
{
176-
constant.DeclaringType.Accept(this);
177-
StringBuilder.Append('.');
178-
179-
StringBuilder.Append(constant.Name);
180-
}
134+
=> StringBuilder.Append(constant.Name);
181135

182136
protected internal override void VisitField(FieldDeclaration field)
183-
{
184-
field.DeclaringType.Accept(this);
185-
StringBuilder.Append('.');
186-
187-
StringBuilder.Append(field.Name);
188-
}
137+
=> StringBuilder.Append(field.Name);
189138

190139
protected internal override void VisitConstructor(ConstructorDeclaration constructor)
191140
{
192-
constructor.DeclaringType.Accept(this);
193-
StringBuilder.Append('.');
194-
195141
StringBuilder.Append(constructor.Name);
196142
StringBuilder.Append('(');
197143
var isFirst = true;
@@ -207,18 +153,10 @@ protected internal override void VisitConstructor(ConstructorDeclaration constru
207153
}
208154

209155
protected internal override void VisitEvent(EventDeclaration @event)
210-
{
211-
@event.DeclaringType.Accept(this);
212-
StringBuilder.Append('.');
213-
214-
StringBuilder.Append(@event.Name);
215-
}
156+
=> StringBuilder.Append(@event.Name);
216157

217158
protected internal override void VisitProperty(PropertyDeclaration property)
218159
{
219-
property.DeclaringType.Accept(this);
220-
StringBuilder.Append('.');
221-
222160
StringBuilder.Append(property.Name);
223161
if (property.Parameters.Any())
224162
{
@@ -238,9 +176,6 @@ protected internal override void VisitProperty(PropertyDeclaration property)
238176

239177
protected internal override void VisitMethod(MethodDeclaration method)
240178
{
241-
method.DeclaringType.Accept(this);
242-
StringBuilder.Append('.');
243-
244179
StringBuilder.Append(method.Name);
245180
if (method.GenericParameters.Any())
246181
{

0 commit comments

Comments
 (0)