diff options
| author | nickreid <nickreid@google.com> | 2022-02-13 02:51:48 -0800 |
|---|---|---|
| committer | Facebook GitHub Bot <facebook-github-bot@users.noreply.github.com> | 2022-02-13 02:55:07 -0800 |
| commit | 059184bb67b5bc52c8fd50481dcbc8305d0508b9 (patch) | |
| tree | e00fa9b65f2361bf026942f177d3acc8d566d11d /core/src/main/java/com/facebook | |
| parent | d4718f643abd0999ba502caf5062c98a3218e88d (diff) | |
| download | ktfmt-059184bb67b5bc52c8fd50481dcbc8305d0508b9.tar.gz | |
Fix crash when type param has an annotation (#281)
Summary: Pull Request resolved: https://github.com/facebookincubator/ktfmt/pull/281
Reviewed By: strulovich
Differential Revision: D34167891
Pulled By: cgrushko
fbshipit-source-id: 16b32efd388f895fc69e445cc15f37287c42f905
Diffstat (limited to 'core/src/main/java/com/facebook')
| -rw-r--r-- | core/src/main/java/com/facebook/ktfmt/format/KotlinInputAstVisitor.kt | 18 |
1 files changed, 2 insertions, 16 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 d21fa0c..7670131 100644 --- a/core/src/main/java/com/facebook/ktfmt/format/KotlinInputAstVisitor.kt +++ b/core/src/main/java/com/facebook/ktfmt/format/KotlinInputAstVisitor.kt @@ -119,7 +119,6 @@ import org.jetbrains.kotlin.psi.KtWhileExpression import org.jetbrains.kotlin.psi.psiUtil.children import org.jetbrains.kotlin.psi.psiUtil.startOffset import org.jetbrains.kotlin.psi.psiUtil.startsWithComment -import org.jetbrains.kotlin.types.Variance /** An AST visitor that builds a stream of {@link Op}s to format. */ class KotlinInputAstVisitor( @@ -1936,21 +1935,7 @@ class KotlinInputAstVisitor( override fun visitTypeParameter(parameter: KtTypeParameter) { builder.sync(parameter) - if (parameter.hasModifier(KtTokens.REIFIED_KEYWORD)) { - builder.token("reified") - builder.space() - } - when (parameter.variance) { - Variance.INVARIANT -> {} - Variance.IN_VARIANCE -> { - builder.token("in") - builder.space() - } - Variance.OUT_VARIANCE -> { - builder.token("out") - builder.space() - } - } + visit(parameter.modifierList) builder.token(parameter.nameIdentifier?.text ?: "") val extendsBound = parameter.extendsBound if (extendsBound != null) { @@ -1972,6 +1957,7 @@ class KotlinInputAstVisitor( /** Example `T : Foo` */ override fun visitTypeConstraint(constraint: KtTypeConstraint) { builder.sync(constraint) + // TODO(nreid260): What about annotations on the type reference? `where @A T : Int` visit(constraint.subjectTypeParameterName) builder.space() builder.token(":") |