Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Consistently indent by 4 spaces (or by tabs) #623

Merged
merged 14 commits into from
May 9, 2022
Merged

Consistently indent by 4 spaces (or by tabs) #623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
27dc612
basic ditch align2
belav Feb 26, 2022
f47426a
Cleaning up what the target would be.
belav Feb 26, 2022
4b978d4
ditch this code
belav Feb 26, 2022
8912f4e
adding switch expression
belav Feb 26, 2022
62df71f
A few more things
belav Feb 26, 2022
4a25023
get rid of this
belav Feb 26, 2022
1477caf
some tweaks
belav Feb 26, 2022
165999b
Most of the way there with ditching align2
belav Apr 25, 2022
8945d2f
doing some tests
belav May 2, 2022
2d5c431
Fixing a couple edge cases
belav May 2, 2022
fda71e4
Removing some unused code
belav May 2, 2022
cd54f63
Tweaking some formatting
belav May 2, 2022
c8e6bd5
Merge branch 'master' into ditch-align2
belav May 2, 2022
0eeda4a
Merge branch 'master' into ditch-align2
belav May 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Src/CSharpier.Tests/FormattingTests/TestFiles/BinaryExpressions.cst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ class TestClass

var conditionalIndentation = someBoolean
? someLongValue____________________________________
+ someLongValue____________________________________
+ someLongValue____________________________________
: someLongValue____________________________________
+ someLongValue____________________________________;
+ someLongValue____________________________________;

var someValue =
value1__________________ == value2_________________
Expand Down
24 changes: 12 additions & 12 deletions Src/CSharpier.Tests/FormattingTests/TestFiles/ClassDeclarations.cst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ public class WithReallyLongNameInterface

public class ThisIsSomeLongNameAndItShouldFormatWell1
: AnotherLongClassName,
AndYetAnotherLongClassName,
AndStillOneMore { }
AndYetAnotherLongClassName,
AndStillOneMore { }

public class SimpleGeneric<T> where T : new() { }

Expand All @@ -36,22 +36,22 @@ public class SimpleGeneric<T> : BaseClass<T> where T : new() { }

public class ThisIsSomeLongNameAndItShouldFormatWell2<T, T2, T3>
: AnotherLongClassName<T>,
AnotherClassName
AnotherClassName
where T : new(), AnotherTypeConstraint
where T2 : new()
where T3 : new() { }

public class IdentityDbContext<TUser, TRole, TKey>
: IdentityDbContext<
TUser,
TRole,
TKey,
IdentityUserClaim<TKey>,
IdentityUserRole<TKey>,
IdentityUserLogin<TKey>,
IdentityRoleClaim<TKey>,
IdentityUserToken<TKey>
>
TUser,
TRole,
TKey,
IdentityUserClaim<TKey>,
IdentityUserRole<TKey>,
IdentityUserLogin<TKey>,
IdentityRoleClaim<TKey>,
IdentityUserToken<TKey>
>
where TUser : IdentityUser<TKey>
where TRole : IdentityRole<TKey>
where TKey : IEquatable<TKey> { }
24 changes: 12 additions & 12 deletions Src/CSharpier.Tests/FormattingTests/TestFiles/ClassDeclarations_Tabs.cst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ public class WithReallyLongNameInterface

public class ThisIsSomeLongNameAndItShouldFormatWell1
: AnotherLongClassName,
AndYetAnotherLongClassName,
AndStillOneMore { }
AndYetAnotherLongClassName,
AndStillOneMore { }

public class SimpleGeneric<T> where T : new() { }

Expand All @@ -36,22 +36,22 @@ public class SimpleGeneric<T> : BaseClass<T> where T : new() { }

public class ThisIsSomeLongNameAndItShouldFormatWell2<T, T2, T3>
: AnotherLongClassName<T>,
AnotherClassName
AnotherClassName
where T : new(), AnotherTypeConstraint
where T2 : new()
where T3 : new() { }

public class IdentityDbContext<TUser, TRole, TKey>
: IdentityDbContext<
TUser,
TRole,
TKey,
IdentityUserClaim<TKey>,
IdentityUserRole<TKey>,
IdentityUserLogin<TKey>,
IdentityRoleClaim<TKey>,
IdentityUserToken<TKey>
>
TUser,
TRole,
TKey,
IdentityUserClaim<TKey>,
IdentityUserRole<TKey>,
IdentityUserLogin<TKey>,
IdentityRoleClaim<TKey>,
IdentityUserToken<TKey>
>
where TUser : IdentityUser<TKey>
where TRole : IdentityRole<TKey>
where TKey : IEquatable<TKey> { }
102 changes: 51 additions & 51 deletions Src/CSharpier.Tests/FormattingTests/TestFiles/ConditionalExpressions.cst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ public class ClassName

public bool CloseParenIndents = someCondition
? this.SomeMethodCallThatIsLonger____________________(
someLongValue,
someLongValue,
someLongValue
)
someLongValue,
someLongValue,
someLongValue
)
: this.SomeMethodCallThatIsLonger____________________(
someLongValue,
someLongValue,
someLongValue
);
someLongValue,
someLongValue,
someLongValue
);

void Method()
{
Expand All @@ -37,12 +37,12 @@ public class ClassName
CallMethod(
someValue,
someCondition
? trueValue________________________________
: falseValue_______________________________,
? trueValue________________________________
: falseValue_______________________________,
someCondition_____________________________________
&& someOtherCondition__________________________________
? trueValue________________________________
: falseValue_______________________________,
&& someOtherCondition__________________________________
? trueValue________________________________
: falseValue_______________________________,
someCondition_____________________________________
&& someOtherCondition__________________________________
);
Expand All @@ -51,8 +51,8 @@ public class ClassName
file,
// leading here should break parameters and GetEncoding should still group
encoding
? File.GetEncoding________________________________(1252)
: encoding_____________________,
? File.GetEncoding________________________________(1252)
: encoding_____________________,
cancellationToken
);

Expand All @@ -64,80 +64,80 @@ public class ClassName
);

return someLongCondition___________________________
? trueValue________________________________
: falseValue________________________________;
? trueValue________________________________
: falseValue________________________________;

return
someLongCondition____________________________________
&& someOtherLongCondition____________________________________
? trueValue________________________________
: falseValue_______________________________;
? trueValue________________________________
: falseValue_______________________________;

return
someLongCondition____________________________________
is SomeLongType___________________________
? trueValue________________________________
: falseValue_______________________________;
? trueValue________________________________
: falseValue_______________________________;

return (
someLongCondition____________________________________
&& someOtherLongCondition____________________________________
)
? trueValue________________________________
: falseValue_______________________________;
? trueValue________________________________
: falseValue_______________________________;

return
someLongCondition____________________________________
== someThingElse______________________
&& someOtherLongCondition____________________________________
? trueValue________________________________
: falseValue_______________________________;
? trueValue________________________________
: falseValue_______________________________;

return CallSomeMethod(
someLongCondition____________________________________,
someOtherLongCondition____________________________________
)
? trueValue________________________________
: falseValue_______________________________;
? trueValue________________________________
: falseValue_______________________________;

return firstCondition
? firstValue
: secondCondition
? secondValue
: thirdCondition
? thirdValue
: fourthValue;
? firstValue
: secondCondition
? secondValue
: thirdCondition
? thirdValue
: fourthValue;

return firstCondition
? secondCondition
? firstValue
: secondValue
: thirdCondition
? thirdValue
: fourthValue;
? secondCondition
? firstValue
: secondValue
: thirdCondition
? thirdValue
: fourthValue;

return a ? b : c;

return a
? b
: c
? d
: e;
? b
: c
? d
: e;

var invocationIndent = someCondition
? SomeObject
.CallLongMethod__________________________________________()
.CallLongMethod__________________________________________()
.CallLongMethod__________________________________________()
.CallLongMethod__________________________________________()
: SomeObject
.CallLongMethod__________________________________________()
.CallLongMethod__________________________________________();
.CallLongMethod__________________________________________()
.CallLongMethod__________________________________________();

CallMethod(
someCondition
? SomeValue
: SomeObject
.CallMethod__________________________________()
.CallMethod__________________________________()
? SomeValue
: SomeObject
.CallMethod__________________________________()
.CallMethod__________________________________()
);
}
}
Loading