From 087d79f3567fa5444f60524c67883088bc015b53 Mon Sep 17 00:00:00 2001 From: Linquize Date: Wed, 14 May 2014 20:14:22 +0800 Subject: [PATCH 1/7] WinForms Designer should not modify class fields of generic types outside designer file --- .../Project/Src/FormsDesigner/CSharpDesignerGenerator.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/FormsDesigner/CSharpDesignerGenerator.cs b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/FormsDesigner/CSharpDesignerGenerator.cs index ef39be8a3d..93256e6106 100644 --- a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/FormsDesigner/CSharpDesignerGenerator.cs +++ b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/FormsDesigner/CSharpDesignerGenerator.cs @@ -284,7 +284,7 @@ namespace CSharpBinding.FormsDesigner return false; } - return oldType.ReflectionName != newType.BaseType; + return oldType.GetDefinition().ReflectionName != newType.BaseType; } string GenerateField(CodeMemberField newField) From 31382f70516d39e2824b25f07aa4121a89958a00 Mon Sep 17 00:00:00 2001 From: Linquize Date: Thu, 15 May 2014 08:09:46 +0800 Subject: [PATCH 2/7] This is the Visual Studio Style Event Handler: preserve control name case --- .../Project/Src/FormsDesigner/CSharpEventBindingService.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/FormsDesigner/CSharpEventBindingService.cs b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/FormsDesigner/CSharpEventBindingService.cs index 9144138095..b7c635c055 100644 --- a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/FormsDesigner/CSharpEventBindingService.cs +++ b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/FormsDesigner/CSharpEventBindingService.cs @@ -57,6 +57,8 @@ namespace CSharpBinding.FormsDesigner string GetComponentName(IComponent component) { string siteName = component.Site.Name; + if (GeneralOptionsPanel.GenerateVisualStudioStyleEventHandlers) + return siteName; return Char.ToUpper(siteName[0]) + siteName.Substring(1); } From 96005292372e97c2f27810cd52aba836583c95cc Mon Sep 17 00:00:00 2001 From: Dragan Date: Mon, 19 May 2014 01:34:17 +0200 Subject: [PATCH 3/7] Exclude packages from repository (Machine.Specifications.0.4.9.0) --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index defcc3fe2f..bd3b475b46 100644 --- a/.gitignore +++ b/.gitignore @@ -20,4 +20,5 @@ bin/ /src/Main/GlobalAssemblyInfo.vb /src/AddIns/Misc/UsageDataCollector/UsageDataCollector.AddIn/AnalyticsMonitor.AppProperties.cs -/src/AddIns/Misc/PackageManagement/Packages/AvalonEdit/lib \ No newline at end of file +/src/AddIns/Misc/PackageManagement/Packages/AvalonEdit/lib +/packages/ From c27db95b03e2edc32b6ed842addcf7c1be3dd095 Mon Sep 17 00:00:00 2001 From: Dragan Date: Mon, 26 May 2014 21:18:15 +0200 Subject: [PATCH 4/7] Exclude *.sln.sdsettings --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index bd3b475b46..002ab160a7 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ bin/ /src/AddIns/Misc/PackageManagement/Packages/AvalonEdit/lib /packages/ +*.sln.sdsettings From 391eee7e68d7c3d1bf851839b1060d5dd46385f9 Mon Sep 17 00:00:00 2001 From: Dragan Date: Thu, 29 May 2014 20:57:45 +0200 Subject: [PATCH 5/7] Revert "Exclude *.sln.sdsettings" This reverts commit c27db95b03e2edc32b6ed842addcf7c1be3dd095. --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 002ab160a7..bd3b475b46 100644 --- a/.gitignore +++ b/.gitignore @@ -22,4 +22,3 @@ bin/ /src/AddIns/Misc/PackageManagement/Packages/AvalonEdit/lib /packages/ -*.sln.sdsettings From 2aad3d04493b60a35227c5910fe177c425055b42 Mon Sep 17 00:00:00 2001 From: Andreas Weizel Date: Fri, 30 May 2014 18:22:01 +0200 Subject: [PATCH 6/7] Fix #486: ISolution.StartupProjectChanged event is fired with wrong sender. --- src/Main/SharpDevelop/Project/Solution.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Main/SharpDevelop/Project/Solution.cs b/src/Main/SharpDevelop/Project/Solution.cs index c1a3071d5f..9728623ff3 100644 --- a/src/Main/SharpDevelop/Project/Solution.cs +++ b/src/Main/SharpDevelop/Project/Solution.cs @@ -194,7 +194,7 @@ namespace ICSharpCode.SharpDevelop.Project foreach (var project in removedItems) project.Dispose(); if (startupProjectWasRemoved || (solution.startupProject == null && addedItems.Contains(solution.AutoDetectStartupProject()))) - solution.StartupProjectChanged(this, EventArgs.Empty); + solution.StartupProjectChanged(solution, EventArgs.Empty); } } From 34f8b5e8953545bcd1ef40888828ad8ed5cec3f4 Mon Sep 17 00:00:00 2001 From: Siegfried Pammer Date: Sat, 31 May 2014 00:30:09 +0200 Subject: [PATCH 7/7] fix NRE when trying to go to the definition of a ctor or cctor from the profiling results --- .../Profiler/Frontend/AddIn/Src/Commands/DomMenuCommand.cs | 7 ++----- .../Profiler/Frontend/AddIn/Src/Commands/GoToDefinition.cs | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/AddIns/Analysis/Profiler/Frontend/AddIn/Src/Commands/DomMenuCommand.cs b/src/AddIns/Analysis/Profiler/Frontend/AddIn/Src/Commands/DomMenuCommand.cs index c58b7ea78a..3a065bb70c 100644 --- a/src/AddIns/Analysis/Profiler/Frontend/AddIn/Src/Commands/DomMenuCommand.cs +++ b/src/AddIns/Analysis/Profiler/Frontend/AddIn/Src/Commands/DomMenuCommand.cs @@ -41,16 +41,13 @@ namespace ICSharpCode.Profiler.AddIn.Commands if (name == null || c == null) return null; - if (name == ".ctor" || name == ".cctor") // Constructor - name = name.Replace('.', '#'); - - if (name.StartsWith("get_") || name.StartsWith("set_")) { + if (name.StartsWith("get_", StringComparison.Ordinal) || name.StartsWith("set_", StringComparison.Ordinal)) { // Property Getter or Setter name = name.Substring(4); IProperty prop = c.Properties.FirstOrDefault(p => p.Name == name); if (prop != null) return prop; - } else if (name.StartsWith("add_") || name.StartsWith("remove_")) { + } else if (name.StartsWith("add_", StringComparison.Ordinal) || name.StartsWith("remove_", StringComparison.Ordinal)) { name = name.Substring(4); IEvent ev = c.Events.FirstOrDefault(e => e.Name == name); if (ev != null) diff --git a/src/AddIns/Analysis/Profiler/Frontend/AddIn/Src/Commands/GoToDefinition.cs b/src/AddIns/Analysis/Profiler/Frontend/AddIn/Src/Commands/GoToDefinition.cs index a51ce45018..c23405d090 100644 --- a/src/AddIns/Analysis/Profiler/Frontend/AddIn/Src/Commands/GoToDefinition.cs +++ b/src/AddIns/Analysis/Profiler/Frontend/AddIn/Src/Commands/GoToDefinition.cs @@ -39,7 +39,7 @@ namespace ICSharpCode.Profiler.AddIn.Commands ITypeDefinition c = GetClassFromName(selectedItem.FullyQualifiedClassName); if (c != null) { IMember member = GetMemberFromName(c, selectedItem.MethodName, selectedItem.Parameters); - if (!member.Region.IsEmpty && !string.IsNullOrEmpty(member.Region.FileName)) { + if (member != null && !member.Region.IsEmpty && !string.IsNullOrEmpty(member.Region.FileName)) { FileName fn = new FileName(member.Region.FileName); SD.FileService.JumpToFilePosition(fn, member.Region.BeginLine, member.Region.BeginColumn); }