jlengrand/kotlin
1
0
Fork 0
mirror of https://github.com/jlengrand/kotlin.git synced 2026-03-10 08:31:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

init line-indent-provider module

Browse Source 
Part of #KT-22211
This commit is contained in:
Dmitry Gridin
2020-05-20 11:34:23 +07:00
parent 9d98240272
commit 3a6b9c8d08
141 changed files with 403 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
idea/build.gradle.kts
View File

@@ -83,6 +83,7 @@ dependencies {
compile(project(":idea:ide-common"))
compile(project(":idea:idea-jps-common"))
compile(project(":idea:kotlin-gradle-tooling"))
compile(project(":idea:line-indent-provider"))
compile(project(":plugins:uast-kotlin"))
compile(project(":plugins:uast-kotlin-idea"))
compile(project(":kotlin-script-util")) { isTransitive = false }

16
idea/line-indent-provider/build.gradle.kts Normal file
View File

@@ -0,0 +1,16 @@
plugins {
kotlin("jvm")
id("jps-compatible")
}
dependencies {
compile(project(":compiler:psi"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core", rootProject = rootProject) }
compileOnly(intellijDep()) { includeJars("platform-api", "platform-impl", rootProject = rootProject) }
}
sourceSets {
"main" { projectDefault() }
"test" {}
}

8
idea/line-indent-provider/src/org/jetbrains/kotlin/idea/formatter/lineIndent/KotlinIndentationAdjuster.kt Normal file
View File

@@ -0,0 +1,8 @@
/*
* Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.idea.formatter.lineIndent
interface KotlinIndentationAdjuster

31
idea/line-indent-provider/src/org/jetbrains/kotlin/idea/formatter/lineIndent/KotlinLikeLangLineIndentProvider.kt Normal file
View File

@@ -0,0 +1,31 @@
/*
* Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.idea.formatter.lineIndent
import com.intellij.lang.Language
import com.intellij.openapi.editor.Editor
import com.intellij.openapi.project.Project
import com.intellij.psi.impl.source.codeStyle.SemanticEditorPosition
import com.intellij.psi.impl.source.codeStyle.lineIndent.IndentCalculator
import com.intellij.psi.impl.source.codeStyle.lineIndent.JavaLikeLangLineIndentProvider
import com.intellij.psi.tree.IElementType
import org.jetbrains.kotlin.idea.KotlinLanguage
abstract class KotlinLikeLangLineIndentProvider : JavaLikeLangLineIndentProvider() {
abstract fun indentionSettings(project: Project): KotlinIndentationAdjuster
override fun mapType(tokenType: IElementType): SemanticEditorPosition.SyntaxElement? = SYNTAX_MAP[tokenType]
override fun isSuitableForLanguage(language: Language): Boolean = language.isKindOf(KotlinLanguage.INSTANCE)
override fun getIndent(project: Project, editor: Editor, language: Language?, offset: Int): IndentCalculator? = null
companion object {
private val SYNTAX_MAP = linkedMapOf<IElementType, SemanticEditorPosition.SyntaxElement>(
)
}
}

7
idea/line-indent-provider/src/org/jetbrains/kotlin/idea/util/util.kt Normal file
View File

@@ -0,0 +1,7 @@
/*
* Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.idea.util

20
idea/src/org/jetbrains/kotlin/idea/formatter/KotlinLineIndentProvider.kt
View File

@@ -8,21 +8,21 @@ package org.jetbrains.kotlin.idea.formatter
import com.intellij.lang.Language
import com.intellij.openapi.editor.Editor
import com.intellij.openapi.project.Project
import com.intellij.psi.codeStyle.lineIndent.LineIndentProvider
import com.intellij.psi.impl.source.codeStyle.lineIndent.FormatterBasedLineIndentProvider
import org.jetbrains.annotations.TestOnly
import org.jetbrains.kotlin.idea.KotlinLanguage
import org.jetbrains.kotlin.idea.formatter.lineIndent.KotlinIndentationAdjuster
import org.jetbrains.kotlin.idea.formatter.lineIndent.KotlinLikeLangLineIndentProvider
class KotlinLineIndentProvider : LineIndentProvider {
private val formatterBasedProvider = FormatterBasedLineIndentProvider()
class KotlinLineIndentProvider : KotlinLikeLangLineIndentProvider() {
override fun getLineIndent(project: Project, editor: Editor, language: Language?, offset: Int): String? =
if (useFormatter)
null
else
super.getLineIndent(project, editor, language, offset)
override fun indentionSettings(project: Project): KotlinIndentationAdjuster = object : KotlinIndentationAdjuster {
override fun getLineIndent(project: Project, editor: Editor, language: Language?, offset: Int): String? {
val lineIndent = formatterBasedProvider.getLineIndent(project, editor, language, offset)
return if (useFormatter) lineIndent else lineIndent
}
override fun isSuitableFor(language: Language?): Boolean = language?.isKindOf(KotlinLanguage.INSTANCE) == true
companion object {
@get:TestOnly
@set:TestOnly

4
idea/testData/indentationOnNewline/AfterCatch.after.kt vendored
View File

@@ -4,4 +4,6 @@ fun some(): Int {
catch () {
}
<caret>
}
}
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

4
idea/testData/indentationOnNewline/AfterCatch.kt vendored
View File

@@ -3,4 +3,6 @@ fun some(): Int {
}
catch () {
}<caret>
}
}
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

4
idea/testData/indentationOnNewline/AfterClassNameBeforeFun.after.kt vendored
View File

@@ -1,4 +1,6 @@
class A()
<caret>
fun
fun
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

4
idea/testData/indentationOnNewline/AfterClassNameBeforeFun.kt vendored
View File

@@ -1,3 +1,5 @@
class A()<caret>
fun
fun
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

4
idea/testData/indentationOnNewline/AfterFinally.after.kt vendored
View File

@@ -5,4 +5,6 @@ fun some(): Int {
}
finally {}
<caret>
}
}
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

4
idea/testData/indentationOnNewline/AfterFinally.kt vendored
View File

@@ -4,4 +4,6 @@ fun some(): Int {
catch () {
}
finally {}<caret>
}
}
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

4
idea/testData/indentationOnNewline/AfterImport.after.kt vendored
View File

@@ -1,2 +1,4 @@
import java.util.ArrayList
<caret>
<caret>
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

4
idea/testData/indentationOnNewline/AfterImport.kt vendored
View File

@@ -1 +1,3 @@
import java.util.ArrayList<caret>
import java.util.ArrayList<caret>
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

4
idea/testData/indentationOnNewline/AfterTry.after.kt vendored
View File

@@ -2,4 +2,6 @@ fun some(): Int {
try {
}
<caret>
}
}
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

4
idea/testData/indentationOnNewline/AfterTry.kt vendored
View File

@@ -1,4 +1,6 @@
fun some(): Int {
try {
}<caret>
}
}
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

2
idea/testData/indentationOnNewline/Annotation.after.kt vendored
View File

@@ -1,2 +1,4 @@
@Aaaa
<caret>
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

2
idea/testData/indentationOnNewline/Annotation.kt vendored
View File

@@ -1 +1,3 @@
@Aaaa<caret>
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

4
idea/testData/indentationOnNewline/AnnotationInDeclaration.after.kt vendored
View File

@@ -3,4 +3,6 @@ class Foo {
@JvmStatic
<caret>
}
}
}
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

4
idea/testData/indentationOnNewline/AnnotationInDeclaration.kt vendored
View File

@@ -2,4 +2,6 @@ class Foo {
companion object {
@JvmStatic<caret>
}
}
}
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

1
idea/testData/indentationOnNewline/ArgumentListNormalIndent.after.inv.kt vendored
View File

@@ -5,3 +5,4 @@ fun test(i: Int) {
}
// SET_FALSE: CONTINUATION_INDENT_IN_ARGUMENT_LISTS
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

1
idea/testData/indentationOnNewline/ArgumentListNormalIndent.after.kt vendored
View File

@@ -5,3 +5,4 @@ fun test(i: Int) {
}
// SET_FALSE: CONTINUATION_INDENT_IN_ARGUMENT_LISTS
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

1
idea/testData/indentationOnNewline/ArgumentListNormalIndent.kt vendored
View File

@@ -3,3 +3,4 @@ fun test(i: Int) {
}
// SET_FALSE: CONTINUATION_INDENT_IN_ARGUMENT_LISTS
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

3
idea/testData/indentationOnNewline/AssignmentAfterEq.after.inv.kt vendored
View File

@@ -4,4 +4,5 @@ fun test() {
<caret>
}
// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

3
idea/testData/indentationOnNewline/AssignmentAfterEq.after.kt vendored
View File

@@ -4,4 +4,5 @@ fun test() {
<caret>
}
// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

3
idea/testData/indentationOnNewline/AssignmentAfterEq.kt vendored
View File

@@ -3,4 +3,5 @@ fun test() {
a = <caret>
}
// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

3
idea/testData/indentationOnNewline/BinaryWithTypeExpressions.after.inv.kt vendored
View File

@@ -4,4 +4,5 @@ fun test() {
<caret>
}
// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

3
idea/testData/indentationOnNewline/BinaryWithTypeExpressions.after.kt vendored
View File

@@ -4,4 +4,5 @@ fun test() {
<caret>
}
// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

3
idea/testData/indentationOnNewline/BinaryWithTypeExpressions.kt vendored
View File

@@ -3,4 +3,5 @@ fun test() {
a as <caret>
}
// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

4
idea/testData/indentationOnNewline/ConsecutiveCallsAfterDot.after.kt vendored
View File

@@ -1,4 +1,6 @@
fun test() {
some.test().
<caret>
}
}
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

4
idea/testData/indentationOnNewline/ConsecutiveCallsAfterDot.kt vendored
View File

@@ -1,3 +1,5 @@
fun test() {
some.test().<caret>
}
}
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

2
idea/testData/indentationOnNewline/ConsecutiveCallsInSaeCallsMiddle.after.kt vendored
View File

@@ -6,3 +6,5 @@ public fun bar(): String? = Some()?.some()
<caret>
?.some()
?.some()
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

2
idea/testData/indentationOnNewline/ConsecutiveCallsInSaeCallsMiddle.kt vendored
View File

@@ -5,3 +5,5 @@ class Some {
public fun bar(): String? = Some()?.some()<caret>
?.some()
?.some()
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

4
idea/testData/indentationOnNewline/ConsecutiveCallsInSafeCallsEnd.after.kt vendored
View File

@@ -1,4 +1,6 @@
fun test() {
some.test()?.
<caret>
}
}
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

4
idea/testData/indentationOnNewline/ConsecutiveCallsInSafeCallsEnd.kt vendored
View File

@@ -1,3 +1,5 @@
fun test() {
some.test()?.<caret>
}
}
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

4
idea/testData/indentationOnNewline/DoInFun.after.kt vendored
View File

@@ -1,4 +1,6 @@
fun some() {
do
<caret>
}
}
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

4
idea/testData/indentationOnNewline/DoInFun.kt vendored
View File

@@ -1,3 +1,5 @@
fun some() {
do<caret>
}
}
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

4
idea/testData/indentationOnNewline/EmptyParameters.after.kt vendored
View File

@@ -1,4 +1,6 @@
fun testParam(
<caret>
) {
}
}
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

4
idea/testData/indentationOnNewline/EmptyParameters.kt vendored
View File

@@ -1,2 +1,4 @@
fun testParam(<caret>) {
}
}
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

4
idea/testData/indentationOnNewline/For.after.kt vendored
View File

@@ -1,3 +1,5 @@
fun some() {
for (var i in 1..10)
<caret>
<caret>
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

4
idea/testData/indentationOnNewline/For.kt vendored
View File

@@ -1,2 +1,4 @@
fun some() {
for (var i in 1..10)<caret>
for (var i in 1..10)<caret>
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

4
idea/testData/indentationOnNewline/FunctionBlock.after.kt vendored
View File

@@ -6,4 +6,6 @@ fun main(args: Array<String>) {
times(3) {
<caret>
}
}
}
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

4
idea/testData/indentationOnNewline/FunctionBlock.kt vendored
View File

@@ -4,4 +4,6 @@ private fun <T> times(times : Int, body : () -> T) {}
fun main(args: Array<String>) {
times(3) {<caret>}
}
}
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

4
idea/testData/indentationOnNewline/FunctionWithInference.after.kt vendored
View File

@@ -1,2 +1,4 @@
fun test() =
<caret>
<caret>
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

4
idea/testData/indentationOnNewline/FunctionWithInference.kt vendored
View File

@@ -1 +1,3 @@
fun test() =<caret>
fun test() =<caret>
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

4
idea/testData/indentationOnNewline/If.after.kt vendored
View File

@@ -1,4 +1,6 @@
fun some() {
if (3 > 5)
<caret>
}
}
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

4
idea/testData/indentationOnNewline/If.kt vendored
View File

@@ -1,3 +1,5 @@
fun some() {
if (3 > 5)<caret>
}
}
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

3
idea/testData/indentationOnNewline/InBinaryExpressionInMiddle.after.inv.kt vendored
View File

@@ -3,4 +3,5 @@ fun some() {
<caret>4
}
// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

3
idea/testData/indentationOnNewline/InBinaryExpressionInMiddle.after.kt vendored
View File

@@ -3,4 +3,5 @@ fun some() {
<caret>4
}
// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

3
idea/testData/indentationOnNewline/InBinaryExpressionInMiddle.kt vendored
View File

@@ -2,4 +2,5 @@ fun some() {
val test = 3 + <caret>4
}
// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

3
idea/testData/indentationOnNewline/InBinaryExpressionUnfinished.after.inv.kt vendored
View File

@@ -3,4 +3,5 @@ fun some() {
<caret>
}
// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

3
idea/testData/indentationOnNewline/InBinaryExpressionUnfinished.after.kt vendored
View File

@@ -3,4 +3,5 @@ fun some() {
<caret>
}
// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

3
idea/testData/indentationOnNewline/InBinaryExpressionUnfinished.kt vendored
View File

@@ -2,4 +2,5 @@ fun some() {
val test = 3 + <caret>
}
// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

3
idea/testData/indentationOnNewline/InBinaryExpressionUnfinishedInIf.after.inv.kt vendored
View File

@@ -3,4 +3,5 @@ fun test() {
<caret>)
}
// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

3
idea/testData/indentationOnNewline/InBinaryExpressionUnfinishedInIf.after.kt vendored
View File

@@ -3,4 +3,5 @@ fun test() {
<caret>)
}
// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

3
idea/testData/indentationOnNewline/InBinaryExpressionUnfinishedInIf.kt vendored
View File

@@ -2,4 +2,5 @@ fun test() {
if (true &&<caret>)
}
// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

3
idea/testData/indentationOnNewline/InBinaryExpressionsBeforeCloseParenthesis.after.inv.kt vendored
View File

@@ -1,4 +1,5 @@
val somelong = 3 + 4 - (3 +
<caret>)
// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

3
idea/testData/indentationOnNewline/InBinaryExpressionsBeforeCloseParenthesis.after.kt vendored
View File

@@ -1,4 +1,5 @@
val somelong = 3 + 4 - (3 +
<caret>)
// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

3
idea/testData/indentationOnNewline/InBinaryExpressionsBeforeCloseParenthesis.kt vendored
View File

@@ -1,3 +1,4 @@
val somelong = 3 + 4 - (3 + <caret>)
// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

1
idea/testData/indentationOnNewline/InDelegationListAfterColon.after.inv.kt vendored
View File

@@ -1,4 +1,5 @@
// SET_TRUE: ALIGN_MULTILINE_EXTENDS_LIST
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
class Simpleclass() :
<caret>

1
idea/testData/indentationOnNewline/InDelegationListAfterColon.after.kt vendored
View File

@@ -1,4 +1,5 @@
// SET_TRUE: ALIGN_MULTILINE_EXTENDS_LIST
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
class Simpleclass() :
<caret>

1
idea/testData/indentationOnNewline/InDelegationListAfterColon.kt vendored
View File

@@ -1,4 +1,5 @@
// SET_TRUE: ALIGN_MULTILINE_EXTENDS_LIST
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER
class Simpleclass() : <caret>

2
idea/testData/indentationOnNewline/InDelegationListAfterComma.after.inv.kt vendored
View File

@@ -6,3 +6,5 @@ class A {
class Simpleclass() : A1,
<caret>
}
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

2
idea/testData/indentationOnNewline/InDelegationListAfterComma.after.kt vendored
View File

@@ -6,3 +6,5 @@ class A {
class Simpleclass() : A1,
<caret>
}
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

2
idea/testData/indentationOnNewline/InDelegationListAfterComma.kt vendored
View File

@@ -5,3 +5,5 @@ interface A1
class A {
class Simpleclass() : A1, <caret>
}
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

2
idea/testData/indentationOnNewline/InDelegationListNotEmpty.after.inv.kt vendored
View File

@@ -6,3 +6,5 @@ open class B1
class Simpleclass() : B1(),
<caret>A1
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

2
idea/testData/indentationOnNewline/InDelegationListNotEmpty.after.kt vendored
View File

@@ -6,3 +6,5 @@ open class B1
class Simpleclass() : B1(),
<caret>A1
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

2
idea/testData/indentationOnNewline/InDelegationListNotEmpty.kt vendored
View File

@@ -5,3 +5,5 @@ interface A1
open class B1
class Simpleclass() : B1(), <caret>A1
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

2
idea/testData/indentationOnNewline/InEnumAfterSemicolon.after.inv.kt vendored
View File

@@ -4,3 +4,5 @@ enum class EnumTest {
ENTRY();
<caret>
}
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

2
idea/testData/indentationOnNewline/InEnumAfterSemicolon.after.kt vendored
View File

@@ -4,3 +4,5 @@ enum class EnumTest {
ENTRY();
<caret>
}
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

2
idea/testData/indentationOnNewline/InEnumAfterSemicolon.kt vendored
View File

@@ -3,3 +3,5 @@
enum class EnumTest {
ENTRY(); <caret>
}
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

2
idea/testData/indentationOnNewline/InEnumInitializerListAfterComma.after.inv.kt vendored
View File

@@ -6,3 +6,5 @@ enum class EnumTest {
ENTRY(),
<caret>
}
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

2
idea/testData/indentationOnNewline/InEnumInitializerListAfterComma.after.kt vendored
View File

@@ -6,3 +6,5 @@ enum class EnumTest {
ENTRY(),
<caret>
}
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

2
idea/testData/indentationOnNewline/InEnumInitializerListAfterComma.kt vendored
View File

@@ -5,3 +5,5 @@ interface A1
enum class EnumTest {
ENTRY(), <caret>
}
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

2
idea/testData/indentationOnNewline/InEnumInitializerListNotEmpty.after.inv.kt vendored
View File

@@ -6,3 +6,5 @@ enum class EnumTest {
ENTRY(),
<caret>A1
}
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

2
idea/testData/indentationOnNewline/InEnumInitializerListNotEmpty.after.kt vendored
View File

@@ -6,3 +6,5 @@ enum class EnumTest {
ENTRY(),
<caret>A1
}
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

2
idea/testData/indentationOnNewline/InEnumInitializerListNotEmpty.kt vendored
View File

@@ -5,3 +5,5 @@ interface A1
enum class EnumTest {
ENTRY(), <caret>A1
}
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

3
idea/testData/indentationOnNewline/InExpressionsParentheses.after.inv.kt vendored
View File

@@ -2,4 +2,5 @@ val somelong = 3 + 4 - (
<caret>
)
// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

3
idea/testData/indentationOnNewline/InExpressionsParentheses.after.kt vendored
View File

@@ -2,4 +2,5 @@ val somelong = 3 + 4 - (
<caret>
)
// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

3
idea/testData/indentationOnNewline/InExpressionsParentheses.kt vendored
View File

@@ -1,3 +1,4 @@
val somelong = 3 + 4 - (<caret>)
// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

3
idea/testData/indentationOnNewline/InExpressionsParenthesesBeforeOperand.after.inv.kt vendored
View File

@@ -1,4 +1,5 @@
val somelong = 3 + (3 *
<caret>3)
// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

3
idea/testData/indentationOnNewline/InExpressionsParenthesesBeforeOperand.after.kt vendored
View File

@@ -1,4 +1,5 @@
val somelong = 3 + (3 *
<caret>3)
// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

3
idea/testData/indentationOnNewline/InExpressionsParenthesesBeforeOperand.kt vendored
View File

@@ -1,3 +1,4 @@
val somelong = 3 + (3 * <caret>3)
// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

4
idea/testData/indentationOnNewline/InLabmdaAfterArrow.after.kt vendored
View File

@@ -1,3 +1,5 @@
val a: (String) -> String = { some ->
<caret>
}
}
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

4
idea/testData/indentationOnNewline/InLabmdaAfterArrow.kt vendored
View File

@@ -1 +1,3 @@
val a: (String) -> String = { some -><caret>}
val a: (String) -> String = { some -><caret>}
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

4
idea/testData/indentationOnNewline/InLambdaAfterArrowWithSpaces.after.kt vendored
View File

@@ -1,3 +1,5 @@
val a: (String) -> String = { some ->
<caret>
}
}
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

4
idea/testData/indentationOnNewline/InLambdaAfterArrowWithSpaces.kt vendored
View File

@@ -1 +1,3 @@
val a: (String) -> String = { some -> <caret> }
val a: (String) -> String = { some -> <caret> }
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

4
idea/testData/indentationOnNewline/InLambdaBeforeParams.after.kt vendored
View File

@@ -1,3 +1,5 @@
val a: (String) -> String = {
<caret>some ->
}
}
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

4
idea/testData/indentationOnNewline/InLambdaBeforeParams.kt vendored
View File

@@ -1,2 +1,4 @@
val a: (String) -> String = { <caret>some ->
}
}
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

1
idea/testData/indentationOnNewline/InLambdaInsideChainCallSameLine.after.kt vendored
View File

@@ -8,3 +8,4 @@ fun test() {
}
}
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

1
idea/testData/indentationOnNewline/InLambdaInsideChainCallSameLine.kt vendored
View File

@@ -6,3 +6,4 @@ fun test() {
val abc = Test().foo()?.foo({ "str" }).foo {<caret>}
}
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

4
idea/testData/indentationOnNewline/InLambdaInsideChainCallSameLineWithSpaces.after.kt vendored
View File

@@ -6,4 +6,6 @@ fun test() {
val abc = Test().foo()?.foo({ "str" }).foo {
<caret>
}
}
}
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

1
idea/testData/indentationOnNewline/InLambdaInsideChainCallSameLineWithSpaces.kt vendored
View File

@@ -6,3 +6,4 @@ fun test() {
val abc = Test().foo()?.foo({ "str" }).foo { <caret> }
}
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

4
idea/testData/indentationOnNewline/InLambdaInsideChainCallWithNewLine.after.kt vendored
View File

@@ -8,4 +8,6 @@ fun test() {
.foo {
<caret>
}
}
}
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

4
idea/testData/indentationOnNewline/InLambdaInsideChainCallWithNewLine.kt vendored
View File

@@ -6,4 +6,6 @@ fun test() {
val abc = Test()
.foo { "Str" }
.foo {<caret>}
}
}
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

4
idea/testData/indentationOnNewline/InLambdaInsideChainCallWithNewLineWithSpaces.after.kt vendored
View File

@@ -8,4 +8,6 @@ fun test() {
.foo {
<caret>
}
}
}
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

4
idea/testData/indentationOnNewline/InLambdaInsideChainCallWithNewLineWithSpaces.kt vendored
View File

@@ -6,4 +6,6 @@ fun test() {
val abc = Test()
.foo { "Str" }
.foo { <caret> }
}
}
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

4
idea/testData/indentationOnNewline/InMultilineLambdaAfterArrow.after.kt vendored
View File

@@ -1,4 +1,6 @@
val a: (String) -> String = {
some ->
<caret>
}
}
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

4
idea/testData/indentationOnNewline/InMultilineLambdaAfterArrow.kt vendored
View File

@@ -1,3 +1,5 @@
val a: (String) -> String = {
some -><caret>
}
}
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

3
idea/testData/indentationOnNewline/IsExpressionAfterIs.after.inv.kt vendored
View File

@@ -3,4 +3,5 @@ fun test() {
<caret>
}
// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
// SET_TRUE: ALIGN_MULTILINE_BINARY_OPERATION
// WITHOUT_CUSTOM_LINE_INDENT_PROVIDER

Some files were not shown because too many files have changed in this diff Show More