- Fix typing enter after import

- Prepared tests for KT-1161 (disabled)

idea/src/org/jetbrains/jet/plugin/formatter/JetBlock.java

@@ -112,7 +112,21 @@ public class JetBlock extends AbstractBlock {
             childIndent = Indent.getNormalIndent();
         }
         else if (childParent != null && childParent.getElementType() == JetNodeTypes.DOT_QUALIFIED_EXPRESSION) {
-            if (childParent.getFirstChildNode() != this) {
+            if (childParent.getFirstChildNode() != child && childParent.getLastChildNode() != child) {
+                childIndent = Indent.getContinuationWithoutFirstIndent(false);
+            }
+        }
+        else if (childParent != null && childParent.getElementType() == JetNodeTypes.VALUE_PARAMETER_LIST) {
+            String childText = child.getText();
+
+            if (!(childText.equals("(") || childText.equals(")"))) {
+                childIndent = Indent.getContinuationWithoutFirstIndent(false);
+            }
+        }
+        else if (childParent != null && childParent.getElementType() == JetNodeTypes.TYPE_PARAMETER_LIST) {
+            String childText = child.getText();
+
+            if (!(childText.equals("<") || childText.equals(">"))) {
                 childIndent = Indent.getContinuationWithoutFirstIndent(false);
             }
         }
@@ -157,7 +171,7 @@ public class JetBlock extends AbstractBlock {
             return new ChildAttributes(Indent.getContinuationWithoutFirstIndent(), null);
         }
 
-        return super.getChildAttributes(newChildIndex);
+        return new ChildAttributes(Indent.getNoneIndent(), null);
     }
 
     @Override

idea/testData/formatter/IndentationOnNewline/AfterImport.after.kt

@@ -0,0 +1,2 @@
+import java.util.ArrayList
+<caret>

idea/testData/formatter/IndentationOnNewline/AfterImport.kt

@@ -0,0 +1 @@
+import java.util.ArrayList<caret>

idea/testData/formatter/IndentationOnNewline/EmptyParameters.after.kt

@@ -0,0 +1,3 @@
+fun testParam(
+        <caret>) {
+}

idea/testData/formatter/IndentationOnNewline/EmptyParameters.kt

@@ -0,0 +1,3 @@
+fun testParam(
+        <caret>) {
+}

idea/testData/formatter/IndentationOnNewline/NotFirstParameter.after.kt

@@ -0,0 +1,3 @@
+fun testParam(a : String, b : Int,
+       <caret>) {
+}

idea/testData/formatter/IndentationOnNewline/NotFirstParameter.kt

@@ -0,0 +1,2 @@
+fun testParam(a : String, b : Int,<caret>) {
+}

idea/testData/formatter/Parameters.kt

@@ -0,0 +1,6 @@
+fun some(
+a: Int,
+b: String, c: Int,
+d: String, e: Int
+) {
+}

idea/testData/formatter/Parameters_after.kt

@@ -0,0 +1,6 @@
+fun some(
+        a: Int,
+        b: String, c: Int,
+        d: String, e: Int
+) {
+}

idea/tests/org/jetbrains/jet/formatter/JetFormatterTest.java

@@ -24,6 +24,10 @@ public class JetFormatterTest extends AbstractJetFormatterTest {
         doTest();
     }
 
+    public void testParameters() throws Exception {
+        doTest();
+    }
+
     public void testWhen() throws Exception {
         doTest();
     }

idea/tests/org/jetbrains/jet/formatter/JetTypingIndentationTest.java

@@ -10,6 +10,10 @@ import java.io.File;
  */
 public class JetTypingIndentationTest extends LightCodeInsightTestCase {
 
+    public void testAfterImport() {
+        doFileNewlineTest();
+    }
+
     public void testConsecutiveCallsAfterDot() {
         doFileNewlineTest();
     }