Skip to content

Commit 06947f1

Browse files
MeychiMeychi
committed
Minor tweaks...
1 parent e72c923 commit 06947f1

File tree

1 file changed

+55
-55
lines changed

1 file changed

+55
-55
lines changed

‎External/Plugins/CodeFormatter/Settings.cs

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ namespace CodeFormatter
1313
public class Settings
1414
{
1515
public const char LineSplitter = '\n';
16-
private bool pref_Flex_UseTabs = true;
1716

1817
/////////////// ActionScript /////////////////////////////////////
1918

19+
private bool pref_Flex_UseTabs = true;
2020
private int pref_AS_SpacesBeforeComma = 0;
2121
private int pref_AS_SpacesAfterComma = 1;
2222
private int pref_AS_SpacesAroundColons = 0;
@@ -160,11 +160,11 @@ public class Settings
160160
public int pref_Flex_IndentSize = 4;
161161
public int pref_Flex_TabSize = 4;
162162
public bool pref_MXML_KeepRelativeIndentInMultilineComments = false;
163-
public int pref_MXML_BlankLinesBeforeComments = 1;
164-
public int pref_MXML_BlankLinesAfterSpecificParentTags = 1;
165-
public int pref_MXML_BlankLinesBetweenSiblingTags = 1;
166-
public int pref_MXML_BlankLinesAfterParentTags = 1;
167-
public int pref_MXML_BlankLinesBeforeClosingTags = 1;
163+
public int pref_MXML_BlankLinesBeforeComments = 0;
164+
public int pref_MXML_BlankLinesAfterSpecificParentTags = 0;
165+
public int pref_MXML_BlankLinesBetweenSiblingTags = 0;
166+
public int pref_MXML_BlankLinesAfterParentTags = 0;
167+
public int pref_MXML_BlankLinesBeforeClosingTags = 0;
168168
public int pref_MXML_TabsInHangingIndent = 1;
169169
public bool pref_MXML_UseSpacesInsideAttributeBraces = true;
170170
public bool pref_MXML_UseFormattingOfBoundAttributes = true;
@@ -181,7 +181,7 @@ public class Settings
181181
private string pref_MXML_TagsCannotFormat = "mx:String,fx:String";
182182
private string pref_MXML_AttrGroups = "";
183183
private string pref_MXML_TagsWithASContent = "";
184-
private string pref_MXML_TagsDoNotFormatInside = "";
184+
private string pref_MXML_TagsDoNotFormatInside = ".*:Model,.*:XML";
185185
private string pref_MXML_ParentTagsWithBlankLinesAfter = "";
186186
private string pref_MXML_SortAttrData = "";
187187

@@ -448,15 +448,6 @@ public bool Pref_AS_CollapseSpacesForAdjacentParens
448448
set { this.pref_AS_CollapseSpacesForAdjacentParens = value; }
449449
}
450450

451-
[DefaultValue(true)]
452-
[Category("ActionScript")]
453-
[DisplayName("Newline After Bindable")]
454-
public bool Pref_AS_NewlineAfterBindable
455-
{
456-
get { return this.pref_AS_NewlineAfterBindable; }
457-
set { this.pref_AS_NewlineAfterBindable = value; }
458-
}
459-
460451
[DefaultValue(1)]
461452
[Category("ActionScript")]
462453
[DisplayName("Spaces After Label")]
@@ -1141,10 +1132,6 @@ public bool Pref_AS_AdvancedWrappingAllParms
11411132
set { this.pref_AS_AdvancedWrappingAllParms = value; }
11421133
}
11431134

1144-
/// <summary>
1145-
/// ////////////////
1146-
/// </summary>
1147-
11481135
[DefaultValue(false)]
11491136
[Category("ActionScript")]
11501137
[DisplayName("Advanced Wrapping First Arg")]
@@ -1235,20 +1222,31 @@ public bool Pref_AS_AdvancedWrappingPreservePhrases
12351222
set { this.pref_AS_AdvancedWrappingPreservePhrases = value; }
12361223
}
12371224

1238-
[Browsable(false)]
1239-
public string Pref_AS_MetaTagsOnSameLineAsTargetFunction
1225+
[DefaultValue("")]
1226+
[Category("ActionScript")]
1227+
[DisplayName("Meta Tags On Same Line As Target Function")]
1228+
public string Pref_AS_MetaTagsOnSameLineAsTargetFunction
12401229
{
12411230
get { return this.pref_AS_MetaTagsOnSameLineAsTargetFunction; }
1242-
set { this.pref_AS_MetaTagsOnSameLineAsTargetFunction = value; }
1231+
set { this.pref_AS_MetaTagsOnSameLineAsTargetFunction = value; }
12431232
}
1244-
1245-
[Browsable(false)]
1233+
1234+
[DefaultValue("")]
1235+
[Category("ActionScript")]
1236+
[DisplayName("Meta Tags On SameLine As Target Property")]
12461237
public string Pref_AS_MetaTagsOnSameLineAsTargetProperty
12471238
{
12481239
get { return this.pref_AS_MetaTagsOnSameLineAsTargetProperty; }
12491240
set { this.pref_AS_MetaTagsOnSameLineAsTargetProperty = value; }
12501241
}
12511242

1243+
[Browsable(false)]
1244+
public bool Pref_AS_NewlineAfterBindable
1245+
{
1246+
get { return this.pref_AS_NewlineAfterBindable; }
1247+
set { this.pref_AS_NewlineAfterBindable = value; }
1248+
}
1249+
12521250
[Browsable(false)]
12531251
public bool Pref_AS_DoAutoFormat
12541252
{
@@ -1264,15 +1262,6 @@ public bool Pref_AS_AutoFormatStyle
12641262
}
12651263

12661264
////////////////// MXML ///////////////////////////////////////
1267-
1268-
[DefaultValue(true)]
1269-
[Category("MXML")]
1270-
[DisplayName("Use Tabs")]
1271-
public bool Pref_Flex2_UseTabs
1272-
{
1273-
get { return this.pref_Flex_UseTabs; }
1274-
set { this.pref_Flex_UseTabs = value; }
1275-
}
12761265

12771266
[DefaultValue(0)]
12781267
[Category("MXML")]
@@ -1451,7 +1440,7 @@ public bool Pref_MXML_KeepRelativeIndentInMultilineComments
14511440
set { this.pref_MXML_KeepRelativeIndentInMultilineComments = value; }
14521441
}
14531442

1454-
[DefaultValue(1)]
1443+
[DefaultValue(0)]
14551444
[Category("MXML")]
14561445
[DisplayName("Blank Lines Before Comments")]
14571446
public int Pref_MXML_BlankLinesBeforeComments
@@ -1460,7 +1449,7 @@ public int Pref_MXML_BlankLinesBeforeComments
14601449
set { this.pref_MXML_BlankLinesBeforeComments = value; }
14611450
}
14621451

1463-
[DefaultValue(1)]
1452+
[DefaultValue(0)]
14641453
[Category("MXML")]
14651454
[DisplayName("Blank Lines After Specific Parent Tags")]
14661455
public int Pref_MXML_BlankLinesAfterSpecificParentTags
@@ -1469,7 +1458,7 @@ public int Pref_MXML_BlankLinesAfterSpecificParentTags
14691458
set { this.pref_MXML_BlankLinesAfterSpecificParentTags = value; }
14701459
}
14711460

1472-
[DefaultValue(1)]
1461+
[DefaultValue(0)]
14731462
[Category("MXML")]
14741463
[DisplayName("Blank Lines Between Sibling Tags")]
14751464
public int Pref_MXML_BlankLinesBetweenSiblingTags
@@ -1478,7 +1467,7 @@ public int Pref_MXML_BlankLinesBetweenSiblingTags
14781467
set { this.pref_MXML_BlankLinesBetweenSiblingTags = value; }
14791468
}
14801469

1481-
[DefaultValue(1)]
1470+
[DefaultValue(0)]
14821471
[Category("MXML")]
14831472
[DisplayName("Blank Lines After Parent Tags")]
14841473
public int Pref_MXML_BlankLinesAfterParentTags
@@ -1487,7 +1476,7 @@ public int Pref_MXML_BlankLinesAfterParentTags
14871476
set { this.pref_MXML_BlankLinesAfterParentTags = value; }
14881477
}
14891478

1490-
[DefaultValue(1)]
1479+
[DefaultValue(0)]
14911480
[Category("MXML")]
14921481
[DisplayName("Blank Lines Before Closing Tags")]
14931482
public int Pref_MXML_BlankLinesBeforeClosingTags
@@ -1595,35 +1584,45 @@ public bool Pref_MXML_UseTagsDoNotFormatInside
15951584
set { this.pref_MXML_UseTagsDoNotFormatInside = value; }
15961585
}
15971586

1598-
[Browsable(false)]
1599-
public string Pref_MXML_SortAttrData
1600-
{
1601-
get { return this.pref_MXML_SortAttrData; }
1602-
set { this.pref_MXML_SortAttrData = value; }
1603-
}
1604-
1605-
[Browsable(false)]
1587+
[DefaultValue("")]
1588+
[Category("MXML")]
1589+
[DisplayName("Parent Tags With Blank Lines After")]
16061590
public string Pref_MXML_ParentTagsWithBlankLinesAfter
16071591
{
16081592
get { return this.pref_MXML_ParentTagsWithBlankLinesAfter; }
16091593
set { this.pref_MXML_ParentTagsWithBlankLinesAfter = value; }
16101594
}
16111595

1612-
[Browsable(false)]
1596+
[DefaultValue("")]
1597+
[Category("MXML")]
1598+
[DisplayName("Tags Do Not Format Inside")]
16131599
public string Pref_MXML_TagsDoNotFormatInside
16141600
{
16151601
get { return this.pref_MXML_TagsDoNotFormatInside; }
16161602
set { this.pref_MXML_TagsDoNotFormatInside = value; }
16171603
}
16181604

1619-
[Browsable(false)]
1620-
public string Pref_MXML_TagsWithASContent
1621-
{
1622-
get { return this.pref_MXML_TagsWithASContent; }
1623-
set { this.pref_MXML_TagsWithASContent = value; }
1624-
}
1605+
[DefaultValue("")]
1606+
[Category("MXML")]
1607+
[DisplayName("Tags With ActionScript Content")]
1608+
public string Pref_MXML_TagsWithASContent
1609+
{
1610+
get { return this.pref_MXML_TagsWithASContent; }
1611+
set { this.pref_MXML_TagsWithASContent = value; }
1612+
}
16251613

1626-
[Browsable(false)]
1614+
[DefaultValue("")]
1615+
[Category("MXML")]
1616+
[DisplayName("Attribute Sort Data")]
1617+
public string Pref_MXML_SortAttrData
1618+
{
1619+
get { return this.pref_MXML_SortAttrData; }
1620+
set { this.pref_MXML_SortAttrData = value; }
1621+
}
1622+
1623+
[DefaultValue("")]
1624+
[Category("MXML")]
1625+
[DisplayName("Attribute Groups")]
16271626
public string Pref_MXML_AttrGroups
16281627
{
16291628
get { return this.pref_MXML_AttrGroups; }
@@ -1651,6 +1650,7 @@ public void InitializeDefaultPreferences()
16511650
Pref_MXML_AttrWrapMode = WrapMode.CountPerLine;
16521651
Pref_MXML_TagsCanFormat = "mx:List,fx:List";
16531652
Pref_MXML_TagsCannotFormat = "mx:String,fx:String";
1653+
Pref_MXML_TagsDoNotFormatInside = ".*:Model,.*:XML";
16541654
List<String> eventAttrs = GetEvents();
16551655
StringBuilder asTags = new StringBuilder();
16561656
foreach (String tag in eventAttrs)

0 commit comments

Comments
 (0)