Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main'
Browse files Browse the repository at this point in the history
* 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)
  • Loading branch information
lancethomps committed Oct 9, 2023
2 parents 257d6e7 + 102c89d commit 9eac745
Show file tree
Hide file tree
Showing 16 changed files with 1,056 additions and 491 deletions.
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@ For comparison, the same code formatted by [`ktlint`](https://github.com/pintere
| ------ | --------|
| ![ktlint](docs/images/ktlint.png) | ![IntelliJ](docs/images/intellij.png) |

## Playground

We have a [live playground](https://facebook.github.io/ktfmt/) where you can easily see how ktfmt would format your code.
Give it a try! https://facebook.github.io/ktfmt/

## Using the formatter

### IntelliJ, Android Studio, and other JetBrains IDEs
Expand Down
4 changes: 2 additions & 2 deletions core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
<parent>
<groupId>com.facebook</groupId>
<artifactId>ktfmt-parent</artifactId>
<version>0.45-SNAPSHOT</version>
<version>0.47-SNAPSHOT</version>
</parent>

<properties>
<dokka.version>0.10.1</dokka.version>
<kotlin.version>1.6.10</kotlin.version>
<kotlin.version>1.8.22</kotlin.version>
<kotlin.compiler.incremental>true</kotlin.compiler.incremental>
<kotlin.compiler.jvmTarget>1.8</kotlin.compiler.jvmTarget>
<main.class>com.facebook.ktfmt.cli.Main</main.class>
Expand Down
Loading

0 comments on commit 9eac745

Please sign in to comment.