Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/monodevelop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs
diff options
context:
space:
mode:
Diffstat (limited to 'main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs')
-rw-r--r--main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs1174
1 files changed, 289 insertions, 885 deletions
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs
index 346dad4f94..7f08f7dae2 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormattingProfileDialog.cs
@@ -30,391 +30,51 @@ using MonoDevelop.Ide;
using System.Reflection;
using System.Collections.Generic;
using System.Linq;
-using ICSharpCode.NRefactory.CSharp;
using MonoDevelop.Components;
+using MonoDevelop.Ide.Editor;
+using MonoDevelop.Ide.Gui.Content;
namespace MonoDevelop.CSharp.Formatting
{
partial class CSharpFormattingProfileDialog : Dialog
{
- readonly Mono.TextEditor.TextEditor texteditor = new Mono.TextEditor.TextEditor ();
+ readonly TextEditor texteditor = TextEditorFactory.CreateNewEditor ();
readonly CSharpFormattingPolicy profile;
- TreeStore indentOptions, bacePositionOptions, newLineOptions, whiteSpaceOptions, wrappingOptions;
-
- static readonly Dictionary<Wrapping, string> arrayInitializerTranslationDictionary = new Dictionary<Wrapping, string> ();
- static readonly Dictionary<BraceStyle, string> braceStyleTranslationDictionary = new Dictionary<BraceStyle, string> ();
- //static Dictionary<BraceForcement, string> braceForcementTranslationDictionary = new Dictionary<BraceForcement, string> ();
- static readonly Dictionary<PropertyFormatting, string> propertyFormattingTranslationDictionary = new Dictionary<PropertyFormatting, string> ();
- static readonly Dictionary<NewLinePlacement, string> newLinePlacementTranslationDictionary = new Dictionary<NewLinePlacement, string> ();
-
+ TreeStore indentationOptions, newLineOptions, spacingOptions, styleOptions, wrappingOptions;
+ static readonly Dictionary<Microsoft.CodeAnalysis.CSharp.Formatting.LabelPositionOptions, string> labelPositionOptionsTranslationDictionary = new Dictionary<Microsoft.CodeAnalysis.CSharp.Formatting.LabelPositionOptions, string> ();
+ static readonly Dictionary<Microsoft.CodeAnalysis.CSharp.Formatting.BinaryOperatorSpacingOptions, string> binaryOperatorSpacingOptionsDictionary = new Dictionary<Microsoft.CodeAnalysis.CSharp.Formatting.BinaryOperatorSpacingOptions, string> ();
+
+
static CSharpFormattingProfileDialog ()
{
- braceStyleTranslationDictionary [BraceStyle.DoNotChange] = GettextCatalog.GetString ("Do not change");
- braceStyleTranslationDictionary [BraceStyle.EndOfLine] = GettextCatalog.GetString ("End of line");
- braceStyleTranslationDictionary [BraceStyle.EndOfLineWithoutSpace] = GettextCatalog.GetString ("End of line without space");
- braceStyleTranslationDictionary [BraceStyle.NextLine] = GettextCatalog.GetString ("Next line");
- braceStyleTranslationDictionary [BraceStyle.NextLineShifted] = GettextCatalog.GetString ("Next line shifted");
- braceStyleTranslationDictionary [BraceStyle.NextLineShifted2] = GettextCatalog.GetString ("Next line shifted2");
- braceStyleTranslationDictionary [BraceStyle.BannerStyle] = GettextCatalog.GetString ("Banner style");
-
- propertyFormattingTranslationDictionary [PropertyFormatting.AllowOneLine] = GettextCatalog.GetString ("Allow one line");
- propertyFormattingTranslationDictionary [PropertyFormatting.ForceOneLine] = GettextCatalog.GetString ("Force one line");
- propertyFormattingTranslationDictionary [PropertyFormatting.ForceNewLine] = GettextCatalog.GetString ("Force new line");
-
- arrayInitializerTranslationDictionary [Wrapping.DoNotChange] = GettextCatalog.GetString ("Do not change");
- arrayInitializerTranslationDictionary [Wrapping.DoNotWrap] = GettextCatalog.GetString ("Do not Wrap");
- arrayInitializerTranslationDictionary [Wrapping.WrapAlways] = GettextCatalog.GetString ("Wrap always");
- arrayInitializerTranslationDictionary [Wrapping.WrapIfTooLong] = GettextCatalog.GetString ("Wrap if too long");
+ labelPositionOptionsTranslationDictionary [Microsoft.CodeAnalysis.CSharp.Formatting.LabelPositionOptions.LeftMost] = GettextCatalog.GetString ("leftmost column");
+ labelPositionOptionsTranslationDictionary [Microsoft.CodeAnalysis.CSharp.Formatting.LabelPositionOptions.NoIndent] = GettextCatalog.GetString ("normal placement");
+ labelPositionOptionsTranslationDictionary [Microsoft.CodeAnalysis.CSharp.Formatting.LabelPositionOptions.OneLess] = GettextCatalog.GetString ("one indent less");
- newLinePlacementTranslationDictionary [NewLinePlacement.DoNotCare] = GettextCatalog.GetString ("Allow both");
- newLinePlacementTranslationDictionary [NewLinePlacement.NewLine] = GettextCatalog.GetString ("Always new line");
- newLinePlacementTranslationDictionary [NewLinePlacement.SameLine] = GettextCatalog.GetString ("Always same line");
+ binaryOperatorSpacingOptionsDictionary [Microsoft.CodeAnalysis.CSharp.Formatting.BinaryOperatorSpacingOptions.Ignore] = GettextCatalog.GetString ("ignore");
+ binaryOperatorSpacingOptionsDictionary [Microsoft.CodeAnalysis.CSharp.Formatting.BinaryOperatorSpacingOptions.Remove] = GettextCatalog.GetString ("remove");
+ binaryOperatorSpacingOptionsDictionary [Microsoft.CodeAnalysis.CSharp.Formatting.BinaryOperatorSpacingOptions.Single] = GettextCatalog.GetString ("single");
}
public static string TranslateValue (object value)
{
- if (value is BraceStyle)
- return braceStyleTranslationDictionary [(BraceStyle)value];
-// if (value is BraceForcement)
-// return braceForcementTranslationDictionary [(BraceForcement)value];
- if (value is PropertyFormatting)
- return propertyFormattingTranslationDictionary [(PropertyFormatting)value];
- if (value is Wrapping)
- return arrayInitializerTranslationDictionary [(Wrapping)value];
- if (value is NewLinePlacement)
- return newLinePlacementTranslationDictionary [(NewLinePlacement)value];
+ if (value is Microsoft.CodeAnalysis.CSharp.Formatting.LabelPositionOptions)
+ return labelPositionOptionsTranslationDictionary [(Microsoft.CodeAnalysis.CSharp.Formatting.LabelPositionOptions)value];
+ if (value is Microsoft.CodeAnalysis.CSharp.Formatting.BinaryOperatorSpacingOptions)
+ return binaryOperatorSpacingOptionsDictionary [(Microsoft.CodeAnalysis.CSharp.Formatting.BinaryOperatorSpacingOptions)value];
throw new Exception ("unknown property type: " + value);
}
-
+
public static object ConvertProperty (Type propertyType, string newText)
{
- if (propertyType == typeof(BraceStyle))
- return braceStyleTranslationDictionary.First (p => p.Value == newText).Key;
-// if (propertyType == typeof(BraceForcement))
-// return braceForcementTranslationDictionary.First (p => p.Value == newText).Key;
- if (propertyType == typeof(PropertyFormatting))
- return propertyFormattingTranslationDictionary.First (p => p.Value == newText).Key;
- if (propertyType == typeof(Wrapping))
- return arrayInitializerTranslationDictionary.First (p => p.Value == newText).Key;
- if (propertyType == typeof(NewLinePlacement))
- return newLinePlacementTranslationDictionary.First (p => p.Value == newText).Key;
+ if (propertyType == typeof(Microsoft.CodeAnalysis.CSharp.Formatting.LabelPositionOptions))
+ return labelPositionOptionsTranslationDictionary.First (p => p.Value == newText).Key;
+ if (propertyType == typeof(Microsoft.CodeAnalysis.CSharp.Formatting.BinaryOperatorSpacingOptions))
+ return binaryOperatorSpacingOptionsDictionary.First (p => p.Value == newText).Key;
throw new Exception ("unknown property type: " + propertyType);
}
-
- #region Examples
- const string methodSpaceExample = @"class ClassDeclaration {
- public static void Main (string[] args)
- {
- Console.WriteLine (""Hello World!"");
- }
- }";
-
- const string propertyExample = @"class ClassDeclaration {
- int myProperty;
- int MyProperty {
- get { return myProperty;}
- set { myProperty = value;}
- }
-
- string Simple { get { ; } set { ; } }
-
- int myOtherProperty;
- int MyOtherProperty {
- get {
- Console.WriteLine (""get myOtherProperty"");
- return myOtherProperty;
- }
- set {
- if (myOtherProperty != value)
- myOtherProperty = value;
- }
- }
-
- int MyAutoProperty {
- get;
- set;
- }
-
- int MyOtherAutoProperty { get; set; }
- }";
-
- const string spaceExample = @"class ClassDeclaration {
- public void TestMethod ()
- {
- try {
- TestMethod ("""");
- } catch (Exception e) {
- // Do something
- } finally {
- // Do something
- }
- }
-
- public void TestMethod (string test)
- {
- lock (this) {
- switch (test) {
- case ""A"":
- Console.WriteLine (""was A"");
- break;
- case ""B"":
- Console.WriteLine (""was B"");
- break;
- }
- }
- }
-
- public void Calculate (int a, int b)
- {
- if (a < b) {
- for (int i = a; i < b; i++) {
- Console.WriteLine (i);
- }
- } else {
- using (object o = new object ()) {
- while (b < a) {
- ConentryNamesole.WriteLine (b++);
- }
- }
- }
- }
- }";
- const string eventExample = @"class ClassDeclaration {
- EventHandler<EventArgs> onAction;
- public event EventHandler<EventArgs> Action {
- add { onAction = (EventHandler<EventArgs>)Delegate.Combine(onAction, value); }
- remove { onAction = (EventHandler<EventArgs>)Delegate.Remove(onAction, value);}
- }
- EventHandler<EventArgs> onAnotherAction;
- public event EventHandler<EventArgs> AnotherAction {
- add { if (value != null)
- onAnotherAction = (EventHandler<EventArgs>)Delegate.Combine(onAnotherAction, value); }
- remove { if (value != null)
- onAnotherAction = (EventHandler<EventArgs>)Delegate.Remove(onAnotherAction, value);}
- }
- }";
-
- const string simpleUsingStatement = @"class ClassDeclaration {
- public void Test ()
- {
- using (object o = new object ()) {
- Console.WriteLine (""Hello World!"");
- }
- }
- }";
-
- const string simpleFixedStatement = @"class ClassDeclaration {
- public void Test (Point pt)
- {
- fixed (int* p = &pt.x) {
- *p = 10;
- }
- }
- }";
-
- const string simpleIf = @"class ClassDeclaration {
- public void Test (int i)
- {
- if (i == 5) {
- Console.WriteLine (""== 5"");
- } else if (i > 0) {
- Console.WriteLine ("">0"");
- } else if (i < 0) {
- Console.WriteLine (""<0"");
- } else {
- Console.WriteLine (""== 0"");
- }
- }
- }";
- const string longMethodCall = @"class ClassDeclaration {
- public void Test (int test)
- {
- LongMethodCallInSameLine (""Hello"", 1, test);
- LongMethodCallInMultiple (
-""Hello"",
- 1,
- test);
- LongMethodCallInMultipleCase2 (""Hello"",
- 1,
- test);
- }
-}";
- const string longMethodDeclaration = @"class ClassDeclaration {
- public void LongMethodCallInSameLine (int test, string foo, double bar)
- {
- }
- public void LongMethodCallInMultiple (
-int test,
-string foo,
-double bar)
- {
- }
- public void LongMethodCallInMultipleCase2 (int test,
-string foo,
-double bar)
- {
- }
-}";
- const string longIndexerDeclaration = @"class ClassDeclaration {
- public int this [int test, string foo, double bar]
- {
- get {}
- }
- public int this [
-int test,
-string foo,
-double bar]
- {
- get {}
- }
- public int this [int test,
-string foo,
-double bar]
- {
- get {}
- }
-}";
- const string longIndexer = @"class ClassDeclaration {
- public void Test (int test)
- {
- this [""Hello"", 1, test] = 0;
- this [
-""Hello"",
- 1,
- test] = 0;
-
- this [""Hello"",
- 1,
- test] = 0;
- }
-}";
- const string simpleWhile = @"class ClassDeclaration {
- public void Test ()
- {
- while (true) {
- Console.WriteLine (""Hello World!"");
- }
- }
- }";
- const string simpleCatch = @"class ClassDeclaration {
- public void Test ()
- {
- try {
- Console.WriteLine (""Hello World!"");
- } catch (Exception) {
- Console.WriteLine (""Got exception!!"");
- } finally {
- Console.WriteLine (""finally done."");
- }
- }
- }";
-
- const string simpleDoWhile = @"class ClassDeclaration {
- public void Test ()
- {
- int i = 0;
- do {
- Console.WriteLine (""Hello World!"");
- } while (i++ < 10);
- }
- }";
-
- const string simpleArrayInitializer = @"class ClassDeclaration {
- public void Test (object o)
- {
- int[] i = new int[] { 1, 3, 3, 7 };
- }
- }";
- const string condOpExample = @"class ClassDeclaration {
- public string GetSign (int i)
- {
- return i < 0 ? ""-"" : ""+"";
- }
- }";
- const string switchExample = @"class ClassDeclaration {
- public void Test (int i)
- {
- switch (i) {
- case 0:
- Console.WriteLine (""was zero"");
- break;
- case 1:
- Console.WriteLine (""was one"");
- break;
- default:
- Console.WriteLine (""was "" + i);
- break;
- }
- }
- }";
- const string simpleFor = @"class ClassDeclaration {
- public void Test ()
- {
- for (int i = 0; i < 10; i++) {
- Console.WriteLine (""Hello World!"");
- }
- }
- }";
- const string simpleForeach = @"class ClassDeclaration : ArrayList {
- public void Test ()
- {
- foreach (object o in this) {
- Console.WriteLine (""Hello World!"");
- }
- }
- }";
- const string simpleLock = @"class ClassDeclaration {
- public void Test ()
- {
- lock (this) {
- Console.WriteLine (""Hello World!"");
- }
- }
- }";
- const string operatorExample = @"class ClassDeclaration {
- public void TestMethod ()
- {
- int a = 5 << 5;
- int b = (a + 5 - 3) * 6 / 2;
- a += b;
- a = a & ~255;
- if (a == b || b < a >> 1) {
- b -= a;
- }
- }
- object Test (object a, object b)
- {
- return a ?? b;
- }
- }";
- const string blankLineExample = @"// Example
-using System;
-using System.Collections;
-namespace TestSpace {
- using MyNamespace;
- class Test
- {
- int a;
- string b;
- public Test (int a, string b)
- {
- this.a = a;
- this.b = b;
- }
- void Print ()
- {
- Console.WriteLine (""a: {0} b : {1}"", a, b);
- }
- }
- class MyTest
- {
- }
-}
-";
- #endregion
-
const int propertyColumn = 0;
const int displayTextColumn = 1;
const int exampleTextColumn = 2;
@@ -437,15 +97,13 @@ namespace TestSpace {
treeView = treeviewIndentOptions;
break;
case 1:
- treeView = treeviewBracePositions;
+ treeView = treeviewNewLines;
break;
case 2: // Blank lines
- UpdateExample (blankLineExample);
- return;
- case 3: // white spaces
- return;
- case 4:
- treeView = treeviewNewLines;
+ treeView = treeviewSpacing;
+ break;
+ case 3:
+ treeView = treeviewWrapping;
break;
default:
return;
@@ -458,30 +116,25 @@ namespace TestSpace {
};
notebookCategories.ShowTabs = false;
comboboxCategories.AppendText (GettextCatalog.GetString ("Indentation"));
- comboboxCategories.AppendText (GettextCatalog.GetString ("Braces"));
- comboboxCategories.AppendText (GettextCatalog.GetString ("Blank lines"));
- comboboxCategories.AppendText (GettextCatalog.GetString ("Wrapping"));
- comboboxCategories.AppendText (GettextCatalog.GetString ("White Space"));
comboboxCategories.AppendText (GettextCatalog.GetString ("New Lines"));
+ comboboxCategories.AppendText (GettextCatalog.GetString ("Spacing"));
+// comboboxCategories.AppendText (GettextCatalog.GetString ("Style"));
+ comboboxCategories.AppendText (GettextCatalog.GetString ("Wrapping"));
comboboxCategories.Changed += delegate {
texteditor.Text = "";
notebookCategories.Page = comboboxCategories.Active;
};
comboboxCategories.Active = 0;
- var options = MonoDevelop.SourceEditor.DefaultSourceEditorOptions.Instance;
- texteditor.Options.FontName = options.FontName;
- texteditor.Options.ColorScheme = options.ColorScheme;
- texteditor.Options.ShowFoldMargin = false;
- texteditor.Options.ShowIconMargin = false;
- texteditor.Options.ShowLineNumberMargin = false;
- texteditor.Document.ReadOnly = true;
- texteditor.Document.MimeType = CSharpFormatter.MimeType;
+ var options = DefaultSourceEditorOptions.Instance;
+ texteditor.Options = DefaultSourceEditorOptions.PlainEditor;
+ texteditor.IsReadOnly = true;
+ texteditor.MimeType = CSharpFormatter.MimeType;
scrolledwindow.Child = texteditor;
ShowAll ();
#region Indent options
- indentOptions = new TreeStore (typeof(string), typeof(string), typeof(string), typeof(bool), typeof(bool));
+ indentationOptions = new TreeStore (typeof(string), typeof(string), typeof(string), typeof(bool), typeof(bool));
var column = new TreeViewColumn ();
// pixbuf column
@@ -495,7 +148,7 @@ namespace TestSpace {
column.PackStart (cellRendererText, true);
column.SetAttributes (cellRendererText, "text", 1);
- treeviewIndentOptions.Model = indentOptions;
+ treeviewIndentOptions.Model = indentationOptions;
treeviewIndentOptions.HeadersVisible = false;
treeviewIndentOptions.Selection.Changed += TreeSelectionChanged;
treeviewIndentOptions.AppendColumn (column);
@@ -509,7 +162,7 @@ namespace TestSpace {
cellRendererCombo.HasEntry = false;
cellRendererCombo.Editable = !profile.IsBuiltIn;
- cellRendererCombo.Edited += new ComboboxEditedHandler (this, indentOptions).ComboboxEdited;
+ cellRendererCombo.Edited += new ComboboxEditedHandler (this, indentationOptions).ComboboxEdited;
column.PackStart (cellRendererCombo, false);
column.SetAttributes (cellRendererCombo, "visible", comboVisibleColumn);
@@ -518,58 +171,23 @@ namespace TestSpace {
var cellRendererToggle = new CellRendererToggle ();
cellRendererToggle.Ypad = 1;
cellRendererToggle.Activatable = !profile.IsBuiltIn;
- cellRendererToggle.Toggled += new CellRendererToggledHandler (this, treeviewIndentOptions, indentOptions).Toggled;
+ cellRendererToggle.Toggled += new CellRendererToggledHandler (this, treeviewIndentOptions, indentationOptions).Toggled;
column.PackStart (cellRendererToggle, false);
column.SetAttributes (cellRendererToggle, "visible", toggleVisibleColumn);
column.SetCellDataFunc (cellRendererToggle, ToggleDataFunc);
-
treeviewIndentOptions.AppendColumn (column);
- var category = AddOption (indentOptions, null, GettextCatalog.GetString ("Declarations"), null);
- AddOption (indentOptions, category, "IndentNamespaceBody", GettextCatalog.GetString ("within namespaces"), "namespace Test { class AClass {} }");
-
- AddOption (indentOptions, category, "IndentClassBody", GettextCatalog.GetString ("within classes"), "class AClass { int aField; void AMethod () {}}");
- AddOption (indentOptions, category, "IndentInterfaceBody", GettextCatalog.GetString ("within interfaces"), "interface IAInterfaces { int AProperty {get;set;} void AMethod ();}");
- AddOption (indentOptions, category, "IndentStructBody", GettextCatalog.GetString ("within structs"), "struct AStruct { int aField; void AMethod () {}}");
- AddOption (indentOptions, category, "IndentEnumBody", GettextCatalog.GetString ("within enums"), "enum AEnum { A, B, C }");
-
- AddOption (indentOptions, category, "IndentMethodBody", GettextCatalog.GetString ("within methods"), methodSpaceExample);
- AddOption (indentOptions, category, "IndentPropertyBody", GettextCatalog.GetString ("within properties"), propertyExample);
- AddOption (indentOptions, category, "IndentEventBody", GettextCatalog.GetString ("within events"), eventExample);
-
- category = AddOption (indentOptions, null, GettextCatalog.GetString ("Statements"), null);
- AddOption (indentOptions, category, "IndentBlocks", GettextCatalog.GetString ("within blocks"), spaceExample);
- AddOption (indentOptions, category, "IndentSwitchBody", GettextCatalog.GetString ("Indent 'switch' body"), spaceExample);
- AddOption (indentOptions, category, "IndentCaseBody", GettextCatalog.GetString ("Indent 'case' body"), spaceExample);
- AddOption (indentOptions, category, "IndentBreakStatements", GettextCatalog.GetString ("Indent 'break' statements"), spaceExample);
- AddOption (indentOptions, category, "IndentPreprocessorDirectives", GettextCatalog.GetString ("Indent pre processor directives"),
- @"#define DEBUG
-class Test {
- #if DEBUG
- void Example ()
- {
- }
- #endif
-}
-");
- AddOption (indentOptions, category, "IndentBlocksInsideExpressions", GettextCatalog.GetString ("Indent blocks inside expressions"),
- @"
-class Test
-{
- void Example ()
- {
- Test(delegate {
- Call ();
- });
- }
-}
-");
- AddOption (indentOptions, category, "AlignEmbeddedStatements", GettextCatalog.GetString ("Align embedded statements"), "class AClass { void AMethod () { if (a) if (b) { int c; } } } ");
+
+ AddOption (indentationOptions, "IndentBlock", GettextCatalog.GetString ("Indent block contents"), "namespace Test { class AClass { void Method () { int x; int y; } } }");
+ AddOption (indentationOptions, "IndentBraces", GettextCatalog.GetString ("Indent open and close braces"), "class AClass { int aField; void AMethod () {}}");
+ AddOption (indentationOptions, "IndentSwitchSection", GettextCatalog.GetString ("Indent case contents"), "class AClass { void Method (int x) { switch (x) { case 1: break; } } }");
+ AddOption (indentationOptions, "IndentSwitchCaseSection", GettextCatalog.GetString ("Indent case labels"), "class AClass { void Method (int x) { switch (x) { case 1: break; } } }");
+ AddOption (indentationOptions, "LabelPositioning", GettextCatalog.GetString ("Label indentation"), "enum AEnum { A, B, C }");
treeviewIndentOptions.ExpandAll ();
#endregion
- #region Brace options
- bacePositionOptions = new TreeStore (typeof(string), typeof(string), typeof(string), typeof(bool), typeof(bool));
+ #region New line options
+ newLineOptions = new TreeStore (typeof(string), typeof(string), typeof(string), typeof(bool), typeof(bool));
column = new TreeViewColumn ();
// pixbuf column
@@ -582,10 +200,10 @@ class Test
column.PackStart (cellRendererText, true);
column.SetAttributes (cellRendererText, "text", 1);
- treeviewBracePositions.Model = bacePositionOptions;
- treeviewBracePositions.HeadersVisible = false;
- treeviewBracePositions.Selection.Changed += TreeSelectionChanged;
- treeviewBracePositions.AppendColumn (column);
+ treeviewNewLines.Model = newLineOptions;
+ treeviewNewLines.HeadersVisible = false;
+ treeviewNewLines.Selection.Changed += TreeSelectionChanged;
+ treeviewNewLines.AppendColumn (column);
column = new TreeViewColumn ();
cellRendererCombo = new CellRendererCombo ();
@@ -595,7 +213,7 @@ class Test
cellRendererCombo.Model = ComboBoxStore;
cellRendererCombo.HasEntry = false;
cellRendererCombo.Editable = !profile.IsBuiltIn;
- cellRendererCombo.Edited += new ComboboxEditedHandler (this, bacePositionOptions).ComboboxEdited;
+ cellRendererCombo.Edited += new ComboboxEditedHandler (this, newLineOptions).ComboboxEdited;
column.PackStart (cellRendererCombo, false);
column.SetAttributes (cellRendererCombo, "visible", comboVisibleColumn);
@@ -604,49 +222,103 @@ class Test
cellRendererToggle = new CellRendererToggle ();
cellRendererToggle.Activatable = !profile.IsBuiltIn;
cellRendererToggle.Ypad = 1;
- cellRendererToggle.Toggled += new CellRendererToggledHandler (this, treeviewBracePositions, bacePositionOptions).Toggled;
+ cellRendererToggle.Toggled += new CellRendererToggledHandler (this, treeviewNewLines, newLineOptions).Toggled;
column.PackStart (cellRendererToggle, false);
column.SetAttributes (cellRendererToggle, "visible", toggleVisibleColumn);
column.SetCellDataFunc (cellRendererToggle, ToggleDataFunc);
- treeviewBracePositions.AppendColumn (column);
-
- AddOption (bacePositionOptions, "NamespaceBraceStyle", GettextCatalog.GetString ("Namespace declaration"), "namespace TestNameSpace {}");
-
- AddOption (bacePositionOptions, "ClassBraceStyle", GettextCatalog.GetString ("Class declaration"), "class ClassDeclaration {}");
- AddOption (bacePositionOptions, "InterfaceBraceStyle", GettextCatalog.GetString ("Interface declaration"), "interface InterfaceDeclaraction {}");
- AddOption (bacePositionOptions, "StructBraceStyle", GettextCatalog.GetString ("Struct declaration"), "struct StructDeclaration {}");
- AddOption (bacePositionOptions, "EnumBraceStyle", GettextCatalog.GetString ("Enum declaration"), "enum EnumDeclaration { A, B, C}");
-
- AddOption (bacePositionOptions, "MethodBraceStyle", GettextCatalog.GetString ("Method declaration"), "class ClassDeclaration { void MyMethod () {} }");
- AddOption (bacePositionOptions, "AnonymousMethodBraceStyle", GettextCatalog.GetString ("Anonymous methods"), "class ClassDeclaration { void MyMethod () { MyEvent += delegate (object sender, EventArgs e) { if (true) Console.WriteLine (\"Hello World\"); }; } }");
- AddOption (bacePositionOptions, "ConstructorBraceStyle", GettextCatalog.GetString ("Constructor declaration"), "class ClassDeclaration { public ClassDeclaration () {} }");
- AddOption (bacePositionOptions, "DestructorBraceStyle", GettextCatalog.GetString ("Destructor declaration"), "class ClassDeclaration { ~ClassDeclaration () {} }");
-
- AddOption (bacePositionOptions, "StatementBraceStyle", GettextCatalog.GetString ("Statements"), spaceExample);
-
- category = AddOption (bacePositionOptions, "PropertyBraceStyle", GettextCatalog.GetString ("Property declaration"), propertyExample);
- AddOption (bacePositionOptions, category, "AutoPropertyFormatting", GettextCatalog.GetString ("Allow automatic property in one line"), propertyExample);
- AddOption (bacePositionOptions, category, "SimplePropertyFormatting", GettextCatalog.GetString ("Allow simple property in one line"), propertyExample);
+ treeviewNewLines.AppendColumn (column);
+ var category = AddOption (newLineOptions, null, GettextCatalog.GetString ("New line options for braces"), null);
+ AddOption (newLineOptions, category, "NewLinesForBracesInTypes", GettextCatalog.GetString ("Place open brace on new line for types"), @"class Example
+{
+}");
+ AddOption (newLineOptions, category, "NewLinesForBracesInMethods", GettextCatalog.GetString ("Place open brace on new line for methods"), @"void Example()
+{
+}");
+ AddOption (newLineOptions, category, "NewLinesForBracesInAnonymousMethods", GettextCatalog.GetString ("Place open brace on new line for anonymous methods"), @"void Example()
+{
+ var del = new delegate (int i, int j) {
+ };
+}");
+ AddOption (newLineOptions, category, "NewLinesForBracesInControlBlocks", GettextCatalog.GetString ("Place open brace on new line for control blocks"), @"void Example()
+{
+ if (true)
+ {
+ }
+}");
+ AddOption (newLineOptions, category, "NewLinesForBracesInAnonymousTypes", GettextCatalog.GetString ("Place open brace on new line for anonymous types"), @"void Example()
+{
+ var c = new
+ {
+ A = 1,
+ B = 2
+ };
+}");
+ AddOption (newLineOptions, category, "NewLinesForBracesInObjectInitializers", GettextCatalog.GetString ("Place open brace on new line for object initializers"), @"void Example()
+{
+ new MyObject
+ {
+ A = 1,
+ B = 2
+ };
+}");
+ AddOption (newLineOptions, category, "NewLinesForBracesInLambdaExpressionBody", GettextCatalog.GetString ("Place open brace on new line for lambda expression"), @"void Example()
+{
+ Action act = () =>
+ {
+ };
+}");
- AddOption (bacePositionOptions, category, "PropertyGetBraceStyle", GettextCatalog.GetString ("Get declaration"), propertyExample);
- AddOption (bacePositionOptions, category, "SimpleGetBlockFormatting", GettextCatalog.GetString ("Allow one line get"), propertyExample);
- AddOption (bacePositionOptions, category, "PropertySetBraceStyle", GettextCatalog.GetString ("Set declaration"), propertyExample);
- AddOption (bacePositionOptions, category, "SimpleSetBlockFormatting", GettextCatalog.GetString ("Allow one line set"), propertyExample);
-
-
- category = AddOption (bacePositionOptions, "EventBraceStyle", GettextCatalog.GetString ("Event declaration"), eventExample);
- AddOption (bacePositionOptions, category, "EventAddBraceStyle", GettextCatalog.GetString ("Add declaration"), eventExample);
- AddOption (bacePositionOptions, category, "AllowEventAddBlockInline", GettextCatalog.GetString ("Allow one line add"), eventExample);
- AddOption (bacePositionOptions, category, "EventRemoveBraceStyle", GettextCatalog.GetString ("Remove declaration"), eventExample);
- AddOption (bacePositionOptions, category, "AllowEventRemoveBlockInline", GettextCatalog.GetString ("Allow one line remove"), eventExample);
-
- treeviewBracePositions.ExpandAll ();
+ category = AddOption (newLineOptions, null, GettextCatalog.GetString ("New line options for keywords"), null);
+ AddOption (newLineOptions, category, "NewLineForElse", GettextCatalog.GetString ("Place \"else\" on new line"), @"void Example()
+{
+ if (true) {
+ // ...
+ } else {
+ // ...
+ }
+}");
+ AddOption (newLineOptions, category, "NewLineForCatch", GettextCatalog.GetString ("Place \"catch\" on new line"), @"void Example()
+{
+ try {
+ } catch {
+ } finally {
+ }
+}");
+ AddOption (newLineOptions, category, "NewLineForFinally", GettextCatalog.GetString ("Place \"finally\" on new line"), @"void Example()
+{
+ try {
+ } catch {
+ } finally {
+ }
+}");
+
+ category = AddOption (newLineOptions, null, GettextCatalog.GetString ("New line options for expressions"), null);
+ AddOption (newLineOptions, category, "NewLineForMembersInObjectInit", GettextCatalog.GetString ("Place members in object initializers on new line"), @"void Example()
+{
+ new MyObject {
+ A = 1,
+ B = 2
+ };
+}");
+ AddOption (newLineOptions, category, "NewLineForMembersInAnonymousTypes", GettextCatalog.GetString ("Place members in anonymous types on new line"), @"void Example()
+{
+ var c = new
+ {
+ A = 1,
+ B = 2
+ };
+}");
+ AddOption (newLineOptions, category, "NewLineForClausesInQuery", GettextCatalog.GetString ("Place query expression clauses on new line"), @"void Example()
+{
+ from o in col select o.Foo;
+}");
+ treeviewNewLines.ExpandAll ();
#endregion
- #region New line options
- newLineOptions = new TreeStore (typeof(string), typeof(string), typeof(string), typeof(bool), typeof(bool));
+ #region Spacing options
+ spacingOptions = new TreeStore (typeof(string), typeof(string), typeof(string), typeof(bool), typeof(bool));
column = new TreeViewColumn ();
// pixbuf column
@@ -658,10 +330,10 @@ class Test
column.PackStart (cellRendererText, true);
column.SetAttributes (cellRendererText, "text", 1);
- treeviewNewLines.Model = newLineOptions;
- treeviewNewLines.HeadersVisible = false;
- treeviewNewLines.Selection.Changed += TreeSelectionChanged;
- treeviewNewLines.AppendColumn (column);
+ treeviewSpacing.Model = spacingOptions;
+ treeviewSpacing.HeadersVisible = false;
+ treeviewSpacing.Selection.Changed += TreeSelectionChanged;
+ treeviewSpacing.AppendColumn (column);
column = new TreeViewColumn ();
cellRendererCombo = new CellRendererCombo ();
@@ -671,7 +343,7 @@ class Test
cellRendererCombo.Model = ComboBoxStore;
cellRendererCombo.HasEntry = false;
cellRendererCombo.Editable = !profile.IsBuiltIn;
- cellRendererCombo.Edited += new ComboboxEditedHandler (this, newLineOptions).ComboboxEdited;
+ cellRendererCombo.Edited += new ComboboxEditedHandler (this, spacingOptions).ComboboxEdited;
column.PackStart (cellRendererCombo, false);
column.SetAttributes (cellRendererCombo, "visible", comboVisibleColumn);
@@ -680,63 +352,137 @@ class Test
cellRendererToggle = new CellRendererToggle ();
cellRendererToggle.Activatable = !profile.IsBuiltIn;
cellRendererToggle.Ypad = 1;
- cellRendererToggle.Toggled += new CellRendererToggledHandler (this, treeviewNewLines, newLineOptions).Toggled;
+ cellRendererToggle.Toggled += new CellRendererToggledHandler (this, treeviewSpacing, spacingOptions).Toggled;
column.PackStart (cellRendererToggle, false);
column.SetAttributes (cellRendererToggle, "visible", toggleVisibleColumn);
column.SetCellDataFunc (cellRendererToggle, ToggleDataFunc);
- treeviewNewLines.AppendColumn (column);
+ treeviewSpacing.AppendColumn (column);
- AddOption (newLineOptions, "ElseNewLinePlacement", GettextCatalog.GetString ("Place 'else' on new line"), simpleIf);
- AddOption (newLineOptions, "ElseIfNewLinePlacement", GettextCatalog.GetString ("Place 'else if' on new line"), simpleIf);
- AddOption (newLineOptions, "CatchNewLinePlacement", GettextCatalog.GetString ("Place 'catch' on new line"), simpleCatch);
- AddOption (newLineOptions, "FinallyNewLinePlacement", GettextCatalog.GetString ("Place 'finally' on new line"), simpleCatch);
- AddOption (newLineOptions, "WhileNewLinePlacement", GettextCatalog.GetString ("Place 'while' on new line"), simpleDoWhile);
- AddOption (newLineOptions, "ArrayInitializerWrapping", GettextCatalog.GetString ("Place array initializers on new line"), simpleArrayInitializer);
- AddOption (newLineOptions, "EmbeddedStatementPlacement", GettextCatalog.GetString ("Place embedded statements on new line"), @"class Test
+ category = AddOption (spacingOptions, null, GettextCatalog.GetString ("Set spacing for method declarations"), null);
+ AddOption (spacingOptions, category, "SpacingAfterMethodDeclarationName", GettextCatalog.GetString ("Insert space between method name and its opening parenthesis"),
+ @"void Example()
{
- public void Example ()
- {
- if (true)
- Call ();
-
- foreach (var o in col) DoSomething (o);
- }
}");
- string constructorInitializer=@"class Test
+
+ AddOption (spacingOptions, category, "SpaceWithinMethodDeclarationParenthesis", GettextCatalog.GetString ("Insert space withing argument list parentheses"),
+ @"void Example(int i, int j)
{
+}");
+ AddOption (spacingOptions, category, "SpaceBetweenEmptyMethodDeclarationParentheses", GettextCatalog.GetString ("Insert space within empty argument list parentheses"), @"void Example()
+{
+}");
- public Test () : base ()
- {
+ category = AddOption (spacingOptions, null, GettextCatalog.GetString ("Set spacing for method calls"), null);
+ AddOption (spacingOptions, category, "SpaceAfterMethodCallName", GettextCatalog.GetString ("Insert space between method name and its opening parenthesis"), @"void Example()
+{
+ Test();
+}");
+ AddOption (spacingOptions, category, "SpaceWithinMethodCallParentheses", GettextCatalog.GetString ("Insert space withing argument list parentheses"), @"void Example()
+{
+ Test(1, 2);
+}");
+ AddOption (spacingOptions, category, "SpaceBetweenEmptyMethodCallParentheses", GettextCatalog.GetString ("Insert space within empty argument list parentheses"), @"void Example()
+{
+ Test();
+}");
+ category = AddOption (spacingOptions, null, GettextCatalog.GetString ("Set other spacing options"), null);
+ AddOption (spacingOptions, category, "SpaceAfterControlFlowStatementKeyword", GettextCatalog.GetString ("Insert space after keywords in control flow statements"), @"void Example()
+{
+ if (condition)
+ {
}
+}");
- public Test ()
- : base ()
+ AddOption (spacingOptions, category, "SpaceWithinExpressionParentheses", GettextCatalog.GetString ("Insert space within parentheses of expressions"), @"void Example()
+{
+ i = (5 + 3) * 2;
+}");
+ AddOption (spacingOptions, category, "SpaceWithinCastParentheses", GettextCatalog.GetString ("Insert space within parentheses of type casts"), @"void Example()
+{
+ test = (ITest)o;
+}");
+ AddOption (spacingOptions, category, "SpaceWithinOtherParentheses", GettextCatalog.GetString ("Insert space within parentheses of control flow statements"), @"void Example()
+{
+ if (condition)
{
-
}
+}");
- public Test () :
- base ()
- {
+ AddOption (spacingOptions, category, "SpaceAfterCast", GettextCatalog.GetString ("Insert space after casts"), @"void Example()
+{
+ test = (ITest)o;
+}");
+ AddOption (spacingOptions, category, "SpacesIgnoreAroundVariableDeclaration", GettextCatalog.GetString ("Ignore spaces in declaration statements"), @"void Example()
+{
+ int x=5;
+}");
- }
+ category = AddOption (spacingOptions, null, GettextCatalog.GetString ("Set spacing for brackets"), null);
+ AddOption (spacingOptions, category, "SpaceBeforeOpenSquareBracket", GettextCatalog.GetString ("Insert space before open square bracket"), @"void Example()
+{
+ i[5] = 3;
+}");
+ AddOption (spacingOptions, category, "SpaceBetweenEmptySquareBrackets", GettextCatalog.GetString ("Insert space within empty square brackets"), @"void Example()
+{
+ new int[] {1, 2};
+}");
+ AddOption (spacingOptions, category, "SpaceWithinSquareBrackets", GettextCatalog.GetString ("Insert space within square brackets"), @"void Example()
+{
+ i[5] = 3;
+}");
- public Test ()
- :
- base ()
+ category = AddOption (spacingOptions, null, GettextCatalog.GetString ("Set spacing for brackets"), null);
+ AddOption (spacingOptions, category, "SpaceAfterColonInBaseTypeDeclaration", GettextCatalog.GetString ("Insert space after colon for base or interface in type declaration"), @"class Foo : Bar
+{
+}");
+ AddOption (spacingOptions, category, "SpaceAfterComma", GettextCatalog.GetString ("Insert space after comma"), @"void Example()
+{
+ for (int i =0; i < 10, i >5;i++)
{
-
}
-}";
- AddOption (newLineOptions, "NewLineBeforeConstructorInitializerColon", GettextCatalog.GetString("Place constructor initializer ':' on new line"), constructorInitializer);
- AddOption (newLineOptions, "NewLineAfterConstructorInitializerColon", GettextCatalog.GetString("Place constructor initializer 'base/this' on new line"), constructorInitializer);
- treeviewNewLines.ExpandAll ();
+}");
+ AddOption (spacingOptions, category, "SpaceAfterDot", GettextCatalog.GetString ("Insert space after dot"), @"void Example()
+{
+ Foo.Bar.Test();
+}");
+ AddOption (spacingOptions, category, "SpaceAfterSemicolonsInForStatement", GettextCatalog.GetString ("Insert space after semicolon in \"for\" statement"), @"void Example()
+{
+ for (int i = 0; i< 10; i++)
+ {
+ }
+}");
+ AddOption (spacingOptions, category, "SpaceBeforeColonInBaseTypeDeclaration", GettextCatalog.GetString ("Insert space before colon for base or interface in type declaration"), @"class Foo : Bar
+{
+}");
+ AddOption (spacingOptions, category, "SpaceBeforeComma", GettextCatalog.GetString ("Insert space before comma"), @"void Example()
+{
+ for (int i =0; i < 10, i >5;i++)
+ {
+ }
+}");
+ AddOption (spacingOptions, category, "SpaceBeforeDot", GettextCatalog.GetString ("Insert space before dot"), @"void Example()
+{
+ Foo.Bar.Test();
+}");
+ AddOption (spacingOptions, category, "SpaceBeforeSemicolonsInForStatement", GettextCatalog.GetString ("Insert space before semicolon in \"for\" statement"), @"void Example()
+{
+ for (int i = 0; i< 10; i++)
+ {
+ }
+}");
+
+ AddOption (spacingOptions, category, "SpacingAroundBinaryOperator", GettextCatalog.GetString ("Set spacing for operators"), @"void Example()
+{
+ i = (5 + 3) * 2;
+}");
+
+ treeviewSpacing.ExpandAll ();
#endregion
-
- #region Wrapping options
- wrappingOptions = new TreeStore (typeof(string), typeof(string), typeof(string), typeof(bool), typeof(bool));
+
+ #region Style options
+ styleOptions = new TreeStore (typeof(string), typeof(string), typeof(string), typeof(bool), typeof(bool));
column = new TreeViewColumn ();
// pixbuf column
@@ -749,10 +495,10 @@ class Test
column.SetAttributes (cellRendererText, "text", 1);
- treeviewWrappingCategory.Model = wrappingOptions;
- treeviewWrappingCategory.HeadersVisible = false;
- treeviewWrappingCategory.Selection.Changed += TreeSelectionChanged;
- treeviewWrappingCategory.AppendColumn (column);
+ treeviewStyle.Model = styleOptions;
+ treeviewStyle.HeadersVisible = false;
+ treeviewStyle.Selection.Changed += TreeSelectionChanged;
+ treeviewStyle.AppendColumn (column);
column = new TreeViewColumn ();
cellRendererCombo = new CellRendererCombo ();
@@ -762,7 +508,7 @@ class Test
cellRendererCombo.Model = ComboBoxStore;
cellRendererCombo.HasEntry = false;
cellRendererCombo.Editable = !profile.IsBuiltIn;
- cellRendererCombo.Edited += new ComboboxEditedHandler (this, wrappingOptions).ComboboxEdited;
+ cellRendererCombo.Edited += new ComboboxEditedHandler (this, styleOptions).ComboboxEdited;
column.PackStart (cellRendererCombo, false);
column.SetAttributes (cellRendererCombo, "visible", comboVisibleColumn);
@@ -771,59 +517,37 @@ class Test
cellRendererToggle = new CellRendererToggle ();
cellRendererToggle.Activatable = !profile.IsBuiltIn;
cellRendererToggle.Ypad = 1;
- cellRendererToggle.Toggled += new CellRendererToggledHandler (this, treeviewNewLines, wrappingOptions).Toggled;
+ cellRendererToggle.Toggled += new CellRendererToggledHandler (this, treeviewSpacing, styleOptions).Toggled;
column.PackStart (cellRendererToggle, false);
column.SetAttributes (cellRendererToggle, "visible", toggleVisibleColumn);
column.SetCellDataFunc (cellRendererToggle, ToggleDataFunc);
- treeviewWrappingCategory.AppendColumn (column);
-
- category = AddOption (wrappingOptions, null, GettextCatalog.GetString ("Method declarations"), null);
- AddOption (wrappingOptions, category, "MethodDeclarationParameterWrapping", GettextCatalog.GetString ("Parameters"), longMethodDeclaration);
- AddOption (wrappingOptions, category, "NewLineAferMethodDeclarationOpenParentheses", GettextCatalog.GetString ("New line after open parentheses"), longMethodDeclaration);
- AddOption (wrappingOptions, category, "MethodDeclarationClosingParenthesesOnNewLine", GettextCatalog.GetString ("New line before closing parentheses"), longMethodDeclaration);
- AddOption (wrappingOptions, category, "AlignToFirstMethodDeclarationParameter", GettextCatalog.GetString ("Align to first parameter"), longMethodDeclaration);
-
- category = AddOption (wrappingOptions, null, GettextCatalog.GetString ("Method calls"), null);
- AddOption (wrappingOptions, category, "MethodCallArgumentWrapping", GettextCatalog.GetString ("Arguments"), longMethodCall);
- AddOption (wrappingOptions, category, "NewLineAferMethodCallOpenParentheses", GettextCatalog.GetString ("New line after open parentheses"), longMethodCall);
- AddOption (wrappingOptions, category, "MethodCallClosingParenthesesOnNewLine", GettextCatalog.GetString ("New line before closing parentheses"), longMethodCall);
- AddOption (wrappingOptions, category, "AlignToFirstMethodCallArgument", GettextCatalog.GetString ("Align to first argument"), longMethodCall);
-
- category = AddOption (wrappingOptions, null, GettextCatalog.GetString ("Indexer declarations"), null);
- AddOption (wrappingOptions, category, "IndexerDeclarationParameterWrapping", GettextCatalog.GetString ("Parameters"), longIndexerDeclaration);
- AddOption (wrappingOptions, category, "NewLineAferIndexerDeclarationOpenBracket", GettextCatalog.GetString ("New line after open parentheses"), longIndexerDeclaration);
- AddOption (wrappingOptions, category, "IndexerDeclarationClosingBracketOnNewLine", GettextCatalog.GetString ("New line before closing parentheses"), longIndexerDeclaration);
- AddOption (wrappingOptions, category, "AlignToFirstIndexerDeclarationParameter", GettextCatalog.GetString ("Align to first parameter"), longIndexerDeclaration);
+ treeviewStyle.AppendColumn (column);
- category = AddOption (wrappingOptions, null, GettextCatalog.GetString ("Indexer usage"), null);
- AddOption (wrappingOptions, category, "IndexerArgumentWrapping", GettextCatalog.GetString ("Arguments"), longIndexer);
- AddOption (wrappingOptions, category, "NewLineAferIndexerOpenBracket", GettextCatalog.GetString ("New line after open bracket"), longIndexer);
- AddOption (wrappingOptions, category, "IndexerClosingBracketOnNewLine", GettextCatalog.GetString ("New line before closing bracket"), longIndexer);
- AddOption (wrappingOptions, category, "AlignToFirstIndexerArgument", GettextCatalog.GetString ("Align to first parameter"), longIndexer);
+ AddOption (styleOptions, category, null, GettextCatalog.GetString ("Qualify member access with 'this'"), null);
+ AddOption (styleOptions, category, null, GettextCatalog.GetString ("Use 'var' when generating locals"), null);
- treeviewWrappingCategory.ExpandAll ();
+ treeviewStyle.ExpandAll ();
#endregion
- #region White space options
- whiteSpaceOptions = new TreeStore (typeof (string), typeof (string), typeof (string), typeof(bool), typeof(bool));
-
-
+ #region Wrapping options
+ wrappingOptions = new TreeStore (typeof(string), typeof(string), typeof(string), typeof(bool), typeof(bool));
+
column = new TreeViewColumn ();
// pixbuf column
column.PackStart (pixbufCellRenderer, false);
column.SetCellDataFunc (pixbufCellRenderer, RenderIcon);
-
+
// text column
cellRendererText.Ypad = 1;
column.PackStart (cellRendererText, true);
column.SetAttributes (cellRendererText, "text", 1);
-
- treeviewInsertWhiteSpaceCategory.Model = whiteSpaceOptions;
- treeviewInsertWhiteSpaceCategory.HeadersVisible = false;
- treeviewInsertWhiteSpaceCategory.Selection.Changed += TreeSelectionChanged;
- treeviewInsertWhiteSpaceCategory.AppendColumn (column);
-
+
+ treeviewWrapping.Model = wrappingOptions;
+ treeviewWrapping.HeadersVisible = false;
+ treeviewWrapping.Selection.Changed += TreeSelectionChanged;
+ treeviewWrapping.AppendColumn (column);
+
column = new TreeViewColumn ();
cellRendererCombo = new CellRendererCombo ();
cellRendererCombo.Ypad = 1;
@@ -832,334 +556,26 @@ class Test
cellRendererCombo.Model = ComboBoxStore;
cellRendererCombo.HasEntry = false;
cellRendererCombo.Editable = !profile.IsBuiltIn;
- cellRendererCombo.Edited += new ComboboxEditedHandler (this, whiteSpaceOptions).ComboboxEdited;
+ cellRendererCombo.Edited += new ComboboxEditedHandler (this, wrappingOptions).ComboboxEdited;
column.PackStart (cellRendererCombo, false);
column.SetAttributes (cellRendererCombo, "visible", comboVisibleColumn);
column.SetCellDataFunc (cellRendererCombo, ComboboxDataFunc);
-
+
cellRendererToggle = new CellRendererToggle ();
cellRendererToggle.Activatable = !profile.IsBuiltIn;
cellRendererToggle.Ypad = 1;
- cellRendererToggle.Toggled += new CellRendererToggledHandler (this, treeviewInsertWhiteSpaceCategory, whiteSpaceOptions).Toggled;
+ cellRendererToggle.Toggled += new CellRendererToggledHandler (this, treeviewSpacing, wrappingOptions).Toggled;
column.PackStart (cellRendererToggle, false);
column.SetAttributes (cellRendererToggle, "visible", toggleVisibleColumn);
column.SetCellDataFunc (cellRendererToggle, ToggleDataFunc);
-
- treeviewInsertWhiteSpaceCategory.AppendColumn (column);
-
- string example = @"class Example {
- void Test ()
- {
- }
-
- void Test (int a, int b, int c)
- {
- }
-}";
- category = AddOption (whiteSpaceOptions, null, GettextCatalog.GetString ("Declarations"), example);
- AddOption (whiteSpaceOptions, category, "BeforeMethodDeclarationParentheses", GettextCatalog.GetString ("before opening parenthesis"), example);
- AddOption (whiteSpaceOptions, category, "WithinMethodDeclarationParentheses", GettextCatalog.GetString ("within parenthesis"), example);
- AddOption (whiteSpaceOptions, category, "BetweenEmptyMethodDeclarationParentheses", GettextCatalog.GetString ("between empty parenthesis"), example);
- AddOption (whiteSpaceOptions, category, "BeforeMethodDeclarationParameterComma", GettextCatalog.GetString ("before comma in parenthesis"), example);
- AddOption (whiteSpaceOptions, category, "AfterMethodDeclarationParameterComma", GettextCatalog.GetString ("after comma in parenthesis"), example);
-
- example = @"class Example {
- int a, b, c;
-}";
- category = AddOption (whiteSpaceOptions, null, GettextCatalog.GetString ("Fields"), example);
- AddOption (whiteSpaceOptions, category, "BeforeFieldDeclarationComma", GettextCatalog.GetString ("before comma in multiple field declarations"), example);
- AddOption (whiteSpaceOptions, category, "AfterFieldDeclarationComma", GettextCatalog.GetString ("after comma in multiple field declarations"), example);
-
- example = @"class Example {
- Example ()
- {
- }
-
- Example (int a, int b, int c)
- {
- }
-}";
- category = AddOption (whiteSpaceOptions, null, GettextCatalog.GetString ("Constructors"), example);
- AddOption (whiteSpaceOptions, category, "BeforeConstructorDeclarationParentheses", GettextCatalog.GetString ("before opening parenthesis"), example);
- AddOption (whiteSpaceOptions, category, "WithinConstructorDeclarationParentheses", GettextCatalog.GetString ("within parenthesis"), example);
- AddOption (whiteSpaceOptions, category, "BetweenEmptyConstructorDeclarationParentheses", GettextCatalog.GetString ("between empty parenthesis"), example);
- AddOption (whiteSpaceOptions, category, "BeforeConstructorDeclarationParameterComma", GettextCatalog.GetString ("before comma in parenthesis"), example);
- AddOption (whiteSpaceOptions, category, "AfterConstructorDeclarationParameterComma", GettextCatalog.GetString ("after comma in parenthesis"), example);
-
- example = @"class Example {
- public int this[int a, int b] {
- get {
- return a + b;
- }
- }
-}";
- category = AddOption (whiteSpaceOptions, null, GettextCatalog.GetString ("Indexer"), example);
- AddOption (whiteSpaceOptions, category, "BeforeIndexerDeclarationBracket", GettextCatalog.GetString ("before opening bracket"), example);
- AddOption (whiteSpaceOptions, category, "WithinIndexerDeclarationBracket", GettextCatalog.GetString ("within brackets"), example);
- AddOption (whiteSpaceOptions, category, "BeforeIndexerDeclarationParameterComma", GettextCatalog.GetString ("before comma in brackets"), example);
- AddOption (whiteSpaceOptions, category, "AfterIndexerDeclarationParameterComma", GettextCatalog.GetString ("after comma in brackets"), example);
-
- example = @"delegate void FooBar (int a, int b, int c);
-delegate void BarFoo ();
-";
-
- category = AddOption (whiteSpaceOptions, null, GettextCatalog.GetString ("Delegates"), example);
- AddOption (whiteSpaceOptions, category, "BeforeDelegateDeclarationParentheses", GettextCatalog.GetString ("before opening parenthesis"), example);
- AddOption (whiteSpaceOptions, category, "WithinDelegateDeclarationParentheses", GettextCatalog.GetString ("within parenthesis"), example);
- AddOption (whiteSpaceOptions, category, "BetweenEmptyDelegateDeclarationParentheses", GettextCatalog.GetString ("between empty parenthesis"), example);
- AddOption (whiteSpaceOptions, category, "BeforeDelegateDeclarationParameterComma", GettextCatalog.GetString ("before comma in parenthesis"), example);
- AddOption (whiteSpaceOptions, category, "AfterDelegateDeclarationParameterComma", GettextCatalog.GetString ("after comma in parenthesis"), example);
-
- var upperCategory = AddOption (whiteSpaceOptions, null, GettextCatalog.GetString ("Statements"), null);
-
- category = AddOption (whiteSpaceOptions, upperCategory, null, GettextCatalog.GetString ("'if'"), simpleIf);
- AddOption (whiteSpaceOptions, category, "IfParentheses", GettextCatalog.GetString ("before opening parenthesis"), simpleIf);
- AddOption (whiteSpaceOptions, category, "WithinIfParentheses", GettextCatalog.GetString ("within parenthesis"), simpleIf);
-
- category = AddOption (whiteSpaceOptions, upperCategory, null, GettextCatalog.GetString ("'while'"), simpleWhile);
- AddOption (whiteSpaceOptions, category, "WhileParentheses", GettextCatalog.GetString ("before opening parenthesis"), simpleWhile);
- AddOption (whiteSpaceOptions, category, "WithinWhileParentheses", GettextCatalog.GetString ("within parenthesis"), simpleWhile);
-
- category = AddOption (whiteSpaceOptions, upperCategory, null, GettextCatalog.GetString ("'for'"), simpleFor);
- AddOption (whiteSpaceOptions, category, "ForParentheses", GettextCatalog.GetString ("before opening parenthesis"), simpleFor);
- AddOption (whiteSpaceOptions, category, "WithinForParentheses", GettextCatalog.GetString ("within parenthesis"), simpleFor);
- AddOption (whiteSpaceOptions, category, "SpacesBeforeForSemicolon", GettextCatalog.GetString ("before semicolon"), simpleFor);
- AddOption (whiteSpaceOptions, category, "SpacesAfterForSemicolon", GettextCatalog.GetString ("after semicolon"), simpleFor);
-
- category = AddOption (whiteSpaceOptions, upperCategory, null, GettextCatalog.GetString ("'foreach'"), simpleForeach);
- AddOption (whiteSpaceOptions, category, "ForeachParentheses", GettextCatalog.GetString ("before opening parenthesis"), simpleForeach);
- AddOption (whiteSpaceOptions, category, "WithinForEachParentheses", GettextCatalog.GetString ("within parenthesis"), simpleForeach);
-
- category = AddOption (whiteSpaceOptions, upperCategory, null, GettextCatalog.GetString ("'catch'"), simpleCatch);
- AddOption (whiteSpaceOptions, category, "CatchParentheses", GettextCatalog.GetString ("before opening parenthesis"), simpleCatch);
- AddOption (whiteSpaceOptions, category, "WithinCatchParentheses", GettextCatalog.GetString ("within parenthesis"), simpleCatch);
-
- category = AddOption (whiteSpaceOptions, upperCategory, null, GettextCatalog.GetString ("'switch'"), switchExample);
- AddOption (whiteSpaceOptions, category, "SwitchParentheses", GettextCatalog.GetString ("before opening parenthesis"), switchExample);
- AddOption (whiteSpaceOptions, category, "WithinSwitchParentheses", GettextCatalog.GetString ("within parenthesis"), switchExample);
-
- category = AddOption (whiteSpaceOptions, upperCategory, null, GettextCatalog.GetString ("'lock'"), simpleLock);
- AddOption (whiteSpaceOptions, category, "LockParentheses", GettextCatalog.GetString ("before opening parenthesis"), simpleLock);
- AddOption (whiteSpaceOptions, category, "WithinLockParentheses", GettextCatalog.GetString ("within parenthesis"), simpleLock);
-
- category = AddOption (whiteSpaceOptions, upperCategory, null, GettextCatalog.GetString ("'using'"), simpleUsingStatement);
- AddOption (whiteSpaceOptions, category, "UsingParentheses", GettextCatalog.GetString ("before opening parenthesis"), simpleUsingStatement);
- AddOption (whiteSpaceOptions, category, "WithinUsingParentheses", GettextCatalog.GetString ("within parenthesis"), simpleUsingStatement);
-
-
- upperCategory = AddOption (whiteSpaceOptions, null, GettextCatalog.GetString ("Expressions"), null);
-
- example = @"class Example {
- void Test ()
- {
- Console.WriteLine();
- Console.WriteLine(""{0} {1}!"", ""Hello"", ""World"");
- }
-}";
-
- category = AddOption (whiteSpaceOptions, upperCategory, null, GettextCatalog.GetString ("Method invocations"), example);
- AddOption (whiteSpaceOptions, category, "BeforeMethodCallParentheses", GettextCatalog.GetString ("before opening parenthesis"), example);
- AddOption (whiteSpaceOptions, category, "WithinMethodCallParentheses", GettextCatalog.GetString ("within parenthesis"), example);
- AddOption (whiteSpaceOptions, category, "BetweenEmptyMethodCallParentheses", GettextCatalog.GetString ("between empty parenthesis"), example);
- AddOption (whiteSpaceOptions, category, "BeforeMethodCallParameterComma", GettextCatalog.GetString ("before comma in parenthesis"), example);
- AddOption (whiteSpaceOptions, category, "AfterMethodCallParameterComma", GettextCatalog.GetString ("after comma in parenthesis"), example);
-
- category = AddOption (whiteSpaceOptions, upperCategory, null, GettextCatalog.GetString ("Object creation"), example);
- example = @"partial class Example {
- void Test ()
- {
- var anExample = new Example (1, 2, 3);
- var emptyExample = new Example ();
- }
-}";
- AddOption (whiteSpaceOptions, category, "NewParentheses", GettextCatalog.GetString ("before opening parenthesis"), example);
- AddOption (whiteSpaceOptions, category, "WithinNewParentheses", GettextCatalog.GetString ("within parenthesis"), example);
- AddOption (whiteSpaceOptions, category, "BetweenEmptyNewParentheses", GettextCatalog.GetString ("between empty parenthesis"), example);
- AddOption (whiteSpaceOptions, category, "BeforeNewParameterComma", GettextCatalog.GetString ("before comma in parenthesis"), example);
- AddOption (whiteSpaceOptions, category, "AfterNewParameterComma", GettextCatalog.GetString ("after comma in parenthesis"), example);
-
-
- example = @"class Example {
- void Test ()
- {
- a[1,2] = b[3];
- }
-}";
- category = AddOption (whiteSpaceOptions, upperCategory, null, GettextCatalog.GetString ("Element access"), example);
- AddOption (whiteSpaceOptions, category, "SpacesBeforeBrackets", GettextCatalog.GetString ("before opening bracket"), example);
- AddOption (whiteSpaceOptions, category, "SpacesWithinBrackets", GettextCatalog.GetString ("within brackets"), example);
- AddOption (whiteSpaceOptions, category, "BeforeBracketComma", GettextCatalog.GetString ("before comma in brackets"), example);
- AddOption (whiteSpaceOptions, category, "AfterBracketComma", GettextCatalog.GetString ("after comma in brackets"), example);
-
- category = AddOption (whiteSpaceOptions, upperCategory, null, GettextCatalog.GetString ("Parentheses"), operatorExample);
- AddOption (whiteSpaceOptions, category, "WithinParentheses", GettextCatalog.GetString ("within parenthesis"), operatorExample);
-
- example = @"class ClassDeclaration {
- public void Test (object o)
- {
- int i = (int)o;
- }
- }";
- category = AddOption (whiteSpaceOptions, upperCategory, null, GettextCatalog.GetString ("Type cast"), example);
- AddOption (whiteSpaceOptions, category, "WithinCastParentheses", GettextCatalog.GetString ("within parenthesis"), example);
- AddOption (whiteSpaceOptions, category, "SpacesAfterTypecast", GettextCatalog.GetString ("after type cast"), example);
-
- example = @"class ClassDeclaration {
- public void Test ()
- {
- int i = sizeof (ClassDeclaration);
- }
- }";
- category = AddOption (whiteSpaceOptions, upperCategory, null, GettextCatalog.GetString ("'sizeof'"), example);
- AddOption (whiteSpaceOptions, category, "BeforeSizeOfParentheses", GettextCatalog.GetString ("before opening parenthesis"), example);
- AddOption (whiteSpaceOptions, category, "WithinSizeOfParentheses", GettextCatalog.GetString ("within parenthesis"), example);
-
- example = @"class ClassDeclaration {
- public void Test ()
- {
- Type t = typeof (ClassDeclaration);
- }
- }";
- category = AddOption (whiteSpaceOptions, upperCategory, null, GettextCatalog.GetString ("'typeof'"), example);
- AddOption (whiteSpaceOptions, category, "BeforeTypeOfParentheses", GettextCatalog.GetString ("before opening parenthesis"), example);
- AddOption (whiteSpaceOptions, category, "WithinTypeOfParentheses", GettextCatalog.GetString ("within parenthesis"), example);
-
- category = AddOption (whiteSpaceOptions, upperCategory, null, GettextCatalog.GetString ("Around Operators"), operatorExample);
- AddOption (whiteSpaceOptions, category, "AroundAssignmentParentheses", GettextCatalog.GetString ("Assignment (=, +=, -=, ...)"), operatorExample);
- AddOption (whiteSpaceOptions, category, "AroundLogicalOperatorParentheses", GettextCatalog.GetString ("Logical (&&, ||) operators"), operatorExample);
- AddOption (whiteSpaceOptions, category, "AroundEqualityOperatorParentheses", GettextCatalog.GetString ("Equality (==, !=) operators"), operatorExample);
- AddOption (whiteSpaceOptions, category, "AroundRelationalOperatorParentheses", GettextCatalog.GetString ("Relational (<, >, <=, >=) operators"), operatorExample);
- AddOption (whiteSpaceOptions, category, "AroundBitwiseOperatorParentheses", GettextCatalog.GetString ("Bitwise &, |, ^, ~() operators"), operatorExample);
- AddOption (whiteSpaceOptions, category, "AroundAdditiveOperatorParentheses", GettextCatalog.GetString ("Additive (+, -) operators"), operatorExample);
- AddOption (whiteSpaceOptions, category, "AroundMultiplicativeOperatorParentheses", GettextCatalog.GetString ("Multiplicative (*, /, %) operators"), operatorExample);
- AddOption (whiteSpaceOptions, category, "AroundShiftOperatorParentheses", GettextCatalog.GetString ("Shift (<<, >>) operators"), operatorExample);
- AddOption (whiteSpaceOptions, category, "AroundNullCoalescingOperator", GettextCatalog.GetString ("Null coalescing (??) operator"), operatorExample);
- AddOption (whiteSpaceOptions, category, "SpaceAfterUnsafeAddressOfOperator", GettextCatalog.GetString ("Unsafe addressof operator (&)"), @"unsafe class ClassDeclaration {
- public void TestMethod ()
- {
- int* a = &x;
- }
-}");
- AddOption (whiteSpaceOptions, category, "SpaceAfterUnsafeAsteriskOfOperator", GettextCatalog.GetString ("Unsafe asterisk operator (*)"), @"unsafe class ClassDeclaration {
- public void TestMethod ()
- {
- int a = *x;
- }
-}");
- AddOption (whiteSpaceOptions, category, "SpaceAroundUnsafeArrowOperator", GettextCatalog.GetString ("Unsafe arrow operator (->)"), @"unsafe class ClassDeclaration {
- public void TestMethod ()
- {
- x->Foo();
- }
-}");
- category = AddOption (whiteSpaceOptions, upperCategory, null, GettextCatalog.GetString ("Conditional Operator (?:)"), condOpExample);
- AddOption (whiteSpaceOptions, category, "ConditionalOperatorBeforeConditionSpace", GettextCatalog.GetString ("before '?'"), condOpExample);
- AddOption (whiteSpaceOptions, category, "ConditionalOperatorAfterConditionSpace", GettextCatalog.GetString ("after '?'"), condOpExample);
- AddOption (whiteSpaceOptions, category, "ConditionalOperatorBeforeSeparatorSpace", GettextCatalog.GetString ("before ':'"), condOpExample);
- AddOption (whiteSpaceOptions, category, "ConditionalOperatorAfterSeparatorSpace", GettextCatalog.GetString ("after ':'"), condOpExample);
-
- example = @"class ClassDeclaration {
- string[][] field;
- int[] test;
- }";
- category = AddOption (whiteSpaceOptions, upperCategory, null, GettextCatalog.GetString ("Array Declarations"), example);
- AddOption (whiteSpaceOptions, category, "SpacesBeforeArrayDeclarationBrackets", GettextCatalog.GetString ("before opening bracket"), example);
+ treeviewWrapping.AppendColumn (column);
- category = AddOption (whiteSpaceOptions, upperCategory, null, GettextCatalog.GetString ("Other"), example);
- AddOption (whiteSpaceOptions, category, "SpaceBeforeSemicolon", GettextCatalog.GetString ("before semicolon"), example);
+ AddOption (wrappingOptions, "WrappingPreserveSingleLine", GettextCatalog.GetString ("Leave block on single line"), "");
+ AddOption (wrappingOptions, "WrappingKeepStatementsOnSingleLine", GettextCatalog.GetString ("Leave statements and member declarations on the same line"), "");
- /*
- whiteSpaceOptions= new ListStore (typeof (Option), typeof (bool), typeof (bool));
- column = new TreeViewColumn ();
- // text column
- column.PackStart (cellRendererText, true);
- column.SetCellDataFunc (cellRendererText, delegate (TreeViewColumn col, CellRenderer cell, TreeModel model, TreeIter iter) {
- ((CellRendererText)cell).Text = ((Option)model.GetValue (iter, 0)).DisplayName;
- });
- treeviewInsertWhiteSpaceOptions.AppendColumn (column);
-
- column = new TreeViewColumn ();
- cellRendererCombo = new CellRendererCombo ();
- cellRendererCombo.Ypad = 1;
- cellRendererCombo.Mode = CellRendererMode.Editable;
- cellRendererCombo.TextColumn = 1;
- cellRendererCombo.Model = comboBoxStore;
- cellRendererCombo.HasEntry = false;
- cellRendererCombo.Editable = !profile.IsBuiltIn;
-
- cellRendererCombo.Edited += delegate(object o, EditedArgs args) {
- TreeIter iter;
- var model = whiteSpaceOptions;
- if (model.GetIterFromString (out iter, args.Path)) {
- var option = (Option)model.GetValue (iter, 0);
- PropertyInfo info = GetPropertyByName (option.PropertyName);
- if (info == null)
- return;
- var value = Enum.Parse (info.PropertyType, args.NewText);
- info.SetValue (profile, value, null);
- UpdateExample (texteditor.Document.Text);
- }
- };
-
- column.PackStart (cellRendererCombo, false);
- column.SetAttributes (cellRendererCombo, "visible", 2);
- column.SetCellDataFunc (cellRendererCombo, delegate (TreeViewColumn col, CellRenderer cell, TreeModel model, TreeIter iter) {
- ((CellRendererCombo)cell).Text = GetValue (((Option)model.GetValue (iter, 0)).PropertyName).ToString ();
- });
-
- cellRendererToggle = new CellRendererToggle ();
- cellRendererToggle.Activatable = !profile.IsBuiltIn;
- cellRendererToggle.Ypad = 1;
- cellRendererToggle.Toggled += delegate(object o, ToggledArgs args) {
- TreeIter iter;
- var model = whiteSpaceOptions;
- if (model.GetIterFromString (out iter, args.Path)) {
- var option = (Option)model.GetValue (iter, 0);
- PropertyInfo info = GetPropertyByName (option.PropertyName);
- if (info == null || info.PropertyType != typeof(bool))
- return;
- bool value = (bool)info.GetValue (this.profile, null);
- info.SetValue (profile, !value, null);
- UpdateExample (texteditor.Document.Text);
- }
- };
-
- column.PackStart (cellRendererToggle, false);
- column.SetAttributes (cellRendererToggle, "visible", 1);
- column.SetCellDataFunc (cellRendererToggle, delegate (TreeViewColumn col, CellRenderer cell, TreeModel model, TreeIter iter) {
- ((CellRendererToggle)cell).Active = (bool)GetValue (((Option)model.GetValue (iter, 0)).PropertyName);
- });
-
- treeviewInsertWhiteSpaceOptions.AppendColumn (column);
-
- treeviewInsertWhiteSpaceOptions.Model = whiteSpaceOptions;*/
- treeviewInsertWhiteSpaceCategory.ExpandAll ();
- #endregion
-
- #region Blank line options
- entryBeforUsings.Text = profile.BlankLinesBeforeUsings.ToString ();
- entryAfterUsings.Text = profile.BlankLinesAfterUsings.ToString ();
-
- entryBeforeFirstDeclaration.Text = profile.BlankLinesBeforeFirstDeclaration.ToString ();
- entryBetweenTypes.Text = profile.BlankLinesBetweenTypes.ToString ();
-
- entryBetweenFields.Text = profile.BlankLinesBetweenFields.ToString ();
- entryBetweenEvents.Text = profile.BlankLinesBetweenEventFields.ToString ();
- entryBetweenMembers.Text = profile.BlankLinesBetweenMembers.ToString ();
- entryInsideRegion.Text = profile.BlankLinesInsideRegion.ToString ();
- entryAroundRegion.Text = profile.BlankLinesAroundRegion.ToString ();
-
- entryBeforUsings.Changed += HandleEntryBeforUsingsChanged;
- entryAfterUsings.Changed += HandleEntryBeforUsingsChanged;
- entryBeforeFirstDeclaration.Changed += HandleEntryBeforUsingsChanged;
- entryBetweenTypes.Changed += HandleEntryBeforUsingsChanged;
- entryBetweenFields.Changed += HandleEntryBeforUsingsChanged;
- entryBetweenEvents.Changed += HandleEntryBeforUsingsChanged;
- entryBetweenMembers.Changed += HandleEntryBeforUsingsChanged;
- entryAroundRegion.Changed += HandleEntryBeforUsingsChanged;
- entryInsideRegion.Changed += HandleEntryBeforUsingsChanged;
+ treeviewWrapping.ExpandAll ();
#endregion
}
@@ -1169,20 +585,6 @@ delegate void BarFoo ();
return int.TryParse (entry.Text, out newValue) ? newValue : oldValue;
}
- void HandleEntryBeforUsingsChanged (object sender, EventArgs e)
- {
- profile.BlankLinesBeforeUsings = SetFlag (entryBeforUsings, profile.BlankLinesBeforeUsings);
- profile.BlankLinesAfterUsings = SetFlag (entryAfterUsings, profile.BlankLinesAfterUsings);
- profile.BlankLinesBeforeFirstDeclaration = SetFlag (entryBeforeFirstDeclaration, profile.BlankLinesBeforeFirstDeclaration);
- profile.BlankLinesBetweenTypes = SetFlag (entryBetweenTypes, profile.BlankLinesBetweenTypes);
- profile.BlankLinesBetweenFields = SetFlag (entryBetweenFields, profile.BlankLinesBetweenFields);
- profile.BlankLinesBetweenMembers = SetFlag (entryBetweenMembers, profile.BlankLinesBetweenMembers);
- profile.BlankLinesBetweenEventFields = SetFlag (entryBetweenEvents, profile.BlankLinesBetweenMembers);
- profile.BlankLinesAroundRegion = SetFlag (entryAroundRegion, profile.BlankLinesAroundRegion);
- profile.BlankLinesInsideRegion = SetFlag (entryInsideRegion, profile.BlankLinesInsideRegion);
- UpdateExample (blankLineExample);
- }
-
static PropertyInfo GetPropertyByName (string name)
{
PropertyInfo info = typeof(CSharpFormattingPolicy).GetProperty (name);
@@ -1190,8 +592,7 @@ delegate void BarFoo ();
throw new Exception (name + " property not found");
return info;
}
-
-
+
static TreeIter AddOption (TreeStore model, string propertyName, string displayName, string example)
{
bool isBool = false;
@@ -1247,7 +648,10 @@ delegate void BarFoo ();
} else {
text = "";
}
- texteditor.Document.Text = CSharpFormatter.FormatText (profile, null, CSharpFormatter.MimeType, text, 0, text.Length);
+
+ var types = DesktopService.GetMimeTypeInheritanceChain (MonoDevelop.CSharp.Formatting.CSharpFormatter.MimeType);
+ var textPolicy = MonoDevelop.Projects.Policies.PolicyService.GetDefaultPolicy<TextStylePolicy> (types);
+ texteditor.Text = CSharpFormatter.FormatText (profile, textPolicy, CSharpFormatter.MimeType, text, 0, text.Length);
}
static PropertyInfo GetProperty (TreeModel model, TreeIter iter)
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-20 07:34:57 +0300