Skip to content

Commit 349a89c

Browse files
Fix #3436: Duplicate naming of local functions
1 parent 213fe5f commit 349a89c

File tree

4 files changed

+125
-111
lines changed

4 files changed

+125
-111
lines changed

ICSharpCode.Decompiler.Tests/TestCases/Pretty/DelegateConstruction.cs

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ private void DoSomething(string text)
183183

184184
public interface IM3
185185
{
186-
void M3();
186+
void M();
187187
}
188188

189189
public class BaseClass : IM3
@@ -194,7 +194,7 @@ protected virtual void M1()
194194
protected virtual void M2()
195195
{
196196
}
197-
public virtual void M3()
197+
public virtual void M()
198198
{
199199
}
200200

@@ -209,7 +209,7 @@ public class SubClass : BaseClass
209209
protected override void M2()
210210
{
211211
}
212-
public new void M3()
212+
public new void M()
213213
{
214214
}
215215

@@ -219,30 +219,30 @@ public void Test()
219219
Noop("M1", M1);
220220
Noop("M2.base", base.M2);
221221
Noop("M2", M2);
222-
Noop("M3.base", base.M3);
223-
Noop("M3.base_virt", ((BaseClass)this).M3);
224-
Noop("M3.base_interface", ((IM3)this).M3);
222+
Noop("M.base", base.M);
223+
Noop("M.base_virt", ((BaseClass)this).M);
224+
Noop("M.base_interface", ((IM3)this).M);
225225
#if CS70
226-
Noop("M3", this.M3);
227-
Noop("M3", M3);
226+
Noop("M", this.M);
227+
Noop("M", M);
228228

229229
#if CS80
230-
static void M3()
230+
static void M()
231231
#else
232-
void M3()
232+
void M()
233233
#endif
234234
{
235235

236236
}
237237
#else
238-
Noop("M3", M3);
238+
Noop("M", M);
239239
#endif
240240
}
241241

242242
public void Test2()
243243
{
244-
Noop("M3.new", new BaseClass().M3);
245-
Noop("M3.new", new SubClass().M3);
244+
Noop("M.new", new BaseClass().M);
245+
Noop("M.new", new SubClass().M);
246246
}
247247

248248
private void Noop(string name, Action _)
@@ -525,7 +525,7 @@ public static void ExtensionDelegateReference(IEnumerable<int> ints)
525525
public static void LocalFunctionDelegateReference()
526526
{
527527
Use(LocalFunction);
528-
Use2<int>(LocalFunction1<int>);
528+
Use2<int>(LocalFunction2<int>);
529529
#if CS80
530530
static void LocalFunction()
531531
#else
@@ -534,9 +534,9 @@ void LocalFunction()
534534
{
535535
}
536536
#if CS80
537-
static void LocalFunction1<T>()
537+
static void LocalFunction2<T>()
538538
#else
539-
void LocalFunction1<T>()
539+
void LocalFunction2<T>()
540540
#endif
541541
{
542542
}

0 commit comments

Comments
 (0)