Issue icsharpcode#854: Add test for Handles cluase having different c…

…ase for property with event, use semantic model to get official name of the property
jrmoreno1 · Mar 26, 2022 · bfa7259 · bfa7259
1 parent 1ecb146
commit bfa7259
Show file tree

Hide file tree

Showing 2 changed files with 73 additions and 3 deletions.
diff --git a/CodeConverter/CSharp/HandledEventsAnalyzer.cs b/CodeConverter/CSharp/HandledEventsAnalyzer.cs
@@ -94,10 +94,10 @@ private async Task<bool> IsNeverWrittenOrOverriddenAsync(ISymbol symbol)
                 .SelectMany(mss => mss.HandlesClause.Events, (_, e) => {
                 var eventSymbol = semanticModel.GetSymbolInfo(e.EventMember).Symbol as IEventSymbol;
                 // TODO: Need to either use the semantic model containing the event symbol, or bundle up the Event member with the possible symbol here for later use (otherwise it's null)
-                return (CreateEventContainer(e.EventContainer), new EventDescriptor(e.EventMember, eventSymbol), HandlingMethod: methodSymbol);
+                return (CreateEventContainer(e.EventContainer, semanticModel), new EventDescriptor(e.EventMember, eventSymbol), HandlingMethod: methodSymbol);
             });
         }
-        private HandledEventsAnalysis.EventContainer CreateEventContainer(Microsoft.CodeAnalysis.VisualBasic.Syntax.EventContainerSyntax p)
+        private HandledEventsAnalysis.EventContainer CreateEventContainer(Microsoft.CodeAnalysis.VisualBasic.Syntax.EventContainerSyntax p, SemanticModel semanticModel)
         {
             switch (p) {
                 //For me, trying to use "MyClass" in a Handles expression is a syntax error. Events aren't overridable anyway so I'm not sure how this would get used.
@@ -106,7 +106,7 @@ private HandledEventsAnalysis.EventContainer CreateEventContainer(Microsoft.Code
                 case Microsoft.CodeAnalysis.VisualBasic.Syntax.KeywordEventContainerSyntax _:
                     return new HandledEventsAnalysis.EventContainer(HandledEventsAnalysis.EventContainerKind.This, null);
                 case Microsoft.CodeAnalysis.VisualBasic.Syntax.WithEventsEventContainerSyntax weecs:
-                    return new HandledEventsAnalysis.EventContainer(HandledEventsAnalysis.EventContainerKind.Property, weecs.Identifier.Text);
+                    return new HandledEventsAnalysis.EventContainer(HandledEventsAnalysis.EventContainerKind.Property, semanticModel.GetSymbolInfo(weecs).Symbol.Name);
                 case Microsoft.CodeAnalysis.VisualBasic.Syntax.WithEventsPropertyEventContainerSyntax wepecs:
                     return new HandledEventsAnalysis.EventContainer(HandledEventsAnalysis.EventContainerKind.Property, wepecs.Property.Identifier.Text);
                 default:

diff --git a/Tests/VB/CaseSensitivityTests.cs b/Tests/VB/CaseSensitivityTests.cs
@@ -0,0 +1,70 @@
+using System.Threading.Tasks;
+
+using ICSharpCode.CodeConverter.Tests.TestRunners;
+using ICSharpCode.CodeConverter.VB;
+
+using Xunit;
+
+namespace ICSharpCode.CodeConverter.Tests.VB
+{
+
+    public class CaseSensitivityTests : ConverterTestBase
+    {
+        [Fact]
+        public async Task HandlesWithDifferingCaseTestAsync()
+        {
+            await TestConversionVisualBasicToCSharpAsync(@"Public Class VBIsCaseInsensitive
+    Inherits System.Web.UI.Page
+
+    Private Sub btnOK_Click(sender As Object, e As System.EventArgs) Handles btnOK.Click
+    End Sub
+End Class
+
+Partial Public Class VBIsCaseInsensitive
+    Protected WithEvents btnOk As Global.System.Web.UI.WebControls.Button
+End Class
+",
+@"using System;
+using System.Runtime.CompilerServices;
+
+public partial class VBIsCaseInsensitive : System.Web.UI.Page
+{
+    private void btnOK_Click(object sender, EventArgs e)
+    {
+    }
+}
+
+public partial class VBIsCaseInsensitive
+{
+    private System.Web.UI.WebControls.Button _btnOk;
+
+    protected virtual System.Web.UI.WebControls.Button btnOk
+    {
+        [MethodImpl(MethodImplOptions.Synchronized)]
+        get
+        {
+            return _btnOk;
+        }
+
+        [MethodImpl(MethodImplOptions.Synchronized)]
+        set
+        {
+            if (_btnOk != null)
+            {
+                _btnOk.Click -= btnOK_Click;
+            }
+
+            _btnOk = value;
+            if (_btnOk != null)
+            {
+                _btnOk.Click += btnOK_Click;
+            }
+        }
+    }
+}", hasLineCommentConversionIssue: true /*Fields re-ordered*/);
+        }
+
+
+
+    }
+}