diff options
| author | Carmi Grushko <carmi@fb.com> | 2022-05-08 03:18:06 -0700 |
|---|---|---|
| committer | Facebook GitHub Bot <facebook-github-bot@users.noreply.github.com> | 2022-05-08 03:18:06 -0700 |
| commit | bd2e5c73c94673991aa5a34090337c92e650197d (patch) | |
| tree | 2404c453f240aee1a9af7708daeb1928955ab7fe /core | |
| parent | 63eef564b24955a7429c930ab1b78458e2f6c8a1 (diff) | |
| download | ktfmt-bd2e5c73c94673991aa5a34090337c92e650197d.tar.gz | |
Update ktfmt component on FBS:master
Reviewed By: strulovich
Differential Revision: D36123426
fbshipit-source-id: 32cb667623564a38def123d20b88179bffe20cdb
Diffstat (limited to 'core')
3 files changed, 9 insertions, 5 deletions
diff --git a/core/src/main/java/com/facebook/ktfmt/format/KotlinInputAstVisitor.kt b/core/src/main/java/com/facebook/ktfmt/format/KotlinInputAstVisitor.kt index b84a857..1a0136a 100644 --- a/core/src/main/java/com/facebook/ktfmt/format/KotlinInputAstVisitor.kt +++ b/core/src/main/java/com/facebook/ktfmt/format/KotlinInputAstVisitor.kt @@ -636,7 +636,8 @@ class KotlinInputAstVisitor( lastIndexToOpen = index } } - is KtArrayAccessExpression, is KtPostfixExpression -> { + is KtArrayAccessExpression, + is KtPostfixExpression -> { // we group these with the last item with a name, and we always close them groupingInfos[lastIndexToOpen].groupOpenCount++ } diff --git a/core/src/main/java/com/facebook/ktfmt/format/TypeNameClassifier.kt b/core/src/main/java/com/facebook/ktfmt/format/TypeNameClassifier.kt index ac4fb7f..eba3ccc 100644 --- a/core/src/main/java/com/facebook/ktfmt/format/TypeNameClassifier.kt +++ b/core/src/main/java/com/facebook/ktfmt/format/TypeNameClassifier.kt @@ -47,8 +47,9 @@ object TypeNameClassifier { TYPE(true) { override fun next(n: JavaCaseFormat): TyParseState { return when (n) { - JavaCaseFormat.UPPERCASE, JavaCaseFormat.LOWER_CAMEL, JavaCaseFormat.LOWERCASE -> - FIRST_STATIC_MEMBER + JavaCaseFormat.UPPERCASE, + JavaCaseFormat.LOWER_CAMEL, + JavaCaseFormat.LOWERCASE -> FIRST_STATIC_MEMBER JavaCaseFormat.UPPER_CAMEL -> TYPE } } @@ -73,7 +74,8 @@ object TypeNameClassifier { override fun next(n: JavaCaseFormat): TyParseState { return when (n) { JavaCaseFormat.UPPERCASE -> AMBIGUOUS - JavaCaseFormat.LOWER_CAMEL, JavaCaseFormat.LOWERCASE -> REJECT + JavaCaseFormat.LOWER_CAMEL, + JavaCaseFormat.LOWERCASE -> REJECT JavaCaseFormat.UPPER_CAMEL -> TYPE } } diff --git a/core/src/main/java/com/facebook/ktfmt/kdoc/KDocFormatter.kt b/core/src/main/java/com/facebook/ktfmt/kdoc/KDocFormatter.kt index 0c2ec53..f49ac3d 100644 --- a/core/src/main/java/com/facebook/ktfmt/kdoc/KDocFormatter.kt +++ b/core/src/main/java/com/facebook/ktfmt/kdoc/KDocFormatter.kt @@ -94,7 +94,8 @@ object KDocFormatter { KDocTokens.LEADING_ASTERISK -> Unit // Ignore, no need to output anything KDocTokens.TAG_NAME -> tokens.add(KDocToken(TAG, tokenText)) KDocTokens.CODE_BLOCK_TEXT -> tokens.add(KDocToken(CODE, tokenText)) - KDocTokens.MARKDOWN_INLINE_LINK, KDocTokens.MARKDOWN_LINK -> { + KDocTokens.MARKDOWN_INLINE_LINK, + KDocTokens.MARKDOWN_LINK -> { tokens.add(KDocToken(MARKDOWN_LINK, tokenText)) } KDocTokens.TEXT -> { |