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

Format spaces after annotation in annotated expression

Browse Source 
Fixes #KT-12781
This commit is contained in:
Kirill Rakhman
2016-06-20 19:40:30 +02:00
committed by Nikolay Krasko
parent ae83330679
commit db387bd573
4 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/formatter/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt
+2
View File
@@ -217,6 +217,8 @@ fun createSpacingBuilder(settings: CodeStyleSettings, builderUtil: KotlinSpacing
after(LONG_TEMPLATE_ENTRY_START).spaces(0)
before(LONG_TEMPLATE_ENTRY_END).spaces(0)
afterInside(ANNOTATION_ENTRY, ANNOTATED_EXPRESSION).spaces(1)
val TYPE_COLON_ELEMENTS = TokenSet.create(PROPERTY, FUN, VALUE_PARAMETER, DESTRUCTURING_DECLARATION_ENTRY, FUNCTION_LITERAL)
beforeInside(COLON, TYPE_COLON_ELEMENTS) { spaceIf(kotlinSettings.SPACE_BEFORE_TYPE_COLON) }
afterInside(COLON, TYPE_COLON_ELEMENTS) { spaceIf(kotlinSettings.SPACE_AFTER_TYPE_COLON) }
idea/testData/formatter/AnnotationBeforeExpression.after.kt
Vendored
+3
View File
@@ -0,0 +1,3 @@
fun foo() {
@Suppress("all") ""
}
idea/testData/formatter/AnnotationBeforeExpression.kt
Vendored
+3
View File
@@ -0,0 +1,3 @@
fun foo() {
@Suppress("all") ""
}
idea/tests/org/jetbrains/kotlin/formatter/FormatterTestGenerated.java
+6
View File
@@ -43,6 +43,12 @@ public class FormatterTestGenerated extends AbstractFormatterTest {
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/formatter"), Pattern.compile("^([^\\.]+)\\.after\\.kt.*$"), true);
}
@TestMetadata("AnnotationBeforeExpression.after.kt")
public void testAnnotationBeforeExpression() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/AnnotationBeforeExpression.after.kt");
doTest(fileName);
}
@TestMetadata("AnonymousInitializers.after.kt")
public void testAnonymousInitializers() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/AnonymousInitializers.after.kt");