From 7b9fad00a136bd1c3724369d0504e09b7c5f5aa2 Mon Sep 17 00:00:00 2001 From: Dmitry Gridin Date: Mon, 6 Jul 2020 14:35:49 +0700 Subject: [PATCH] Rename `KotlinLikeLangLineIndentProvider` to `KotlinLangLineIndentProvider` Relates to #KT-22211 --- ...gLineIndentProvider.kt => KotlinLangLineIndentProvider.kt} | 4 ++-- .../kotlin/idea/formatter/KotlinLineIndentProvider.kt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename idea/line-indent-provider/src/org/jetbrains/kotlin/idea/formatter/lineIndent/{KotlinLikeLangLineIndentProvider.kt => KotlinLangLineIndentProvider.kt} (99%) diff --git a/idea/line-indent-provider/src/org/jetbrains/kotlin/idea/formatter/lineIndent/KotlinLikeLangLineIndentProvider.kt b/idea/line-indent-provider/src/org/jetbrains/kotlin/idea/formatter/lineIndent/KotlinLangLineIndentProvider.kt similarity index 99% rename from idea/line-indent-provider/src/org/jetbrains/kotlin/idea/formatter/lineIndent/KotlinLikeLangLineIndentProvider.kt rename to idea/line-indent-provider/src/org/jetbrains/kotlin/idea/formatter/lineIndent/KotlinLangLineIndentProvider.kt index f526d63d2e0..ed5e6b3ab1e 100644 --- a/idea/line-indent-provider/src/org/jetbrains/kotlin/idea/formatter/lineIndent/KotlinLikeLangLineIndentProvider.kt +++ b/idea/line-indent-provider/src/org/jetbrains/kotlin/idea/formatter/lineIndent/KotlinLangLineIndentProvider.kt @@ -17,10 +17,10 @@ import com.intellij.psi.impl.source.codeStyle.lineIndent.JavaLikeLangLineIndentP import com.intellij.psi.tree.IElementType import com.intellij.util.text.CharArrayUtil import org.jetbrains.kotlin.idea.KotlinLanguage -import org.jetbrains.kotlin.idea.formatter.lineIndent.KotlinLikeLangLineIndentProvider.KotlinElement.* +import org.jetbrains.kotlin.idea.formatter.lineIndent.KotlinLangLineIndentProvider.KotlinElement.* import org.jetbrains.kotlin.lexer.KtTokens -abstract class KotlinLikeLangLineIndentProvider : JavaLikeLangLineIndentProvider() { +abstract class KotlinLangLineIndentProvider : JavaLikeLangLineIndentProvider() { abstract fun indentionSettings(project: Project): KotlinIndentationAdjuster override fun mapType(tokenType: IElementType): SemanticEditorPosition.SyntaxElement? = SYNTAX_MAP[tokenType] diff --git a/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinLineIndentProvider.kt b/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinLineIndentProvider.kt index 00ac05aa597..51dfa9b2060 100644 --- a/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinLineIndentProvider.kt +++ b/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinLineIndentProvider.kt @@ -11,9 +11,9 @@ import com.intellij.openapi.editor.Editor import com.intellij.openapi.project.Project import org.jetbrains.annotations.TestOnly import org.jetbrains.kotlin.idea.formatter.lineIndent.KotlinIndentationAdjuster -import org.jetbrains.kotlin.idea.formatter.lineIndent.KotlinLikeLangLineIndentProvider +import org.jetbrains.kotlin.idea.formatter.lineIndent.KotlinLangLineIndentProvider -class KotlinLineIndentProvider : KotlinLikeLangLineIndentProvider() { +class KotlinLineIndentProvider : KotlinLangLineIndentProvider() { override fun getLineIndent(project: Project, editor: Editor, language: Language?, offset: Int): String? = if (useFormatter) null