Added AutoFormatting option in GUI and option container, but without function right now.

Author: Rpinski

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

@@ -34,10 +34,13 @@ namespace CSharpBinding.FormattingStrategy
 	/// </summary>
 	internal class CSharpFormattingOptionsContainer : INotifyPropertyChanged
 	{
+		private const string AutoFormattingOptionName = "AutoFormatting"; 
+		
 		CSharpFormattingOptionsContainer parent;
 		CSharpFormattingOptions cachedOptions;
 
 		readonly HashSet<string> activeOptions;
+		bool? autoFormatting;
 
 		public CSharpFormattingOptionsContainer(CSharpFormattingOptionsContainer parent = null)
 			: this(parent, new HashSet<string>())
@@ -68,6 +71,34 @@ public CSharpFormattingOptionsContainer Parent
 			}
 		}
 
+		public bool? AutoFormatting
+		{
+			get {
+				return autoFormatting;
+			}
+			set {
+				autoFormatting = value;
+				OnPropertyChanged("AutoFormatting");
+			}
+		}
+		
+		public bool EffectiveAutoFormatting
+		{
+			get {
+				// Get "effective" option, i.e. walk up all parents to find a defined value
+				CSharpFormattingOptionsContainer container = this;
+				do
+				{
+					if (container.autoFormatting.HasValue) {
+						return container.autoFormatting.Value;
+					}
+					container = container.parent;
+				} while (container != null);
+				
+				return true;
+			}
+		}
+		
 		/// <summary>
 		/// Resets all container's options to given <see cref="ICSharpCode.NRefactory.CSharp.CSharpFormattingOptions"/> instance.
 		/// </summary>
@@ -81,6 +112,7 @@ public void Reset(CSharpFormattingOptions options = null)
 				foreach (var property in typeof(CSharpFormattingOptions).GetProperties()) {
 					activeOptions.Add(property.Name);
 				}
+				autoFormatting = true;
 			}
 			OnPropertyChanged(null);
 		}
@@ -106,6 +138,7 @@ public void CloneFrom(CSharpFormattingOptionsContainer options)
 			foreach (var activeOption in options.activeOptions)
 				activeOptions.Add(activeOption);
 			cachedOptions = options.cachedOptions.Clone();
+			autoFormatting = options.autoFormatting;
 			OnPropertyChanged(null);
 		}
 
@@ -275,6 +308,11 @@ public void Load(Properties parentProperties)
 						// Silently ignore loading error, then this property will be "as parent" automatically
 					}
 				}
+				if (formatProperties.Contains(AutoFormattingOptionName)) {
+					autoFormatting = formatProperties.Get(AutoFormattingOptionName, true);
+				} else {
+					autoFormatting = null;
+				}
 			}
 		}
 
@@ -291,6 +329,12 @@ public void Save(Properties parentProperties)
 					formatProperties.Set(activeOption, val);
 				}
 			}
+			if (formatProperties.Contains(AutoFormattingOptionName) && !autoFormatting.HasValue) {
+				// AutoFormatting options was activated previously, remove it now
+				formatProperties.Remove(AutoFormattingOptionName);
+			} else {
+				formatProperties.Set(AutoFormattingOptionName, autoFormatting);
+			}
 
 			parentProperties.SetNestedProperties("CSharpFormatting", formatProperties);
 		}

src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/CSharpFormattingEditor.xaml

@@ -298,18 +298,23 @@
 	</UserControl.Resources>
 
 	<DockPanel>
-		<Grid
-			DockPanel.Dock="Top"
-			Visibility="{Binding Path=AllowPresets, Converter={StaticResource boolToVisibilityConverter}}">
-			
-			<Grid.ColumnDefinitions>
-				<ColumnDefinition Width="Auto" />
-				<ColumnDefinition Width="*" />
-			</Grid.ColumnDefinitions>
-			
-			<Button Grid.Column="0" Content="Reset to:" Click="ResetButton_Click" />
-			<ComboBox Name="presetComboBox" Grid.Column="1" Margin="3,0,0,0" ItemsSource="{Binding Presets}" />
-		</Grid>
+		<StackPanel DockPanel.Dock="Top" Orientation="Vertical">
+			<CheckBox
+				Name="autoFormattingCheckBox"
+				Content="Automatically format code"
+				IsThreeState="True" IsChecked="{Binding AutoFormatting}"
+				Margin="0,0,0,10"/>
+			<Grid
+				Visibility="{Binding Path=AllowPresets, Converter={StaticResource boolToVisibilityConverter}}">
+				<Grid.ColumnDefinitions>
+					<ColumnDefinition Width="Auto" />
+					<ColumnDefinition Width="*" />
+				</Grid.ColumnDefinitions>
+				
+				<Button Grid.Column="0" Content="Reset to:" Click="ResetButton_Click" />
+				<ComboBox Name="presetComboBox" Grid.Column="1" Margin="3,0,0,0" ItemsSource="{Binding Presets}" />
+			</Grid>
+		</StackPanel>
 
 		<sd:RestrictDesiredSize Margin="0,4,0,0">
 			<ScrollViewer VerticalScrollBarVisibility="Auto">

src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/CSharpFormattingEditor.xaml.cs

@@ -133,13 +133,44 @@ public bool AllowPresets {
 			set { SetValue(AllowPresetsProperty, value); }
 		}
 
+		public static readonly DependencyProperty AutoFormattingProperty =
+			DependencyProperty.Register("AutoFormatting", typeof(bool?), typeof(CSharpFormattingEditor),
+				new FrameworkPropertyMetadata());
+		
+		public bool? AutoFormatting {
+			get { return (bool?)GetValue(AutoFormattingProperty); }
+			set { SetValue(AutoFormattingProperty, value); }
+		}
+		
 		static void OnOptionsContainerPropertyChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
 		{
 			var editor = o as CSharpFormattingEditor;
 			if (editor != null) {
-				var container = e.NewValue as CSharpFormattingOptionsContainer;
+				var newContainer = e.NewValue as CSharpFormattingOptionsContainer;
+				if (newContainer != null) {
+					newContainer.PropertyChanged += (sender, eventArgs) => 
+					{
+						if (eventArgs.PropertyName == "AutoFormatting") {
+							// Update AutoFormatting special option
+							if (editor.AutoFormatting != newContainer.AutoFormatting)
+								editor.AutoFormatting = newContainer.AutoFormatting;
+						}
+					};
+					editor.autoFormattingCheckBox.IsThreeState = (newContainer.Parent != null);
+					editor.AutoFormatting = newContainer.AutoFormatting;
+					editor.FillPresetList(newContainer);
+				}
+			}
+		}
+		
+		static void OnAutoFormattingPropertyChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
+		{
+			var editor = o as CSharpFormattingEditor;
+			if (editor != null) {
+				var container = editor.OptionsContainer;
 				if (container != null) {
-					editor.FillPresetList(container);
+					if (container.AutoFormatting != (bool?) e.NewValue)
+						container.AutoFormatting = (bool?) e.NewValue;
 				}
 			}
 		}