From f1d56bc8cc2833183ee5c25fa53fabab6895d4b2 Mon Sep 17 00:00:00 2001
From: Mikhail Golubev <mikhail.golubev@jetbrains.com>
Date: Wed, 16 Sep 2015 15:38:30 +0300
Subject: [PATCH] PY-16904 Preserve none indent when updating Numpy docstring

---
 .../docstrings/SectionBasedDocStringUpdater.java          | 2 +-
 .../afterNumpyAddMissingParameterPreservesNoneIndent.py   | 8 ++++++++
 .../beforeNumpyAddMissingParameterPreservesNoneIndent.py  | 7 +++++++
 .../com/jetbrains/python/intentions/PyIntentionTest.java  | 5 +++++
 4 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 python/testData/intentions/afterNumpyAddMissingParameterPreservesNoneIndent.py
 create mode 100644 python/testData/intentions/beforeNumpyAddMissingParameterPreservesNoneIndent.py

diff --git a/python/src/com/jetbrains/python/documentation/docstrings/SectionBasedDocStringUpdater.java b/python/src/com/jetbrains/python/documentation/docstrings/SectionBasedDocStringUpdater.java
index 860fe3326c12..83f4d8ead46c 100644
--- a/python/src/com/jetbrains/python/documentation/docstrings/SectionBasedDocStringUpdater.java
+++ b/python/src/com/jetbrains/python/documentation/docstrings/SectionBasedDocStringUpdater.java
@@ -299,7 +299,7 @@ public abstract class SectionBasedDocStringUpdater extends DocStringUpdater<Sect
   protected String getFieldIndent(@NotNull Section section, @NotNull SectionField field) {
     final String titleIndent = getSectionIndent(section);
     final String fieldIndent = getLineIndent(getFieldStartLine(field));
-    final int diffSize = Math.max(1, PyIndentUtil.getLineIndentSize(fieldIndent) - PyIndentUtil.getLineIndentSize(titleIndent));
+    final int diffSize = Math.max(0, PyIndentUtil.getLineIndentSize(fieldIndent) - PyIndentUtil.getLineIndentSize(titleIndent));
     return StringUtil.repeatSymbol(' ', diffSize);
   }
 
diff --git a/python/testData/intentions/afterNumpyAddMissingParameterPreservesNoneIndent.py b/python/testData/intentions/afterNumpyAddMissingParameterPreservesNoneIndent.py
new file mode 100644
index 000000000000..8e8b5efbf52a
--- /dev/null
+++ b/python/testData/intentions/afterNumpyAddMissingParameterPreservesNoneIndent.py
@@ -0,0 +1,8 @@
+def f(param1, param2):
+    """
+    Parameters
+    ----------
+    param1
+    param2 : object
+
+    """
\ No newline at end of file
diff --git a/python/testData/intentions/beforeNumpyAddMissingParameterPreservesNoneIndent.py b/python/testData/intentions/beforeNumpyAddMissingParameterPreservesNoneIndent.py
new file mode 100644
index 000000000000..b417d77ca098
--- /dev/null
+++ b/python/testData/intentions/beforeNumpyAddMissingParameterPreservesNoneIndent.py
@@ -0,0 +1,7 @@
+def <caret>f(param1, param2):
+    """
+    Parameters
+    ----------
+    param2 : object
+
+    """
\ No newline at end of file
diff --git a/python/testSrc/com/jetbrains/python/intentions/PyIntentionTest.java b/python/testSrc/com/jetbrains/python/intentions/PyIntentionTest.java
index a19c4978aaf2..e7ee154de387 100644
--- a/python/testSrc/com/jetbrains/python/intentions/PyIntentionTest.java
+++ b/python/testSrc/com/jetbrains/python/intentions/PyIntentionTest.java
@@ -550,6 +550,11 @@ public class  PyIntentionTest extends PyTestCase {
     }
   }
 
+  // PY-16904
+  public void testNumpyAddMissingParameterPreservesNoneIndent() {
+    doDocAddMissingParamsTest(DocStringFormat.NUMPY);
+  }
+
   // PY-9795
   public void testAddMissingParamsInGoogleDocString() {
     doDocAddMissingParamsTest(DocStringFormat.GOOGLE);