diff --git a/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt b/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt index 018549ddbb0..7b1ddcd70d9 100644 --- a/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt +++ b/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt @@ -166,6 +166,7 @@ fun createSpacingBuilder(settings: CodeStyleSettings, builderUtil: KotlinSpacing afterInside(IDENTIFIER, FUN).spacing(0, 0, 0, false, 0) around(AS_KEYWORD).spaces(1) + around(IS_KEYWORD).spaces(1) aroundInside(IDENTIFIER, BINARY_EXPRESSION).spaces(1) // before LPAR in constructor(): this() {} diff --git a/idea/testData/formatter/Is.after.kt b/idea/testData/formatter/Is.after.kt new file mode 100644 index 00000000000..6dd253f5890 --- /dev/null +++ b/idea/testData/formatter/Is.after.kt @@ -0,0 +1,5 @@ +fun f() { + if (1 is Int) { + + } +} \ No newline at end of file diff --git a/idea/testData/formatter/Is.kt b/idea/testData/formatter/Is.kt new file mode 100644 index 00000000000..5effe2baebf --- /dev/null +++ b/idea/testData/formatter/Is.kt @@ -0,0 +1,5 @@ +fun f() { + if (1 is Int) { + + } +} \ No newline at end of file diff --git a/idea/tests/org/jetbrains/kotlin/formatter/FormatterTestGenerated.java b/idea/tests/org/jetbrains/kotlin/formatter/FormatterTestGenerated.java index 5aa9b7bd260..0d9432ecd2f 100644 --- a/idea/tests/org/jetbrains/kotlin/formatter/FormatterTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/formatter/FormatterTestGenerated.java @@ -349,6 +349,12 @@ public class FormatterTestGenerated extends AbstractFormatterTest { doTest(fileName); } + @TestMetadata("Is.after.kt") + public void testIs() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/Is.after.kt"); + doTest(fileName); + } + @TestMetadata("KDoc.after.kt") public void testKDoc() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/KDoc.after.kt");