azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Create TrailingCommaIntention

Browse Source 
#KT-34744
This commit is contained in:
Dmitry Gridin
2020-02-04 16:43:57 +07:00
parent 195d9020a6
commit 6c439ae85a
65 changed files with 123 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/resources/META-INF/plugin-common.xml
+5
View File
@@ -1340,6 +1340,11 @@
<category>Kotlin</category> <category>Kotlin</category>
</intentionAction> </intentionAction>
<intentionAction>
<className>org.jetbrains.kotlin.idea.intentions.TrailingCommaIntention</className>
<category>Kotlin</category>
</intentionAction>
<intentionAction> <intentionAction>
<className>org.jetbrains.kotlin.idea.intentions.ToOrdinaryStringLiteralIntention</className> <className>org.jetbrains.kotlin.idea.intentions.ToOrdinaryStringLiteralIntention</className>
<category>Kotlin</category> <category>Kotlin</category>
idea/resources/intentionDescriptions/TrailingCommaIntention/after.kt.template
+4
View File
@@ -0,0 +1,4 @@
fun a(
i: Int,
b: Int<spot>,</spot>
) = Unit
idea/resources/intentionDescriptions/TrailingCommaIntention/before.kt.template
+4
View File
@@ -0,0 +1,4 @@
fun a(
i: Int,
b: Int
) = Unit
idea/resources/intentionDescriptions/TrailingCommaIntention/description.html
+5
View File
@@ -0,0 +1,5 @@
<html>
<body>
This intention changes the setting <b>Editor -> Code Style -> Kotlin -> Wrapping and Braces -> Use trailing comma</b>.
</body>
</html>
idea/src/org/jetbrains/kotlin/idea/intentions/TrailingCommaIntention.kt
+28
View File
@@ -0,0 +1,28 @@
/*
* 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.intentions
import com.intellij.application.options.CodeStyle
import com.intellij.codeInsight.intention.LowPriorityAction
import com.intellij.openapi.editor.Editor
import org.jetbrains.kotlin.idea.formatter.kotlinCustomSettings
import org.jetbrains.kotlin.idea.util.addTrailingCommaIsAllowedForThis
import org.jetbrains.kotlin.psi.KtElement
class TrailingCommaIntention : SelfTargetingIntention<KtElement>(KtElement::class.java, "Enable/disable a trailing comma in the formatter"),
LowPriorityAction {
override fun applyTo(element: KtElement, editor: Editor?) {
val kotlinCustomSettings = CodeStyle.getSettings(element.project).kotlinCustomSettings
kotlinCustomSettings.ALLOW_TRAILING_COMMA = !kotlinCustomSettings.ALLOW_TRAILING_COMMA
}
override fun isApplicableTo(element: KtElement, caretOffset: Int): Boolean {
return element.addTrailingCommaIsAllowedForThis().also {
val action = if (CodeStyle.getSettings(element.project).kotlinCustomSettings.ALLOW_TRAILING_COMMA) "Disable" else "Enable"
text = "$action a trailing comma by default in the formatter"
}
}
}
idea/testData/intentions/trailingComma/.intention
Vendored
+1
View File
@@ -0,0 +1 @@
org.jetbrains.kotlin.idea.intentions.TrailingCommaIntention
idea/testData/intentions/trailingComma/valueParameterList.kt
Vendored
+1
View File
@@ -0,0 +1 @@
fun a(i: Int<caret>) = Unit
idea/testData/intentions/trailingComma/valueParameterList.kt.after
Vendored
+1
View File
@@ -0,0 +1 @@
fun a(i: Int<caret>) = Unit
idea/testData/multiModuleQuickFix/other/importExpectClassWithoutActualInJvm/jvm/b.kt
Vendored
+1
View File
@@ -4,6 +4,7 @@
// ACTION: Create enum 'Foo' // ACTION: Create enum 'Foo'
// ACTION: Create interface 'Foo' // ACTION: Create interface 'Foo'
// ACTION: Create type parameter 'Foo' in function 'use' // ACTION: Create type parameter 'Foo' in function 'use'
// ACTION: Enable a trailing comma by default in the formatter
// ERROR: Unresolved reference: Foo // ERROR: Unresolved reference: Foo
package bar package bar
idea/testData/multiModuleQuickFix/other/importExpectClassWithoutActualInJvm/jvm/b.kt.after
Vendored
+1
View File
@@ -4,6 +4,7 @@
// ACTION: Create enum 'Foo' // ACTION: Create enum 'Foo'
// ACTION: Create interface 'Foo' // ACTION: Create interface 'Foo'
// ACTION: Create type parameter 'Foo' in function 'use' // ACTION: Create type parameter 'Foo' in function 'use'
// ACTION: Enable a trailing comma by default in the formatter
// ERROR: Unresolved reference: Foo // ERROR: Unresolved reference: Foo
package bar package bar
idea/testData/quickfix/addDataModifier/abstract.kt
Vendored
+1
View File
@@ -3,6 +3,7 @@
// ACTION: Create extension function 'Foo.component2' // ACTION: Create extension function 'Foo.component2'
// ACTION: Create member function 'Foo.component1' // ACTION: Create member function 'Foo.component1'
// ACTION: Create member function 'Foo.component2' // ACTION: Create member function 'Foo.component2'
// ACTION: Enable a trailing comma by default in the formatter
// ACTION: Put arguments on separate lines // ACTION: Put arguments on separate lines
// ERROR: Cannot create an instance of an abstract class // ERROR: Cannot create an instance of an abstract class
// ERROR: Destructuring declaration initializer of type Foo must have a 'component1()' function // ERROR: Destructuring declaration initializer of type Foo must have a 'component1()' function
idea/testData/quickfix/addDataModifier/inner.kt
Vendored
+1
View File
@@ -3,6 +3,7 @@
// ACTION: Create extension function 'Test.Foo.component2' // ACTION: Create extension function 'Test.Foo.component2'
// ACTION: Create member function 'Test.Foo.component1' // ACTION: Create member function 'Test.Foo.component1'
// ACTION: Create member function 'Test.Foo.component2' // ACTION: Create member function 'Test.Foo.component2'
// ACTION: Enable a trailing comma by default in the formatter
// ACTION: Put arguments on separate lines // ACTION: Put arguments on separate lines
// ERROR: Destructuring declaration initializer of type Test.Foo must have a 'component1()' function // ERROR: Destructuring declaration initializer of type Test.Foo must have a 'component1()' function
// ERROR: Destructuring declaration initializer of type Test.Foo must have a 'component2()' function // ERROR: Destructuring declaration initializer of type Test.Foo must have a 'component2()' function
idea/testData/quickfix/addDataModifier/invisibleParameter.kt
Vendored
+1
View File
@@ -3,6 +3,7 @@
// ACTION: Create extension function 'Foo.component2' // ACTION: Create extension function 'Foo.component2'
// ACTION: Create member function 'Foo.component1' // ACTION: Create member function 'Foo.component1'
// ACTION: Create member function 'Foo.component2' // ACTION: Create member function 'Foo.component2'
// ACTION: Enable a trailing comma by default in the formatter
// ACTION: Put arguments on separate lines // ACTION: Put arguments on separate lines
// ERROR: Destructuring declaration initializer of type Foo must have a 'component1()' function // ERROR: Destructuring declaration initializer of type Foo must have a 'component1()' function
// ERROR: Destructuring declaration initializer of type Foo must have a 'component2()' function // ERROR: Destructuring declaration initializer of type Foo must have a 'component2()' function
idea/testData/quickfix/addDataModifier/invisibleParameter2.kt
Vendored
+1
View File
@@ -3,6 +3,7 @@
// ACTION: Create extension function 'Foo.component2' // ACTION: Create extension function 'Foo.component2'
// ACTION: Create member function 'Foo.component1' // ACTION: Create member function 'Foo.component1'
// ACTION: Create member function 'Foo.component2' // ACTION: Create member function 'Foo.component2'
// ACTION: Enable a trailing comma by default in the formatter
// ACTION: Put arguments on separate lines // ACTION: Put arguments on separate lines
// ERROR: Destructuring declaration initializer of type Foo must have a 'component1()' function // ERROR: Destructuring declaration initializer of type Foo must have a 'component1()' function
// ERROR: Destructuring declaration initializer of type Foo must have a 'component2()' function // ERROR: Destructuring declaration initializer of type Foo must have a 'component2()' function
idea/testData/quickfix/addDataModifier/noParameter.kt
Vendored
+1
View File
@@ -3,6 +3,7 @@
// ACTION: Create extension function 'Foo.component2' // ACTION: Create extension function 'Foo.component2'
// ACTION: Create member function 'Foo.component1' // ACTION: Create member function 'Foo.component1'
// ACTION: Create member function 'Foo.component2' // ACTION: Create member function 'Foo.component2'
// ACTION: Enable a trailing comma by default in the formatter
// ERROR: Destructuring declaration initializer of type Foo must have a 'component1()' function // ERROR: Destructuring declaration initializer of type Foo must have a 'component1()' function
// ERROR: Destructuring declaration initializer of type Foo must have a 'component2()' function // ERROR: Destructuring declaration initializer of type Foo must have a 'component2()' function
class Foo() class Foo()
idea/testData/quickfix/addDataModifier/notVarVal.kt
Vendored
+1
View File
@@ -3,6 +3,7 @@
// ACTION: Create extension function 'Foo.component2' // ACTION: Create extension function 'Foo.component2'
// ACTION: Create member function 'Foo.component1' // ACTION: Create member function 'Foo.component1'
// ACTION: Create member function 'Foo.component2' // ACTION: Create member function 'Foo.component2'
// ACTION: Enable a trailing comma by default in the formatter
// ACTION: Put arguments on separate lines // ACTION: Put arguments on separate lines
// ERROR: Destructuring declaration initializer of type Foo must have a 'component1()' function // ERROR: Destructuring declaration initializer of type Foo must have a 'component1()' function
// ERROR: Destructuring declaration initializer of type Foo must have a 'component2()' function // ERROR: Destructuring declaration initializer of type Foo must have a 'component2()' function
idea/testData/quickfix/addDataModifier/open.kt
Vendored
+1
View File
@@ -3,6 +3,7 @@
// ACTION: Create extension function 'Foo.component2' // ACTION: Create extension function 'Foo.component2'
// ACTION: Create member function 'Foo.component1' // ACTION: Create member function 'Foo.component1'
// ACTION: Create member function 'Foo.component2' // ACTION: Create member function 'Foo.component2'
// ACTION: Enable a trailing comma by default in the formatter
// ACTION: Put arguments on separate lines // ACTION: Put arguments on separate lines
// ERROR: Destructuring declaration initializer of type Foo must have a 'component1()' function // ERROR: Destructuring declaration initializer of type Foo must have a 'component1()' function
// ERROR: Destructuring declaration initializer of type Foo must have a 'component2()' function // ERROR: Destructuring declaration initializer of type Foo must have a 'component2()' function
idea/testData/quickfix/addDataModifier/sealed.kt
Vendored
+1
View File
@@ -3,6 +3,7 @@
// ACTION: Create extension function 'Foo.component2' // ACTION: Create extension function 'Foo.component2'
// ACTION: Create member function 'Foo.component1' // ACTION: Create member function 'Foo.component1'
// ACTION: Create member function 'Foo.component2' // ACTION: Create member function 'Foo.component2'
// ACTION: Enable a trailing comma by default in the formatter
// ACTION: Put arguments on separate lines // ACTION: Put arguments on separate lines
// ERROR: Cannot access '<init>': it is private in 'Foo' // ERROR: Cannot access '<init>': it is private in 'Foo'
// ERROR: Destructuring declaration initializer of type Foo must have a 'component1()' function // ERROR: Destructuring declaration initializer of type Foo must have a 'component1()' function
idea/testData/quickfix/addDataModifier/vararg.kt
Vendored
+1
View File
@@ -3,6 +3,7 @@
// ACTION: Create extension function 'Foo.component2' // ACTION: Create extension function 'Foo.component2'
// ACTION: Create member function 'Foo.component1' // ACTION: Create member function 'Foo.component1'
// ACTION: Create member function 'Foo.component2' // ACTION: Create member function 'Foo.component2'
// ACTION: Enable a trailing comma by default in the formatter
// ACTION: Put arguments on separate lines // ACTION: Put arguments on separate lines
// ERROR: Destructuring declaration initializer of type Foo must have a 'component1()' function // ERROR: Destructuring declaration initializer of type Foo must have a 'component1()' function
// ERROR: Destructuring declaration initializer of type Foo must have a 'component2()' function // ERROR: Destructuring declaration initializer of type Foo must have a 'component2()' function
idea/testData/quickfix/addInline/local.kt
Vendored
+1
View File
@@ -1,4 +1,5 @@
// "Add 'inline' to function 'foo'" "false" // "Add 'inline' to function 'foo'" "false"
// ACTION: Enable a trailing comma by default in the formatter
// ERROR: Modifier 'crossinline' is allowed only for function parameters of an inline function // ERROR: Modifier 'crossinline' is allowed only for function parameters of an inline function
fun bar() { fun bar() {
idea/testData/quickfix/addVarianceModifier/emptyTest.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// "Add 'out' variance" "false" // "Add 'out' variance" "false"
// ACTION: Enable a trailing comma by default in the formatter
// ACTION: Implement interface // ACTION: Implement interface
interface Empty<<caret>T> interface Empty<<caret>T>
idea/testData/quickfix/autoImports/multiDeclarationExtensionComponentNoOperator.test
Vendored
+1
View File
@@ -3,6 +3,7 @@
// ERROR: Destructuring declaration initializer of type Some must have a 'component1()' function // ERROR: Destructuring declaration initializer of type Some must have a 'component1()' function
// ACTION: Create extension function 'Some.component1' // ACTION: Create extension function 'Some.component1'
// ACTION: Create member function 'Some.component1' // ACTION: Create member function 'Some.component1'
// ACTION: Enable a trailing comma by default in the formatter
// ACTION: Introduce import alias // ACTION: Introduce import alias
idea/testData/quickfix/changeSignature/removeUnusedParameterOfPropertySetter.kt
Vendored
+1
View File
@@ -1,4 +1,5 @@
// "Remove parameter 'value'" "false" // "Remove parameter 'value'" "false"
// ACTION: Enable a trailing comma by default in the formatter
// ACTION: Specify type explicitly // ACTION: Specify type explicitly
class Abacaba { class Abacaba {
var foo: String var foo: String
idea/testData/quickfix/createFromUsage/createClass/typeReference/noAnnotationForTypeBound.kt
Vendored
+1
View File
@@ -3,5 +3,6 @@
// ACTION: Create interface 'NotExistent' // ACTION: Create interface 'NotExistent'
// ACTION: Create type parameter 'NotExistent' in class 'TPB' // ACTION: Create type parameter 'NotExistent' in class 'TPB'
// ACTION: Create test // ACTION: Create test
// ACTION: Enable a trailing comma by default in the formatter
// ERROR: Unresolved reference: NotExistent // ERROR: Unresolved reference: NotExistent
class TPB<X : <caret>NotExistent> class TPB<X : <caret>NotExistent>
idea/testData/quickfix/createFromUsage/createClass/typeReference/noEnumForTypeBound.kt
Vendored
+1
View File
@@ -3,5 +3,6 @@
// ACTION: Create interface 'NotExistent' // ACTION: Create interface 'NotExistent'
// ACTION: Create type parameter 'NotExistent' in class 'TPB' // ACTION: Create type parameter 'NotExistent' in class 'TPB'
// ACTION: Create test // ACTION: Create test
// ACTION: Enable a trailing comma by default in the formatter
// ERROR: Unresolved reference: NotExistent // ERROR: Unresolved reference: NotExistent
class TPB<X : <caret>NotExistent> class TPB<X : <caret>NotExistent>
idea/testData/quickfix/createFromUsage/createClass/typeReference/noObjectForTypeBound.kt
Vendored
+1
View File
@@ -3,5 +3,6 @@
// ACTION: Create interface 'NotExistent' // ACTION: Create interface 'NotExistent'
// ACTION: Create type parameter 'NotExistent' in class 'TPB' // ACTION: Create type parameter 'NotExistent' in class 'TPB'
// ACTION: Create test // ACTION: Create test
// ACTION: Enable a trailing comma by default in the formatter
// ERROR: Unresolved reference: NotExistent // ERROR: Unresolved reference: NotExistent
class TPB<X : <caret>NotExistent> class TPB<X : <caret>NotExistent>
idea/testData/quickfix/createFromUsage/createTypeParameter/inContainingDeclaration/qualifiedType.kt
Vendored
+1
View File
@@ -3,6 +3,7 @@
// ACTION: Create class 'X' // ACTION: Create class 'X'
// ACTION: Create enum 'X' // ACTION: Create enum 'X'
// ACTION: Create interface 'X' // ACTION: Create interface 'X'
// ACTION: Enable a trailing comma by default in the formatter
// ERROR: Unresolved reference: X // ERROR: Unresolved reference: X
class A class A
idea/testData/quickfix/createFromUsage/createTypeParameter/inContainingDeclaration/typeQualifier.kt
Vendored
+1
View File
@@ -3,6 +3,7 @@
// ACTION: Create enum 'X' // ACTION: Create enum 'X'
// ACTION: Create interface 'X' // ACTION: Create interface 'X'
// ACTION: Create object 'X' // ACTION: Create object 'X'
// ACTION: Enable a trailing comma by default in the formatter
// ERROR: Unresolved reference: X // ERROR: Unresolved reference: X
class A class A
idea/testData/quickfix/createFromUsage/createTypeParameter/inContainingDeclaration/withTypeArguments.kt
Vendored
+1
View File
@@ -1,6 +1,7 @@
// "Create type parameter 'X'" "false" // "Create type parameter 'X'" "false"
// ACTION: Create class 'X' // ACTION: Create class 'X'
// ACTION: Create interface 'X' // ACTION: Create interface 'X'
// ACTION: Enable a trailing comma by default in the formatter
// ERROR: Unresolved reference: X // ERROR: Unresolved reference: X
class A class A
idea/testData/quickfix/createFromUsage/createTypeParameter/inReferencedDeclaration/missingArguments.kt
Vendored
+1
View File
@@ -1,4 +1,5 @@
// "Create type parameter in class 'X'" "false" // "Create type parameter in class 'X'" "false"
// ACTION: Enable a trailing comma by default in the formatter
// ACTION: Introduce import alias // ACTION: Introduce import alias
// ERROR: 2 type arguments expected for class X<T, U> // ERROR: 2 type arguments expected for class X<T, U>
class X<T, U> class X<T, U>
idea/testData/quickfix/createFromUsage/createTypeParameter/inReferencedDeclaration/notOnTypeArgumentList.kt
Vendored
+1
View File
@@ -1,4 +1,5 @@
// "Create type parameter in class 'X'" "false" // "Create type parameter in class 'X'" "false"
// ACTION: Enable a trailing comma by default in the formatter
// ACTION: Introduce import alias // ACTION: Introduce import alias
// ERROR: No type arguments expected for class X // ERROR: No type arguments expected for class X
idea/testData/quickfix/createFromUsage/createVariable/localVariable/inAnnotation.kt
Vendored
+1
View File
@@ -1,6 +1,7 @@
// "Create local variable 'defaultPreferencesName'" "false" // "Create local variable 'defaultPreferencesName'" "false"
// ACTION: Create parameter 'defaultPreferencesName' // ACTION: Create parameter 'defaultPreferencesName'
// ACTION: Create property 'defaultPreferencesName' // ACTION: Create property 'defaultPreferencesName'
// ACTION: Enable a trailing comma by default in the formatter
// ACTION: Rename reference // ACTION: Rename reference
// ERROR: Unresolved reference: defaultPreferencesName // ERROR: Unresolved reference: defaultPreferencesName
// ERROR: Default value of annotation parameter must be a compile-time constant // ERROR: Default value of annotation parameter must be a compile-time constant
idea/testData/quickfix/createFromUsage/createVariable/parameter/dataClassPropertyByDestructuringEntryWithSkippedIndex.kt
Vendored
+1
View File
@@ -1,5 +1,6 @@
// "Create property 'address2' as constructor parameter" "false" // "Create property 'address2' as constructor parameter" "false"
// ACTION: Create property 'address' as constructor parameter // ACTION: Create property 'address' as constructor parameter
// ACTION: Enable a trailing comma by default in the formatter
// ACTION: Introduce import alias // ACTION: Introduce import alias
// ACTION: Make 'Person' data class // ACTION: Make 'Person' data class
// ERROR: Destructuring declaration initializer of type Person must have a 'component3()' function // ERROR: Destructuring declaration initializer of type Person must have a 'component3()' function
idea/testData/quickfix/decreaseVisibility/exposedParameterType.kt
Vendored
+1
View File
@@ -1,5 +1,6 @@
// "Make 'foo' private" "false" // "Make 'foo' private" "false"
// ACTION: Convert parameter to receiver // ACTION: Convert parameter to receiver
// ACTION: Enable a trailing comma by default in the formatter
// ACTION: Make 'Nested' internal // ACTION: Make 'Nested' internal
// ACTION: Make 'Nested' public // ACTION: Make 'Nested' public
// ACTION: Remove parameter 'arg' // ACTION: Remove parameter 'arg'
idea/testData/quickfix/decreaseVisibility/exposedTypeInAnnotation.kt
Vendored
+1
View File
@@ -1,5 +1,6 @@
// "Make '<init>' internal" "false" // "Make '<init>' internal" "false"
// DISABLE-ERRORS // DISABLE-ERRORS
// ACTION: Enable a trailing comma by default in the formatter
// ACTION: Introduce import alias // ACTION: Introduce import alias
// ACTION: Make 'My' public // ACTION: Make 'My' public
idea/testData/quickfix/experimental/override.kt
Vendored
+1
View File
@@ -5,6 +5,7 @@
// ACTION: Add '@OptIn(MyExperimentalAPI::class)' annotation to 'foo' // ACTION: Add '@OptIn(MyExperimentalAPI::class)' annotation to 'foo'
// ACTION: Add '@OptIn(MyExperimentalAPI::class)' annotation to containing class 'Derived' // ACTION: Add '@OptIn(MyExperimentalAPI::class)' annotation to containing class 'Derived'
// ACTION: Add '-Xopt-in=MyExperimentalAPI' to module light_idea_test_case compiler arguments // ACTION: Add '-Xopt-in=MyExperimentalAPI' to module light_idea_test_case compiler arguments
// ACTION: Enable a trailing comma by default in the formatter
// ERROR: This declaration overrides experimental member of supertype 'Base' and must be annotated with '@MyExperimentalAPI' // ERROR: This declaration overrides experimental member of supertype 'Base' and must be annotated with '@MyExperimentalAPI'
@RequiresOptIn @RequiresOptIn
idea/testData/quickfix/functionWithLambdaExpressionBody/removeBraces/functionHasComment.kt
Vendored
+1
View File
@@ -2,6 +2,7 @@
// TOOL: org.jetbrains.kotlin.idea.inspections.FunctionWithLambdaExpressionBodyInspection // TOOL: org.jetbrains.kotlin.idea.inspections.FunctionWithLambdaExpressionBodyInspection
// ACTION: Convert to block body // ACTION: Convert to block body
// ACTION: Convert to run { ... } // ACTION: Convert to run { ... }
// ACTION: Enable a trailing comma by default in the formatter
// ACTION: Specify explicit lambda signature // ACTION: Specify explicit lambda signature
// ACTION: Specify explicit lambda signature // ACTION: Specify explicit lambda signature
// ACTION: Specify return type explicitly // ACTION: Specify return type explicitly
idea/testData/quickfix/functionWithLambdaExpressionBody/removeBraces/functionHasMultiStatements.kt
Vendored
+1
View File
@@ -3,6 +3,7 @@
// ACTION: Convert to block body // ACTION: Convert to block body
// ACTION: Convert to run { ... } // ACTION: Convert to run { ... }
// ACTION: Specify explicit lambda signature // ACTION: Specify explicit lambda signature
// ACTION: Enable a trailing comma by default in the formatter
// ACTION: Specify explicit lambda signature // ACTION: Specify explicit lambda signature
// ACTION: Specify return type explicitly // ACTION: Specify return type explicitly
fun test(a: Int, b: Int) = <caret>{ fun test(a: Int, b: Int) = <caret>{
idea/testData/quickfix/functionWithLambdaExpressionBody/removeBraces/functionHasNoStatement.kt
Vendored
+1
View File
@@ -3,6 +3,7 @@
// ACTION: Convert to block body // ACTION: Convert to block body
// ACTION: Convert to multi-line lambda // ACTION: Convert to multi-line lambda
// ACTION: Convert to run { ... } // ACTION: Convert to run { ... }
// ACTION: Enable a trailing comma by default in the formatter
// ACTION: Specify explicit lambda signature // ACTION: Specify explicit lambda signature
// ACTION: Specify explicit lambda signature // ACTION: Specify explicit lambda signature
// ACTION: Specify return type explicitly // ACTION: Specify return type explicitly
idea/testData/quickfix/functionWithLambdaExpressionBody/removeBraces/funtionIsUsed.kt
Vendored
+1
View File
@@ -2,6 +2,7 @@
// TOOL: org.jetbrains.kotlin.idea.inspections.FunctionWithLambdaExpressionBodyInspection // TOOL: org.jetbrains.kotlin.idea.inspections.FunctionWithLambdaExpressionBodyInspection
// ACTION: Convert to block body // ACTION: Convert to block body
// ACTION: Convert to multi-line lambda // ACTION: Convert to multi-line lambda
// ACTION: Enable a trailing comma by default in the formatter
// ACTION: Specify explicit lambda signature // ACTION: Specify explicit lambda signature
// ACTION: Specify explicit lambda signature // ACTION: Specify explicit lambda signature
// ACTION: Specify return type explicitly // ACTION: Specify return type explicitly
idea/testData/quickfix/functionWithLambdaExpressionBody/removeBraces/getterHasComment.kt
Vendored
+1
View File
@@ -3,6 +3,7 @@
// ACTION: Convert property getter to initializer // ACTION: Convert property getter to initializer
// ACTION: Convert to block body // ACTION: Convert to block body
// ACTION: Convert to run { ... } // ACTION: Convert to run { ... }
// ACTION: Enable a trailing comma by default in the formatter
// ACTION: Specify explicit lambda signature // ACTION: Specify explicit lambda signature
// ACTION: Specify explicit lambda signature // ACTION: Specify explicit lambda signature
// ACTION: Specify type explicitly // ACTION: Specify type explicitly
idea/testData/quickfix/functionWithLambdaExpressionBody/removeBraces/getterHasMultiStatements.kt
Vendored
+1
View File
@@ -3,6 +3,7 @@
// ACTION: Convert property getter to initializer // ACTION: Convert property getter to initializer
// ACTION: Convert to block body // ACTION: Convert to block body
// ACTION: Convert to run { ... } // ACTION: Convert to run { ... }
// ACTION: Enable a trailing comma by default in the formatter
// ACTION: Specify explicit lambda signature // ACTION: Specify explicit lambda signature
// ACTION: Specify explicit lambda signature // ACTION: Specify explicit lambda signature
// ACTION: Specify type explicitly // ACTION: Specify type explicitly
idea/testData/quickfix/functionWithLambdaExpressionBody/removeBraces/getterHasNoStatement.kt
Vendored
+1
View File
@@ -4,6 +4,7 @@
// ACTION: Convert to block body // ACTION: Convert to block body
// ACTION: Convert to multi-line lambda // ACTION: Convert to multi-line lambda
// ACTION: Convert to run { ... } // ACTION: Convert to run { ... }
// ACTION: Enable a trailing comma by default in the formatter
// ACTION: Specify explicit lambda signature // ACTION: Specify explicit lambda signature
// ACTION: Specify explicit lambda signature // ACTION: Specify explicit lambda signature
// ACTION: Specify type explicitly // ACTION: Specify type explicitly
idea/testData/quickfix/functionWithLambdaExpressionBody/removeBraces/getterIsUsed.kt
Vendored
+1
View File
@@ -3,6 +3,7 @@
// ACTION: Convert property getter to initializer // ACTION: Convert property getter to initializer
// ACTION: Convert to block body // ACTION: Convert to block body
// ACTION: Convert to multi-line lambda // ACTION: Convert to multi-line lambda
// ACTION: Enable a trailing comma by default in the formatter
// ACTION: Specify explicit lambda signature // ACTION: Specify explicit lambda signature
// ACTION: Specify explicit lambda signature // ACTION: Specify explicit lambda signature
// ACTION: Specify type explicitly // ACTION: Specify type explicitly
idea/testData/quickfix/functionWithLambdaExpressionBody/wrapRun/funtionIsUsed.kt
Vendored
+1
View File
@@ -2,6 +2,7 @@
// TOOL: org.jetbrains.kotlin.idea.inspections.FunctionWithLambdaExpressionBodyInspection // TOOL: org.jetbrains.kotlin.idea.inspections.FunctionWithLambdaExpressionBodyInspection
// ACTION: Convert to block body // ACTION: Convert to block body
// ACTION: Convert to multi-line lambda // ACTION: Convert to multi-line lambda
// ACTION: Enable a trailing comma by default in the formatter
// ACTION: Specify explicit lambda signature // ACTION: Specify explicit lambda signature
// ACTION: Specify explicit lambda signature // ACTION: Specify explicit lambda signature
// ACTION: Specify return type explicitly // ACTION: Specify return type explicitly
idea/testData/quickfix/functionWithLambdaExpressionBody/wrapRun/getterIsUsed.kt
Vendored
+1
View File
@@ -3,6 +3,7 @@
// ACTION: Convert property getter to initializer // ACTION: Convert property getter to initializer
// ACTION: Convert to block body // ACTION: Convert to block body
// ACTION: Convert to multi-line lambda // ACTION: Convert to multi-line lambda
// ACTION: Enable a trailing comma by default in the formatter
// ACTION: Specify explicit lambda signature // ACTION: Specify explicit lambda signature
// ACTION: Specify explicit lambda signature // ACTION: Specify explicit lambda signature
// ACTION: Specify type explicitly // ACTION: Specify type explicitly
idea/testData/quickfix/makePrivateAndOverrideMember/parameterHasInternal.before.Main.kt
Vendored
+1
View File
@@ -2,6 +2,7 @@
// DISABLE-ERRORS // DISABLE-ERRORS
// ACTION: Convert to secondary constructor // ACTION: Convert to secondary constructor
// ACTION: Create test // ACTION: Create test
// ACTION: Enable a trailing comma by default in the formatter
// ACTION: Make private // ACTION: Make private
// ACTION: Make protected // ACTION: Make protected
// ACTION: Make public // ACTION: Make public
idea/testData/quickfix/memberVisibilityCanBePrivate/getter.before.Main.kt
Vendored
+1
View File
@@ -1,6 +1,7 @@
// "Add 'private' modifier" "false" // "Add 'private' modifier" "false"
// ACTION: Convert to secondary constructor // ACTION: Convert to secondary constructor
// ACTION: Create test // ACTION: Create test
// ACTION: Enable a trailing comma by default in the formatter
// ACTION: Move to class body // ACTION: Move to class body
class My(val <caret>parameter: Int) { class My(val <caret>parameter: Int) {
idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalJavaUpperBound.before.Main.kt
Vendored
+1
View File
@@ -1,5 +1,6 @@
// "class org.jetbrains.kotlin.idea.quickfix.AddModifierFix" "false" // "class org.jetbrains.kotlin.idea.quickfix.AddModifierFix" "false"
// ACTION: Create test // ACTION: Create test
// ACTION: Enable a trailing comma by default in the formatter
// ACTION: Inline type parameter // ACTION: Inline type parameter
// ACTION: Introduce import alias // ACTION: Introduce import alias
// ACTION: Remove final upper bound // ACTION: Remove final upper bound
idea/testData/quickfix/nullables/unsafeInfixCall/unsafeComparisonInWhen.kt
Vendored
+1
View File
@@ -1,6 +1,7 @@
// "Replace with safe (?.) call" "false" // "Replace with safe (?.) call" "false"
// ACTION: Add non-null asserted (!!) call // ACTION: Add non-null asserted (!!) call
// ACTION: Flip '<=' // ACTION: Flip '<='
// ACTION: Enable a trailing comma by default in the formatter
// ACTION: Replace overloaded operator with function call // ACTION: Replace overloaded operator with function call
// ERROR: Operator call corresponds to a dot-qualified call 'w?.x.compareTo(42)' which is not allowed on a nullable receiver 'w?.x'. // ERROR: Operator call corresponds to a dot-qualified call 'w?.x.compareTo(42)' which is not allowed on a nullable receiver 'w?.x'.
idea/testData/quickfix/platformTypesInspection/nestedNoAssertRuntime.kt
Vendored
+1
View File
@@ -2,6 +2,7 @@
// ACTION: Convert function to property // ACTION: Convert function to property
// ACTION: Convert to block body // ACTION: Convert to block body
// ACTION: Create test // ACTION: Create test
// ACTION: Enable a trailing comma by default in the formatter
// ACTION: Specify return type explicitly // ACTION: Specify return type explicitly
fun foo<caret>() = arrayOf(java.lang.String.valueOf(1)) fun foo<caret>() = arrayOf(java.lang.String.valueOf(1))
idea/testData/quickfix/removeSingleLambdaParameter/multiple.kt
Vendored
+1
View File
@@ -5,6 +5,7 @@
// ACTION: Specify type explicitly // ACTION: Specify type explicitly
// ACTION: Convert to anonymous function // ACTION: Convert to anonymous function
// ACTION: Convert to multi-line lambda // ACTION: Convert to multi-line lambda
// ACTION: Enable a trailing comma by default in the formatter
// RUNTIME_WITH_FULL_JDK // RUNTIME_WITH_FULL_JDK
fun main() { fun main() {
idea/testData/quickfix/removeSingleLambdaParameter/propertyWithImplicitType.kt
Vendored
+1
View File
@@ -4,6 +4,7 @@
// ACTION: Convert to also // ACTION: Convert to also
// ACTION: Convert to apply // ACTION: Convert to apply
// ACTION: Convert to multi-line lambda // ACTION: Convert to multi-line lambda
// ACTION: Enable a trailing comma by default in the formatter
fun test() { fun test() {
val f = { <caret>i: Int -> foo() } val f = { <caret>i: Int -> foo() }
bar(f) bar(f)
idea/testData/quickfix/renameToUnderscore/functionExpressionParameterNoRemoveParameter.kt
Vendored
+1
View File
@@ -3,6 +3,7 @@
// ACTION: Convert parameter to receiver // ACTION: Convert parameter to receiver
// ACTION: Rename to _ // ACTION: Rename to _
// ACTION: Specify return type explicitly // ACTION: Specify return type explicitly
// ACTION: Enable a trailing comma by default in the formatter
// ACTION: Put parameters on separate lines // ACTION: Put parameters on separate lines
fun foo(block: (String, Int) -> Unit) { fun foo(block: (String, Int) -> Unit) {
idea/testData/quickfix/renameToUnderscore/lambdaParameterNoRemoveParameter.kt
Vendored
+1
View File
@@ -1,4 +1,5 @@
// "Remove parameter 'x'" "false" // "Remove parameter 'x'" "false"
// ACTION: Enable a trailing comma by default in the formatter
// ACTION: Move lambda argument into parentheses // ACTION: Move lambda argument into parentheses
// ACTION: Remove explicit lambda parameter types (may break code) // ACTION: Remove explicit lambda parameter types (may break code)
// ACTION: Rename to _ // ACTION: Rename to _
idea/testData/quickfix/renameToUnderscore/noActionForCommonFunction.kt
Vendored
+1
View File
@@ -1,5 +1,6 @@
// "Rename to _" "false" // "Rename to _" "false"
// ACTION: Convert parameter to receiver // ACTION: Convert parameter to receiver
// ACTION: Enable a trailing comma by default in the formatter
// ACTION: Remove parameter 'x' // ACTION: Remove parameter 'x'
fun foo(x<caret>: Int) { fun foo(x<caret>: Int) {
idea/testData/quickfix/renameUnresolvedReference/typeRef.kt
Vendored
+1
View File
@@ -3,6 +3,7 @@
// ACTION: Create class 'X' // ACTION: Create class 'X'
// ACTION: Create enum 'X' // ACTION: Create enum 'X'
// ACTION: Create interface 'X' // ACTION: Create interface 'X'
// ACTION: Enable a trailing comma by default in the formatter
// ERROR: Unresolved reference: X // ERROR: Unresolved reference: X
// ERROR: Unresolved reference: X // ERROR: Unresolved reference: X
class A { class A {
idea/testData/quickfix/replaceWithSafeCallForScopeFunction/letWithWrongImplicitThis.kt
Vendored
+1
View File
@@ -7,6 +7,7 @@
// ACTION: Specify explicit lambda signature // ACTION: Specify explicit lambda signature
// ACTION: Add return@let // ACTION: Add return@let
// ACTION: Convert to single-line lambda // ACTION: Convert to single-line lambda
// ACTION: Enable a trailing comma by default in the formatter
// ERROR: Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type String? // ERROR: Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type String?
fun String?.foo(a: String?) { fun String?.foo(a: String?) {
idea/testData/quickfix/specifyOverrideExplicitly/notPossible.kt
Vendored
+1
View File
@@ -2,6 +2,7 @@
// ACTION: Create test // ACTION: Create test
// ACTION: Make primary constructor internal // ACTION: Make primary constructor internal
// ACTION: Make primary constructor private // ACTION: Make primary constructor private
// ACTION: Enable a trailing comma by default in the formatter
// ACTION: Extract 'C' from current file // ACTION: Extract 'C' from current file
// ACTION: Rename file to C.kt // ACTION: Rename file to C.kt
idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/dontChangeFunctionReturnTypeToErrorType.kt
Vendored
+1
View File
@@ -4,6 +4,7 @@
// ACTION: Create class 'NoSuchType' // ACTION: Create class 'NoSuchType'
// ACTION: Create enum 'NoSuchType' // ACTION: Create enum 'NoSuchType'
// ACTION: Create interface 'NoSuchType' // ACTION: Create interface 'NoSuchType'
// ACTION: Enable a trailing comma by default in the formatter
// ACTION: Remove explicit lambda parameter types (may break code) // ACTION: Remove explicit lambda parameter types (may break code)
// ACTION: Create type parameter 'NoSuchType' in function 'foo' // ACTION: Create type parameter 'NoSuchType' in function 'foo'
// ERROR: Type mismatch: inferred type is ([ERROR : NoSuchType]) -> Int but Int was expected // ERROR: Type mismatch: inferred type is ([ERROR : NoSuchType]) -> Int but Int was expected
idea/testData/quickfix/typeOfAnnotationMember/star.kt
Vendored
+1
View File
@@ -1,6 +1,7 @@
// "Replace array of boxed with array of primitive" "false" // "Replace array of boxed with array of primitive" "false"
// ERROR: Invalid type of annotation member // ERROR: Invalid type of annotation member
// ACTION: Introduce import alias // ACTION: Introduce import alias
// ACTION: Enable a trailing comma by default in the formatter
// ACTION: Put parameters on one line // ACTION: Put parameters on one line
annotation class SuperAnnotation( annotation class SuperAnnotation(
val foo: <caret>Array<*>, val foo: <caret>Array<*>,
idea/testData/quickfix/typeOfAnnotationMember/string.kt
Vendored
+1
View File
@@ -1,6 +1,7 @@
// "Replace array of boxed with array of primitive" "false" // "Replace array of boxed with array of primitive" "false"
// ACTION: Put parameters on one line // ACTION: Put parameters on one line
// ACTION: Introduce import alias // ACTION: Introduce import alias
// ACTION: Enable a trailing comma by default in the formatter
// ACTION: Convert to vararg parameter (may break code) // ACTION: Convert to vararg parameter (may break code)
annotation class SuperAnnotation( annotation class SuperAnnotation(
val str: <caret>Array<String> val str: <caret>Array<String>
idea/testData/quickfix/unusedSuppressAnnotation/notForDeprecated.kt
Vendored
+1
View File
@@ -1,4 +1,5 @@
// "Suppress unused warning if annotated by 'kotlin.Deprecated'" "false" // "Suppress unused warning if annotated by 'kotlin.Deprecated'" "false"
// ACTION: Create test // ACTION: Create test
// ACTION: Enable a trailing comma by default in the formatter
@Deprecated("") @Deprecated("")
fun foo<caret>(){} fun foo<caret>(){}
idea/testData/quickfix/variables/removeValVarFromParameter/constructorParameter.kt
Vendored
+1
View File
@@ -4,6 +4,7 @@
// ACTION: Make protected // ACTION: Make protected
// ACTION: Create test // ACTION: Create test
// ACTION: Convert to secondary constructor // ACTION: Convert to secondary constructor
// ACTION: Enable a trailing comma by default in the formatter
// ACTION: Move to class body // ACTION: Move to class body
class C(<caret>val x: String) { class C(<caret>val x: String) {
} }
idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
Generated
+18
View File
@@ -16059,6 +16059,24 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
} }
} }
@TestMetadata("idea/testData/intentions/trailingComma")
@TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class)
public static class TrailingComma extends AbstractIntentionTest {
private void runTest(String testDataFilePath) throws Exception {
KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
}
public void testAllFilesPresentInTrailingComma() throws Exception {
KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("idea/testData/intentions/trailingComma"), Pattern.compile("^([\\w\\-_]+)\\.(kt|kts)$"), null, true);
}
@TestMetadata("valueParameterList.kt")
public void testValueParameterList() throws Exception {
runTest("idea/testData/intentions/trailingComma/valueParameterList.kt");
}
}
@TestMetadata("idea/testData/intentions/underscoresInNumericLiteral") @TestMetadata("idea/testData/intentions/underscoresInNumericLiteral")
@TestDataPath("$PROJECT_ROOT") @TestDataPath("$PROJECT_ROOT")
@RunWith(JUnit3RunnerWithInners.class) @RunWith(JUnit3RunnerWithInners.class)