Skip to content
This repository was archived by the owner on Nov 19, 2025. It is now read-only.

Make the Kotlin indent 2 spaces. - #51

Merged
swankjesse merged 1 commit into
square:masterfrom
zach-klippenstein:zachklipp/kotlin-indent-2-spaces
Jan 30, 2018
Merged

swankjesse merged 1 commit into
square:masterfrom
zach-klippenstein:zachklipp/kotlin-indent-2-spaces

Conversation

@zach-klippenstein

Copy link
Copy Markdown
Contributor

These options haven't shown up before. I used Export from the settings dialog this time instead of just copying the file from the preferences directory.

@NightlyNexus

Copy link
Copy Markdown

Update Square.xml for now as well?

These options haven't shown up before. I used Export from the settings dialog this time instead of just
copying the file from the preferences directory.
@zach-klippenstein
zach-klippenstein force-pushed the zachklipp/kotlin-indent-2-spaces branch from c3d41d4 to 2a1c355 Compare January 30, 2018 18:17
@zach-klippenstein

Copy link
Copy Markdown
Contributor Author

@NightlyNexus Fixed.

@swankjesse
swankjesse merged commit e478d90 into square:master Jan 30, 2018
@zach-klippenstein
zach-klippenstein deleted the zachklipp/kotlin-indent-2-spaces branch January 30, 2018 20:10
@letientai299

letientai299 commented Jan 31, 2018 •

Copy link
Copy Markdown
Contributor

In #47 the indentation change to 4 spaces to follow Google Kotlin Android Style Guide, so why change it to 2 spaces now?

@JakeWharton

Copy link
Copy Markdown
Collaborator

Why change it to 4 when you have hundreds of thousands of existing lines of Kotlin and Java which are 2?

ryanhall07 pushed a commit to cashapp/misk that referenced this pull request Feb 17, 2018
The majority of the diff noise comes from
square/java-code-styles#51 which changed indent
spacing from 4 to 2.

This was done with the auto reformatter in Intellij
ryanhall07 pushed a commit to cashapp/misk that referenced this pull request Feb 17, 2018
Most of the noise is coming from the change to indent spaces 2 instead
of the Kotlin standard of 4.

square/java-code-styles#51

This is causing a lot of local diff noise when developing, so figured
one giant change was better.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants