From 356cb80e7f87abbbfd148013b44563095e21dd71 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Tue, 13 May 2014 20:48:12 +0400 Subject: [PATCH] Indent for multideclarations --- .../org/jetbrains/jet/plugin/formatter/JetBlock.java | 2 +- idea/testData/formatter/Multideclaration.after.kt | 7 +++++++ idea/testData/formatter/Multideclaration.kt | 7 +++++++ .../MultideclarationAfterEq.after.kt | 4 ++++ .../indentationOnNewline/MultideclarationAfterEq.kt | 3 +++ .../MultideclarationBeforeEq.after.kt | 4 ++++ .../indentationOnNewline/MultideclarationBeforeEq.kt | 3 +++ .../jet/formatter/JetFormatterTestGenerated.java | 5 +++++ .../JetTypingIndentationTestBaseGenerated.java | 10 ++++++++++ 9 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 idea/testData/formatter/Multideclaration.after.kt create mode 100644 idea/testData/formatter/Multideclaration.kt create mode 100644 idea/testData/indentationOnNewline/MultideclarationAfterEq.after.kt create mode 100644 idea/testData/indentationOnNewline/MultideclarationAfterEq.kt create mode 100644 idea/testData/indentationOnNewline/MultideclarationBeforeEq.after.kt create mode 100644 idea/testData/indentationOnNewline/MultideclarationBeforeEq.kt diff --git a/idea/src/org/jetbrains/jet/plugin/formatter/JetBlock.java b/idea/src/org/jetbrains/jet/plugin/formatter/JetBlock.java index 1992a8e94d0..ac0be63a29e 100644 --- a/idea/src/org/jetbrains/jet/plugin/formatter/JetBlock.java +++ b/idea/src/org/jetbrains/jet/plugin/formatter/JetBlock.java @@ -335,7 +335,7 @@ public class JetBlock extends AbstractBlock { .set(Indent.getNormalIndent()), strategy("Indent for parts") - .in(PROPERTY, FUN) + .in(PROPERTY, FUN, MULTI_VARIABLE_DECLARATION) .notForType(BLOCK, FUN_KEYWORD, VAL_KEYWORD, VAR_KEYWORD) .set(Indent.getContinuationWithoutFirstIndent()), diff --git a/idea/testData/formatter/Multideclaration.after.kt b/idea/testData/formatter/Multideclaration.after.kt new file mode 100644 index 00000000000..1ddac41485d --- /dev/null +++ b/idea/testData/formatter/Multideclaration.after.kt @@ -0,0 +1,7 @@ +fun test() { + val (a, b) = + Pair(true, false) + + val (c, d) + = Pair(true, false) +} \ No newline at end of file diff --git a/idea/testData/formatter/Multideclaration.kt b/idea/testData/formatter/Multideclaration.kt new file mode 100644 index 00000000000..780724826ca --- /dev/null +++ b/idea/testData/formatter/Multideclaration.kt @@ -0,0 +1,7 @@ +fun test() { + val (a, b) = + Pair(true, false) + + val (c, d) + = Pair(true, false) +} \ No newline at end of file diff --git a/idea/testData/indentationOnNewline/MultideclarationAfterEq.after.kt b/idea/testData/indentationOnNewline/MultideclarationAfterEq.after.kt new file mode 100644 index 00000000000..8927aeace83 --- /dev/null +++ b/idea/testData/indentationOnNewline/MultideclarationAfterEq.after.kt @@ -0,0 +1,4 @@ +fun test() { + val (a, b) = + +} \ No newline at end of file diff --git a/idea/testData/indentationOnNewline/MultideclarationAfterEq.kt b/idea/testData/indentationOnNewline/MultideclarationAfterEq.kt new file mode 100644 index 00000000000..34cdfc34337 --- /dev/null +++ b/idea/testData/indentationOnNewline/MultideclarationAfterEq.kt @@ -0,0 +1,3 @@ +fun test() { + val (a, b) = +} \ No newline at end of file diff --git a/idea/testData/indentationOnNewline/MultideclarationBeforeEq.after.kt b/idea/testData/indentationOnNewline/MultideclarationBeforeEq.after.kt new file mode 100644 index 00000000000..d65551f8e16 --- /dev/null +++ b/idea/testData/indentationOnNewline/MultideclarationBeforeEq.after.kt @@ -0,0 +1,4 @@ +fun test() { + val (a, b) + +} \ No newline at end of file diff --git a/idea/testData/indentationOnNewline/MultideclarationBeforeEq.kt b/idea/testData/indentationOnNewline/MultideclarationBeforeEq.kt new file mode 100644 index 00000000000..51d3345be08 --- /dev/null +++ b/idea/testData/indentationOnNewline/MultideclarationBeforeEq.kt @@ -0,0 +1,3 @@ +fun test() { + val (a, b) +} \ No newline at end of file diff --git a/idea/tests/org/jetbrains/jet/formatter/JetFormatterTestGenerated.java b/idea/tests/org/jetbrains/jet/formatter/JetFormatterTestGenerated.java index 6189b2d49e2..a36e353cf4a 100644 --- a/idea/tests/org/jetbrains/jet/formatter/JetFormatterTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/formatter/JetFormatterTestGenerated.java @@ -214,6 +214,11 @@ public class JetFormatterTestGenerated extends AbstractJetFormatterTest { doTest("idea/testData/formatter/LoopParameterWithExplicitType.after.kt"); } + @TestMetadata("Multideclaration.after.kt") + public void testMultideclaration() throws Exception { + doTest("idea/testData/formatter/Multideclaration.after.kt"); + } + @TestMetadata("MultilineFunctionLiteral.after.kt") public void testMultilineFunctionLiteral() throws Exception { doTest("idea/testData/formatter/MultilineFunctionLiteral.after.kt"); diff --git a/idea/tests/org/jetbrains/jet/formatter/JetTypingIndentationTestBaseGenerated.java b/idea/tests/org/jetbrains/jet/formatter/JetTypingIndentationTestBaseGenerated.java index e9eabf64d37..26193d1d8b8 100644 --- a/idea/tests/org/jetbrains/jet/formatter/JetTypingIndentationTestBaseGenerated.java +++ b/idea/tests/org/jetbrains/jet/formatter/JetTypingIndentationTestBaseGenerated.java @@ -204,6 +204,16 @@ public class JetTypingIndentationTestBaseGenerated extends AbstractJetTypingInde doNewlineTest("idea/testData/indentationOnNewline/InMultilineLambdaAfterArrow.after.kt"); } + @TestMetadata("MultideclarationAfterEq.after.kt") + public void testMultideclarationAfterEq() throws Exception { + doNewlineTest("idea/testData/indentationOnNewline/MultideclarationAfterEq.after.kt"); + } + + @TestMetadata("MultideclarationBeforeEq.after.kt") + public void testMultideclarationBeforeEq() throws Exception { + doNewlineTest("idea/testData/indentationOnNewline/MultideclarationBeforeEq.after.kt"); + } + @TestMetadata("NotFirstParameter.after.kt") public void testNotFirstParameter() throws Exception { doNewlineTest("idea/testData/indentationOnNewline/NotFirstParameter.after.kt");