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

fixed NPE in docstring quickfix

Browse Source
This commit is contained in:
Ekaterina Tuzova
2011-05-31 16:14:19 +04:00
parent 0d2962e11b
commit e830f25749
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/actions/DocstringQuickFix.java
+9 -6
View File
@@ -18,16 +18,18 @@ import org.jetbrains.annotations.NotNull;
public class DocstringQuickFix implements LocalQuickFix {
PyParameter myMissing;
String myMissingText;
String myMissingText = "";
String myUnexpected;
String myPrefix;
public DocstringQuickFix(PyParameter missing, String unexpected) {
myMissing = missing;
if (myMissing.getText().startsWith("*"))
myMissingText = myMissing.getText();
else
myMissingText = myMissing.getName();
if (myMissing != null) {
if (myMissing.getText().startsWith("*"))
myMissingText = myMissing.getText();
else
myMissingText = myMissing.getName();
}
myUnexpected = unexpected;
}
@@ -48,6 +50,7 @@ public class DocstringQuickFix implements LocalQuickFix {
PyDocStringOwner docStringOwner = PsiTreeUtil.getParentOfType(descriptor.getPsiElement(), PyDocStringOwner.class);
if (docStringOwner == null) return;
PyStringLiteralExpression element = docStringOwner.getDocStringExpression();
if (element == null) return;
PyElementGenerator elementGenerator = PyElementGenerator.getInstance(project);
PyDocumentationSettings documentationSettings = PyDocumentationSettings.getInstance(element.getProject());
if (documentationSettings.isEpydocFormat(element.getContainingFile()))
@@ -64,7 +67,7 @@ public class DocstringQuickFix implements LocalQuickFix {
}
if (!replacement.equals(element.getText())) {
PyStringLiteralExpression str = (PyStringLiteralExpression)elementGenerator.createFromText(LanguageLevel.forElement(element),
PyExpressionStatement.class, replacement.toString()).getExpression();
PyExpressionStatement.class, replacement).getExpression();
element.replace(str);
}
}