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

Update PyStringLiteralExpressionManipulator to correctly process unquoted newContent.

Browse Source 
Fix tests in AppEngineMoveTest.
This commit is contained in:
Semyon Proshev
2016-10-28 17:27:03 +03:00
parent 2234e46f76
commit 5333cfa29d
1 changed files with 30 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/psi/impl/PyStringLiteralExpressionManipulator.java
+30 -8
View File
@@ -33,10 +33,10 @@ public class PyStringLiteralExpressionManipulator extends AbstractElementManipul
public PyStringLiteralExpressionImpl handleContentChange(@NotNull PyStringLiteralExpressionImpl element,
@NotNull TextRange range,
String newContent) {
final String newName = range.replace(element.getText(), newContent);
final PyElementGenerator elementGenerator = PyElementGenerator.getInstance(element.getProject());
final PyStringLiteralExpression escaped = elementGenerator.createStringLiteralAlreadyEscaped(newName);
final String escapedText = calculateEscapedText(element.getText(), range, newContent);
final PyStringLiteralExpression escaped = elementGenerator.createStringLiteralAlreadyEscaped(escapedText);
return (PyStringLiteralExpressionImpl)element.replace(escaped);
}
@@ -44,16 +44,38 @@ public class PyStringLiteralExpressionManipulator extends AbstractElementManipul
@Override
public PyStringLiteralExpressionImpl handleContentChange(@NotNull PyStringLiteralExpressionImpl element, String newContent)
throws IncorrectOperationException {
return handleContentChange(element, super.getRangeInElement(element), newContent);
return handleContentChange(element, TextRange.create(0, element.getTextLength()), newContent);
}
@NotNull
@Override
public TextRange getRangeInElement(@NotNull PyStringLiteralExpressionImpl element) {
final Pair<String, String> pair = PyStringLiteralUtil.getQuotes(element.getText());
if (pair != null) {
return TextRange.from(pair.first.length(), element.getTextLength() - pair.first.length() - pair.second.length());
return PyStringLiteralUtil.getStringValueTextRange(element.getText());
}
@NotNull
private static String calculateEscapedText(@NotNull String prevText,
@NotNull TextRange range,
String newContent) {
final String newText = range.replace(prevText, newContent);
if (PyStringLiteralUtil.isQuoted(newText)) {
return newText;
}
return super.getRangeInElement(element);
final Pair<String, String> quotes = calculateQuotes(prevText);
return quotes.first + newText + quotes.second;
}
@NotNull
private static Pair<String, String> calculateQuotes(@NotNull String text) {
final Pair<String, String> quotes = PyStringLiteralUtil.getQuotes(text);
if (quotes == null || quotes.first == null && quotes.second == null) return Pair.createNonNull("\"", "\"");
if (quotes.first == null) return Pair.createNonNull(quotes.second, quotes.second);
if (quotes.second == null) return Pair.createNonNull(quotes.first, quotes.first);
return quotes;
}
}