add partial implementation of rename for the WPF designer

Author: siegfriedpammer

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/Src/WpfViewContent.cs

@@ -15,6 +15,7 @@
 using System.Xml;
 
 using ICSharpCode.Core.Presentation;
+using ICSharpCode.NRefactory.TypeSystem;
 using ICSharpCode.SharpDevelop;
 using ICSharpCode.SharpDevelop.Dom;
 using ICSharpCode.SharpDevelop.Editor;
@@ -194,24 +195,41 @@ void OnSelectionChanged(object sender, DesignItemCollectionEventArgs e)
 
 		void OnPropertyGridPropertyChanged(object sender, PropertyChangedEventArgs e)
 		{
+			if (propertyGridView.PropertyGrid.ReloadActive) return;
 			if (e.PropertyName == "Name") {
 				if (!propertyGridView.PropertyGrid.IsNameCorrect) return;
 
 				// get the XAML file
-				OpenedFile fileName = this.Files.FirstOrDefault(f => f.FileName.ToString().EndsWith(".xaml", StringComparison.OrdinalIgnoreCase));
-				if (fileName == null) return;
+				OpenedFile file = this.Files.FirstOrDefault(f => f.FileName.ToString().EndsWith(".xaml", StringComparison.OrdinalIgnoreCase));
+				if (file == null) return;
 
 				// parse the XAML file
-				ParseInformation info = SD.ParserService.Parse(fileName.FileName);
+				ParseInformation info = SD.ParserService.Parse(file.FileName);
 				if (info == null) return;
+				ICompilation compilation = SD.ParserService.GetCompilationForFile(file.FileName);
+				var designerClass = info.UnresolvedFile.TopLevelTypeDefinitions[0]
+					.Resolve(new SimpleTypeResolveContext(compilation.MainAssembly))
+					.GetDefinition();
+				if (designerClass == null) return;
+				var reparseFileNameList = designerClass.Parts.Select(p => new ICSharpCode.Core.FileName(p.UnresolvedFile.FileName)).ToArray();
 
 				// rename the member
-				#warning reimplement rename!
-				/*
-				IMember member = info.CompilationUnit.Classes [0].AllMembers.FirstOrDefault(m => m.Name == propertyGridView.PropertyGrid.OldName);
-				if (member != null) {
-					FindReferencesAndRenameHelper.RenameMember(member, propertyGridView.PropertyGrid.Name);
-				}*/
+				ISymbol controlSymbol = designerClass.GetFields(f => f.Name == propertyGridView.PropertyGrid.OldName, GetMemberOptions.IgnoreInheritedMembers)
+					.SingleOrDefault();
+				if (controlSymbol != null) {
+					FindReferenceService.RenameSymbol(controlSymbol, propertyGridView.PropertyGrid.Name, new DummyProgressMonitor())
+						.ObserveOnUIThread()
+						.Subscribe(error => SD.MessageService.ShowError(error.Message), // onNext
+						           ex => SD.MessageService.ShowException(ex), // onError
+						           // onCompleted
+						           () => {
+						           	foreach (var fileName in reparseFileNameList) {
+						           		SD.ParserService.ParseAsync(fileName).FireAndForget();
+						           	}
+						           }
+						          );
+
+				}
 			}
 		}
 

src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/PropertyGrid/PropertyGrid.cs

@@ -3,12 +3,15 @@
 
 using System;
 using System.Collections.Generic;
+using System.Collections.Specialized;
 using System.Linq;
 using System.Text;
 using System.ComponentModel;
 using System.Collections.ObjectModel;
 using System.Threading;
 using System.Globalization;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
 using ICSharpCode.WpfDesign.PropertyGrid;
 using System.Windows.Threading;
 using System.Diagnostics;
@@ -31,7 +34,7 @@ public PropertyGrid()
 		}
 
 		Category specialCategory = new Category("Special");
-		Category popularCategory = new Category("Popular");		
+		Category popularCategory = new Category("Popular");
 		Category otherCategory = new Category("Other");
 		Category attachedCategory = new Category("Attached");
 
@@ -158,14 +161,17 @@ public bool IsNameEnabled {
 			}
 		}
 
-		IEnumerable<DesignItem> selectedItems;
+		IList<DesignItem> selectedItems;
 
 		public IEnumerable<DesignItem> SelectedItems {
 			get {
 				return selectedItems;
 			}
 			set {
-				selectedItems = value;
+				if (value == null)
+					selectedItems = null;
+				else
+					selectedItems = value.ToList();
 				RaisePropertyChanged("SelectedItems");
 				Dispatcher.CurrentDispatcher.BeginInvoke(DispatcherPriority.Background, new Action(
 					delegate {
@@ -178,17 +184,27 @@ public void ClearFilter()
 		{
 			Filter = null;
 		}
+		
+		volatile bool reloadActive;
+		public bool ReloadActive {
+			get { return reloadActive; }
+		}
 
 		void Reload()
 		{
-			Clear();
-			
-			if (SelectedItems == null || SelectedItems.Count() == 0) return;
-			if (SelectedItems.Count() == 1) SingleItem = SelectedItems.First();
-
-			foreach (var md in GetDescriptors()) {
-				if (PassesFilter(md.Name))
-					AddNode(md);
+			reloadActive = true;
+			try {
+				Clear();
+				
+				if (selectedItems == null || selectedItems.Count == 0) return;
+				if (selectedItems.Count == 1) SingleItem = selectedItems[0];
+	
+				foreach (var md in GetDescriptors()) {
+					if (PassesFilter(md.Name))
+						AddNode(md);
+				}
+			} finally {
+				reloadActive = false;
 			}
 		}
 
@@ -233,7 +249,7 @@ bool PassesFilter(string name)
 			if (string.IsNullOrEmpty(Filter)) return true;
 			for (int i = 0; i < name.Length; i++) {
 				if (i == 0 || char.IsUpper(name[i])) {
-					if (string.Compare(name, i, Filter, 0, Filter.Length, true) == 0) {
+					if (string.Compare(name, i, Filter, 0, Filter.Length, StringComparison.OrdinalIgnoreCase) == 0) {
 						return true;
 					}
 				}
@@ -271,7 +287,7 @@ Category PickCategory(PropertyNode node)
 			if (Metadata.IsPopularProperty(node.FirstProperty)) return popularCategory;
 			if (node.FirstProperty.IsAttachedDependencyProperty()) return attachedCategory;
 			var typeName = node.FirstProperty.DeclaringType.FullName;
-			if (typeName.StartsWith("System.Windows.") || typeName.StartsWith("ICSharpCode.WpfDesign.Designer.Controls."))
+			if (typeName.StartsWith("System.Windows.", StringComparison.Ordinal) || typeName.StartsWith("ICSharpCode.WpfDesign.Designer.Controls.", StringComparison.Ordinal))
 				return otherCategory;
 			return specialCategory;
 		}