From 931dea812a22999a1a425339b754eeb874bafa0f Mon Sep 17 00:00:00 2001 From: Andreas Weizel Date: Tue, 4 Mar 2014 02:00:26 +0100 Subject: [PATCH] Fix: Not correctly updating cache of project-specific formatter settings after loading project. --- .../CSharpFormattingOptionsContainer.cs | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/FormattingStrategy/CSharpFormattingOptionsContainer.cs b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/FormattingStrategy/CSharpFormattingOptionsContainer.cs index 03451a7c73..f25d194eee 100644 --- a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/FormattingStrategy/CSharpFormattingOptionsContainer.cs +++ b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/FormattingStrategy/CSharpFormattingOptionsContainer.cs @@ -85,13 +85,6 @@ namespace CSharpBinding.FormattingStrategy /// Clone of options container. public CSharpFormattingOptionsContainer Clone() { -// var cloneActiveOptions = new HashSet(); -// 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; @@ -134,7 +127,7 @@ namespace CSharpBinding.FormattingStrategy // We rely on property value from some of the parents and have to update it from there PropertyInfo propertyInfo = typeof(CSharpFormattingOptions).GetProperty(e.PropertyName); if (propertyInfo != null) { - var val = GetOption(e.PropertyName); + var val = GetEffectiveOption(e.PropertyName); propertyInfo.SetValue(cachedOptions, val); OnPropertyChanged(e.PropertyName); }