Fix: Still not correctly updating child formatting options when editing the parent.

Author: Rpinski

src/AddIns/BackendBindings/CSharpBinding/Project/Src/FormattingStrategy/CSharpFormattingOptionsContainer.cs

@@ -39,18 +39,25 @@ internal class CSharpFormattingOptionsContainer : INotifyPropertyChanged
 
 		readonly HashSet<string> activeOptions;
 
-		internal CSharpFormattingOptionsContainer(CSharpFormattingOptionsContainer parent = null)
+		public CSharpFormattingOptionsContainer(CSharpFormattingOptionsContainer parent = null)
+			: this(parent, new HashSet<string>())
+		{
+		}
+		
+		private CSharpFormattingOptionsContainer(CSharpFormattingOptionsContainer parent, HashSet<string> activeOptions)
 		{
 			this.parent = parent;
-			this.activeOptions = new HashSet<string>();
+			if (parent != null) {
+				parent.PropertyChanged += HandlePropertyChanged;
+			}
+			this.activeOptions = activeOptions;
 			Reset();
-			cachedOptions = CreateOptions();
+			cachedOptions = CreateCachedOptions();
 		}
 
 		public CSharpFormattingOptionsContainer Parent
 		{
-			get
-			{
+			get {
 				return parent;
 			}
 		}
@@ -72,6 +79,36 @@ public void Reset(CSharpFormattingOptions options = null)
 			OnPropertyChanged(null);
 		}
 
+		/// <summary>
+		/// Creates a clone of current options container.
+		/// </summary>
+		/// <returns>Clone of options container.</returns>
+		public CSharpFormattingOptionsContainer Clone()
+		{
+//			var cloneActiveOptions = new HashSet<string>();
+//			foreach (var activeOption in activeOptions)
+//				cloneActiveOptions.Add(activeOption);
+//			var clone = new CSharpFormattingOptionsContainer(parent, cloneActiveOptions);
+//			clone.Reset(cachedOptions.Clone());
+//			return clone;
+			
+			var clone = new CSharpFormattingOptionsContainer(parent);
+			clone.CloneFrom(this);
+			return clone;
+		}
+		
+		/// <summary>
+		/// Clones all properties from another options container.
+		/// </summary>
+		/// <returns>Clone of options container.</returns>
+		public void CloneFrom(CSharpFormattingOptionsContainer options)
+		{
+			activeOptions.Clear();
+			foreach (var activeOption in options.activeOptions)
+				activeOptions.Add(activeOption);
+			Reset(options.cachedOptions.Clone());
+		}
+		
 		#region INotifyPropertyChanged implementation
 
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -87,9 +124,10 @@ private void OnPropertyChanged(string propertyName)
 
 		private void HandlePropertyChanged(object sender, PropertyChangedEventArgs e)
 		{
-			if (e.PropertyName == "Parent") {
-				// Parent of parent has been updated, recreate options object
-				cachedOptions = CreateOptions();
+			if ((e.PropertyName == "Parent") || (e.PropertyName == null)) {
+				// All properties might have changed -> update everything
+				cachedOptions = CreateCachedOptions();
+				OnPropertyChanged(e.PropertyName);
 			} else {
 				// Some other property has changed, check if we have our own value for it
 				if (!activeOptions.Contains(e.PropertyName)) {
@@ -98,6 +136,7 @@ private void HandlePropertyChanged(object sender, PropertyChangedEventArgs e)
 					if (propertyInfo != null) {
 						var val = GetOption(e.PropertyName);
 						propertyInfo.SetValue(cachedOptions, val);
+						OnPropertyChanged(e.PropertyName);
 					}
 				}
 			}
@@ -206,7 +245,7 @@ public CSharpFormattingOptions GetEffectiveOptions()
 		/// container, resolving all options throughout container hierarchy.
 		/// </summary>
 		/// <returns>Created and filled <see cref="ICSharpCode.NRefactory.CSharp.CSharpFormattingOptions"/> instance.</returns>
-		private CSharpFormattingOptions CreateOptions()
+		private CSharpFormattingOptions CreateCachedOptions()
 		{
 			var outputOptions = FormattingOptionsFactory.CreateEmpty();
 

src/AddIns/BackendBindings/CSharpBinding/Project/Src/FormattingStrategy/CSharpFormattingOptionsPersistence.cs

@@ -91,7 +91,8 @@ static void SolutionClosed(object sender, SolutionEventArgs e)
 		}
 
 		readonly Properties propertiesContainer;
-		readonly CSharpFormattingOptionsContainer optionsContainer;
+		CSharpFormattingOptionsContainer optionsContainer;
+		CSharpFormattingOptionsContainer optionsContainerWorkingCopy;
 
 		/// <summary>
 		/// Creates a new instance of formatting options persistence helper, using given options to predefine the options container.
@@ -109,13 +110,28 @@ public CSharpFormattingOptionsPersistence(Properties propertiesContainer, CSharp
 			optionsContainer = initialContainer;
 		}
 
+		/// <summary>
+		/// Returns the option container managed by this helper.
+		/// </summary>
 		public CSharpFormattingOptionsContainer OptionsContainer
 		{
 			get {
 				return optionsContainer;
 			}
 		}
 
+		/// <summary>
+		/// Starts editing operation by creating a working copy of current formatter settings.
+		/// </summary>
+		/// <returns>
+		/// New working copy of managed options container.
+		/// </returns>
+		public CSharpFormattingOptionsContainer StartEditing()
+		{
+			optionsContainerWorkingCopy = optionsContainer.Clone();
+			return optionsContainerWorkingCopy;
+		}
+		
 		/// <summary>
 		/// Loads formatting settings from properties container.
 		/// </summary>
@@ -130,6 +146,13 @@ public void Load()
 		/// <returns><c>True</c> if successful, <c>false</c> otherwise</returns>
 		public bool Save()
 		{
+			// Apply all changes on working copy to main options container
+			if (optionsContainerWorkingCopy != null) {
+				optionsContainer.CloneFrom(optionsContainerWorkingCopy);
+				optionsContainerWorkingCopy = null;
+			}
+			
+			// Convert to SD properties
 			optionsContainer.Save(propertiesContainer);
 			return true;
 		}