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.

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

Track KtLint's code styles. #84

Merged
merged 1 commit into from
Nov 12, 2020
Merged

Track KtLint's code styles. #84

merged 1 commit into from
Nov 12, 2020

Conversation

vRallev
Copy link
Collaborator

@vRallev vRallev commented Nov 12, 2020

This PR is basically reopening #82. I merged the settings that IntelliJ and KtLint export.

@@ -257,7 +260,7 @@
<option name="ALLOW_TRAILING_COMMA" value="true" />
<indentOptions>
<option name="INDENT_SIZE" value="2" />
<option name="CONTINUATION_INDENT_SIZE" value="4" />
<option name="CONTINUATION_INDENT_SIZE" value="2" />
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We'll need to reformat the Register Android codebase. I'll take care of this (that was the main concern why #82 was declined). Cash Android should already use a 2 space continuation indent.

<option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
<option name="CALL_PARAMETERS_WRAP" value="1" />
<option name="CALL_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
<option name="CALL_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
<option name="METHOD_PARAMETERS_WRAP" value="5" />
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The codestyle for Kotlin of Square and SquareAndroid are now identical except for this value. I didn't want to change it.

@swankjesse
Copy link
Contributor

Gotta figure out a strategy to fix ~200 cash repos when we land this.

@vRallev vRallev merged commit b5d3e81 into main Nov 12, 2020
@vRallev vRallev deleted the ralf/track-ktlint branch November 12, 2020 19:58
pyricau added a commit to square/leakcanary that referenced this pull request Dec 4, 2020
Follows latest Square formatting rules: square/java-code-styles#84
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants