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

Adjust .editorconfig for kotlinlang style for IntelliJ to better align with ktfmt #412

Closed

Conversation

cloudshiftchris
Copy link
Contributor

Two changes:

  1. Field annotations are set to wrap off, to align with ktfmt that places them on the same line as the field.

e.g.

    @get:Input
    internal abstract val versionPropertyName: Property<String>

...will now match what ktfmt does:

    @get:Input internal abstract val versionPropertyName: Property<String>
  1. Import order; IntelliJ places java., javax., kotlin.* at the end, after other imports, whereas ktfmt places all imports in alphabetical order:
    e.g.
import org.gradle.api.file.FileSystemOperations
import org.gradle.api.file.RegularFileProperty
import org.gradle.api.model.ObjectFactory
import org.gradle.api.provider.ListProperty
import org.gradle.api.provider.Property
import java.util.*
import javax.inject.Inject

... will now be consistent with ktfmt, all sorted alphabetically.

import java.util.*
import javax.inject.Inject
import org.gradle.api.file.FileSystemOperations
import org.gradle.api.file.RegularFileProperty
import org.gradle.api.model.ObjectFactory
import org.gradle.api.provider.ListProperty
import org.gradle.api.provider.Property

@facebook-github-bot
Copy link
Contributor

Hi @cloudshiftchris!

Thank you for your pull request and welcome to our community.

Action Required

In order to merge any pull request (code, docs, etc.), we require contributors to sign our Contributor License Agreement, and we don't seem to have one on file for you.

Process

In order for us to review and merge your suggested changes, please sign at https://code.facebook.com/cla. If you are contributing on behalf of someone else (eg your employer), the individual CLA may not be sufficient and your employer may need to sign the corporate CLA.

Once the CLA is signed, our tooling will perform checks and validations. Afterwards, the pull request will be tagged with CLA signed. The tagging process may take up to 1 hour after signing. Please give it that time before contacting us about it.

If you have received this in error or have any questions, please contact us at cla@meta.com. Thanks!

@facebook-github-bot
Copy link
Contributor

Thank you for signing our Contributor License Agreement. We can now accept your code for this (and any) Meta Open Source project. Thanks!

@facebook-github-bot facebook-github-bot added the CLA Signed This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed. label Jul 30, 2023
@facebook-github-bot
Copy link
Contributor

@hick209 has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.

@facebook-github-bot
Copy link
Contributor

@hick209 has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.

@facebook-github-bot
Copy link
Contributor

@hick209 merged this pull request in 45e78e2.

lancethomps added a commit to lancethomps/ktfmt that referenced this pull request Oct 9, 2023
* upstream/main:
  Add unit tests to capture line break behavior on type specifiers
  Plugin doesn't work with if "Only VCS changed text" is selected from code-reformat settings (facebook#386)
  Bump version to 0.47-SNAPSHOT
  Bump version to 0.46
  Fix indentation of trailing comments in a bunch of cases (facebook#418)
  Adjust .editorconfig for kotlinlang style for IntelliJ to better align with ktfmt (facebook#412)
  Bump Kotlin version to 1.8.22
  Bump version to 0.46-SNAPSHOT
  Bump version to 0.45
  Bump word-wrap from 1.2.3 to 1.2.4 in /website (facebook#410)
  Use inExpression in a nullsafe way (facebook#417)
  Update ktfmt component on FBS:master
  Back out "Improve argsfile support"
  Improve argsfile support
  Fix double indentation in Elvis chains (facebook#416)
  Daily `arc lint --take KTFMT`
  Remove TypeNameClassifier
  Support context receivers (facebook#400)
  Added link to live playground directly into README file
  Keep imports from the same package if the name is overloaded (facebook#414)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CLA Signed This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed. Merged
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants