From b7c5d1f1285923ba3a53c30aff8c6eadcc3186eb Mon Sep 17 00:00:00 2001 From: Matt Ward Date: Sat, 13 Nov 2010 21:31:14 +0000 Subject: [PATCH] Fix SD-1754 - Forms Designer should use case insensitive method name comparison for VB --- .../Src/DesignerGenerator/AbstractDesignerGenerator.cs | 7 ++++++- .../Src/DesignerGenerator/VBNetDesignerGenerator.cs | 5 +++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerGenerator/AbstractDesignerGenerator.cs b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerGenerator/AbstractDesignerGenerator.cs index c956185330..efb7263be1 100644 --- a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerGenerator/AbstractDesignerGenerator.cs +++ b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerGenerator/AbstractDesignerGenerator.cs @@ -474,7 +474,7 @@ namespace ICSharpCode.FormsDesigner LoggingService.Debug("Forms designer: AbstractDesignerGenerator.InsertComponentEvent: eventMethodName=" + eventMethodName); foreach (IMethod method in completeClass.Methods) { - if (method.Name == eventMethodName) { + if (CompareMethodNames(method.Name, eventMethodName)) { file = method.DeclaringType.CompilationUnit.FileName; OpenedFile openedFile = FileService.GetOpenedFile(file); IDocument doc; @@ -513,6 +513,11 @@ namespace ICSharpCode.FormsDesigner return true; } + protected virtual bool CompareMethodNames(string strA, string strB) + { + return strA == strB; + } + /// /// Gets a method implementing the signature specified by the event descriptor /// diff --git a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerGenerator/VBNetDesignerGenerator.cs b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerGenerator/VBNetDesignerGenerator.cs index b616f24000..84db65416e 100644 --- a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerGenerator/VBNetDesignerGenerator.cs +++ b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerGenerator/VBNetDesignerGenerator.cs @@ -67,5 +67,10 @@ namespace ICSharpCode.FormsDesigner } return v.Text; } + + protected override bool CompareMethodNames(string strA, string strB) + { + return String.Compare(strA, strB, StringComparison.InvariantCultureIgnoreCase) == 0; + } } }