GH-7 getting methods printing a little better.

Src/CSharpier.Tests/EncodingTests/UTF8BOM.actual.cst

@@ -14,22 +14,23 @@ namespace Insite.Admin
  public class AdminContext
  {
  public static bool DisableAdminAccess
- => (ConfigurationManager.AppSettings["DisableAdminAccess"] ?? "false").EqualsIgnoreCase(
- "true");
+ => (ConfigurationManager.AppSettings["DisableAdminAccess"] ?? "false")
+ .EqualsIgnoreCase("true");
 
  private static IPerRequestCacheManager perRequestCacheManager;
  private static IPerRequestCacheManager PerRequestCacheManager
- => perRequestCacheManager ?? (perRequestCacheManager = DependencyLocator.Current.GetInstance<IPerRequestCacheManager>());
+ => perRequestCacheManager ?? (perRequestCacheManager = DependencyLocator
+ .Current
+ .GetInstance<IPerRequestCacheManager>());
 
  private static IAdminContext current;
 
  public static IAdminContext Current
  {
  get
  {
- return current ?? PerRequestCacheManager.Get(
- "AdminContext_Current",
- LoadAdminContext);
+ return current ?? PerRequestCacheManager
+ .Get("AdminContext_Current", LoadAdminContext);
  }
  set { current = value; }
  }

Src/CSharpier.Tests/Samples/AllInOne.Formatted.cst

@@ -297,19 +297,17 @@ namespace My
  orderby g.Count() ascending
  orderby g.Key descending
  select new { Country = g.Key, CustCount = g.Count() };
- query = from c in customers
- select c into d
- select d;
+ query = from c in customers select c into d select d;
  }
  ~A() { }
  private readonly int f1;
  [Obsolete]
  [NonExisting]
  [Foo::NonExisting(var, 5)]
  [CLSCompliant(false)]
- [Obsolete, System.NonSerialized, NonSerialized, CLSCompliant(true ||
- false &
- true)]
+ [Obsolete, System.NonSerialized, NonSerialized, CLSCompliant(true
+ || false
+ & true)]
  private volatile int f2;
  [return: Obsolete]
  [method: Obsolete]
@@ -452,12 +450,14 @@ namespace My
  }
  void AsyncAnonymous() // C # 5 feature
  {
- var task = Task.Factory.StartNew(
- async () =>
- {
- return await new WebClient().DownloadStringTaskAsync(
- "http://example.com");
- });
+ var task = Task
+ .Factory
+ .StartNew(
+ async () =>
+ {
+ return await new WebClient()
+ .DownloadStringTaskAsync("http://example.com");
+ });
  }
  }
  }
@@ -624,8 +624,7 @@ namespace Comments.XmlComments.UndocumentedKeywords
  /*s*/
  int /*s*/
  intValue = 0;
- intValue = intValue /*s*/
- + 1;
+ intValue = intValue /*s*/ + 1;
  string strValue = /*s*/ "hello";
  /*s*/
  MyClass c = new MyClass();
@@ -676,61 +675,33 @@ namespace Comments.XmlComments.UndocumentedKeywords
  Foo<T> f = new Foo<int>(); /*<> ()*/
 
  f.method(); /*().*/
-
- i = i + i - i * i / i % i &
- i |
- i ^ i; /*+ - * / % & | ^*/
-
+ i = i + i - i * i / i % i & i | i ^ i; /*+ - * / % & | ^*/
  bool b = true & false | true ^ false; /*& | ^*/
 
  b = !b; /*!*/
-
  i = ~i; /*~i*/
-
- b = i < i &&
- i > i; /*< && >*/
-
+ b = i < i && i > i; /*< && >*/
  int? ii = 5; /*? bug*/
  // NO ?
  int f = true ? 1 : 0; /*? :*/
  // YES :
  i++; /*++*/
-
  i--; /*--*/
-
- b = true &&
- false ||
- true; /*&& ||*/
-
+ b = true && false || true; /*&& ||*/
  i << 5; /*<<*/
-
  i >> 5; /*>>*/
-
- b = i == i &&
- i != i &&
- i <= i &&
- i >= i; /*= == && != <= >=*/
-
+ b = i == i && i != i && i <= i && i >= i; /*= == && != <= >=*/
  i += 5.0; /*+=*/
-
  i -= i; /*-=*/
-
  i *= i;
  /**=*/
  i /= i; /*/=*/
-
  i %= i; /*%=*/
-
  i &= i; /*&=*/
-
  i |= i; /*|=*/
-
  i ^= i; /*^=*/
-
  i <<= i; /*<<=*/
-
  i >>= i; /*>>=*/
-
  object s = x => x + 1; /*=>*/
 
  double d = .3;
@@ -740,7 +711,6 @@ namespace Comments.XmlComments.UndocumentedKeywords
  Point* p = &point;
  /** &*/
  p->x = 10; /*->*/
-
  }
  IO::BinaryReader br = null;
  x[i: 1] = 3;

Src/CSharpier.Tests/TestFiles/ArgumentList/ArgumentLists.actual.cst

@@ -0,0 +1,9 @@
+public class ClassName
+{
+ public void MethodName()
+ {
+ this.Method(true);
+
+ this.NamedArguments(b: true, c: "false");
+ }
+}

Src/CSharpier.Tests/TestFiles/IfStatement/IfStatements.actual.cst

@@ -0,0 +1,33 @@
+public class ClassName
+{
+ public void MethodName()
+ {
+ if (true) { }
+
+ if (true == false) { }
+
+ if (true && false) { }
+
+ if (
+ longStatementName
+ && longerStatementName
+ && evenLongeStatementName
+ && superLongStatementName
+ ) { }
+
+ if (true)
+ DoSoemthing();
+ else if (false)
+ DoSomething();
+ else
+ DoSomething;
+
+ if (!true) { }
+
+ if (true != false) { }
+
+ if (true || false) { }
+
+ if (true && (true || false)) { }
+ }
+}

Src/CSharpier.Tests/TestFiles/IfStatement/IfStatements.cst

@@ -15,9 +15,12 @@ public class ClassName
  && superLongStatementName
  ) { }
 
- if (true) DoSoemthing();
- else if (false) DoSomething();
- else DoSomething;
+ if (true)
+ DoSoemthing();
+ else if (false)
+ DoSomething();
+ else
+ DoSomething;
 
  if (!true) { }
 

Src/CSharpier.Tests/TestFiles/InvocationExpression/InvocationExpressions.actual.cst

@@ -15,5 +15,8 @@
  .Method(
  "ljkasdfkljasdlkjfklajsdfkjlasdfkjlasdkljfajklsdfkjasdf",
  "kljasdfkljaslkjdfljaksdfkjlaksljfaksjldf");
+
+ var superLongMethodNameForceLine = someFactoryName
+ .SuperLongMethodNameForceLine();
  }
 }

Src/CSharpier.Tests/TestFiles/InvocationExpression/_InvocationExpressionTests.cs

@@ -3,33 +3,14 @@
 
 namespace CSharpier.Tests.TestFiles
 {
- public class InterpolatedStringExpressionTests : BaseTest
+ public class InvocationExpressionTests : BaseTest
  {
  [Test]
- public void BasicInterpolatedStringExpression()
+ public void InvocationExpressions()
  {
  this.RunTest(
- "InterpolatedStringExpression",
- "BasicInterpolatedStringExpression");
- }
- [Test]
- public void Interpolation()
- {
- this.RunTest("InterpolatedStringExpression", "Interpolation");
- }
- [Test]
- public void InterpolationShouldNotBreakLines()
- {
- this.RunTest(
- "InterpolatedStringExpression",
- "InterpolationShouldNotBreakLines");
- }
- [Test]
- public void InterpolationWithAlignmentAndFormat()
- {
- this.RunTest(
- "InterpolatedStringExpression",
- "InterpolationWithAlignmentAndFormat");
+ "InvocationExpression",
+ "InvocationExpressions");
  }
  }
 }

Src/CSharpier.Tests/TestFiles/QueryExpression/ComplexQuery.actual.cst

@@ -7,11 +7,9 @@
  where d != null
  join c1 in customers on c1.GetHashCode() equals c.GetHashCode()
  join c1 in customers on c1.GetHashCode() equals c.GetHashCode() into e
- group c by c
- .Country into g
+ group c by c.Country into g
  orderby g.Count() ascending
- orderby g
- .Key descending
+ orderby g.Key descending
  select new { Country = g.Key, CustCount = g.Count() };
  }
 }

Src/CSharpier.Tests/TestFiles/SwitchExpression/SwitchWithRecursivePattern.actual.cst

@@ -4,22 +4,10 @@
  {
  var newState = (GetState(), action, hasKey) switch
  {
- (DoorState
- .Closed, Action
- .Open, _) => DoorState
- .Opened,
- (DoorState
- .Opened, Action
- .Close, _) => DoorState
- .Closed,
- (DoorState
- .Closed, Action
- .Lock, true) => DoorState
- .Locked,
- (DoorState
- .Locked, Action
- .Unlock, true) => DoorState
- .Closed,
+ (DoorState.Closed, Action.Open, _) => DoorState.Opened,
+ (DoorState.Opened, Action.Close, _) => DoorState.Closed,
+ (DoorState.Closed, Action.Lock, true) => DoorState.Locked,
+ (DoorState.Locked, Action.Unlock, true) => DoorState.Closed,
  (var state, _, _) => state
  };
  }

Src/CSharpier.Tests/TestFiles/WhileStatement/WhileStatements.actual.cst

@@ -13,10 +13,8 @@
  }
 
  while (
- directoryInfo
- .Name != "Test"
- && directoryInfo
- .Parent != null
+ directoryInfo.Name != "Test"
+ && directoryInfo.Parent != null
  && someLongCondition == "test")
  {
  directoryInfo = directoryInfo.Parent;

Src/CSharpier.Tests/TestFiles/WhileStatement/WhileStatements.cst

@@ -13,9 +13,9 @@ class ClassName
  }
 
  while (
- directoryInfo.Name != "Test" &&
- directoryInfo.Parent != null &&
- someLongCondition == "test")
+ directoryInfo.Name != "Test"
+ && directoryInfo.Parent != null
+ && someLongCondition == "test")
  {
  directoryInfo = directoryInfo.Parent;
  }