MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

PyDocstringGenerator doesn't touch plain docstrings

Browse Source
This commit is contained in:
Mikhail Golubev
2015-09-02 20:36:07 +03:00
parent a12ccf7aea
commit 3808c314c8
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/documentation/PyDocstringGenerator.java
+16 -9
View File
@@ -364,11 +364,9 @@ public class PyDocstringGenerator {
@NotNull
private String createDocString() {
final String indentation = myDocStringIndent;
final DocStringFormat format = myDocStringFormat;
DocStringBuilder builder = null;
if (format == DocStringFormat.EPYTEXT || format == DocStringFormat.REST) {
builder = new TagBasedDocStringBuilder(format == DocStringFormat.EPYTEXT ? "@" : ":");
if (myDocStringFormat == DocStringFormat.EPYTEXT || myDocStringFormat == DocStringFormat.REST) {
builder = new TagBasedDocStringBuilder(myDocStringFormat == DocStringFormat.EPYTEXT ? "@" : ":");
TagBasedDocStringBuilder tagBuilder = (TagBasedDocStringBuilder)builder;
if (myAddFirstEmptyLine) {
tagBuilder.addEmptyLine();
@@ -392,8 +390,8 @@ public class PyDocstringGenerator {
}
}
}
else if (format == DocStringFormat.GOOGLE || format == DocStringFormat.NUMPY) {
builder = format == DocStringFormat.GOOGLE ? new GoogleCodeStyleDocStringBuilder() : new NumpyDocStringBuilder();
else if (myDocStringFormat == DocStringFormat.GOOGLE || myDocStringFormat == DocStringFormat.NUMPY) {
builder = myDocStringFormat == DocStringFormat.GOOGLE ? new GoogleCodeStyleDocStringBuilder() : new NumpyDocStringBuilder();
final SectionBasedDocStringBuilder sectionBuilder = (SectionBasedDocStringBuilder)builder;
if (myAddFirstEmptyLine) {
sectionBuilder.addEmptyLine();
@@ -433,9 +431,9 @@ public class PyDocstringGenerator {
}
}
if (builder != null && !builder.getLines().isEmpty()) {
return myQuotes + '\n' + builder.buildContent(indentation, true) + '\n' + indentation + myQuotes;
return myQuotes + '\n' + builder.buildContent(myDocStringIndent, true) + '\n' + myDocStringIndent + myQuotes;
}
return myQuotes + '\n' + indentation + myQuotes;
return createEmptyFallbackDocString();
}
@NotNull
@@ -454,6 +452,10 @@ public class PyDocstringGenerator {
//noinspection ConstantConditions
updater = new NumpyDocStringUpdater((SectionBasedDocString)getStructuredDocString(), myDocStringIndent);
}
// plain docstring - do nothing
else if (myDocStringText != null){
return myDocStringText;
}
if (updater != null) {
for (DocstringParam param : myAddedParams) {
if (param.isReturnValue()) {
@@ -470,7 +472,12 @@ public class PyDocstringGenerator {
}
return updater.getDocStringText();
}
return myQuotes + myQuotes;
return createEmptyFallbackDocString();
}
@NotNull
private String createEmptyFallbackDocString() {
return myQuotes + '\n' + myDocStringIndent + myQuotes;
}
private DocstringParam getParamToEdit() {