diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyStringLiteralExpression.java b/python/psi-api/src/com/jetbrains/python/psi/PyStringLiteralExpression.java index 836df6de724b..f7dd122680df 100644 --- a/python/psi-api/src/com/jetbrains/python/psi/PyStringLiteralExpression.java +++ b/python/psi-api/src/com/jetbrains/python/psi/PyStringLiteralExpression.java @@ -32,21 +32,4 @@ public interface PyStringLiteralExpression extends PyLiteralExpression, StringLi @NotNull List> getDecodedFragments(); - - void iterateCharacterRanges(TextRangeConsumer consumer); - - /** - * Iterator over decoded string characters. - */ - interface TextRangeConsumer { - /** - * Process a decoded character. - * - * @param startOffset start offset in the un-decoded string - * @param endOffset end offset in the un-decoded string - * @param value decoded character value - * @return false in order to stop iteration - */ - boolean process(int startOffset, int endOffset, String value); - } } diff --git a/python/src/com/jetbrains/python/psi/impl/PyStringLiteralExpressionImpl.java b/python/src/com/jetbrains/python/psi/impl/PyStringLiteralExpressionImpl.java index 1c876ac23a15..622eb7e1e461 100644 --- a/python/src/com/jetbrains/python/psi/impl/PyStringLiteralExpressionImpl.java +++ b/python/src/com/jetbrains/python/psi/impl/PyStringLiteralExpressionImpl.java @@ -153,14 +153,6 @@ public class PyStringLiteralExpressionImpl extends PyElementImpl implements PySt return text.length() > 0 && Character.toUpperCase(text.charAt(0)) == 'C'; } - @Override - public void iterateCharacterRanges(PyStringLiteralExpression.TextRangeConsumer consumer) { - for (Pair fragment : getDecodedFragments()) { - final TextRange range = fragment.getFirst(); - consumer.process(range.getStartOffset(), range.getEndOffset(), fragment.getSecond()); - } - } - @Override @NotNull public List> getDecodedFragments() { diff --git a/python/testSrc/com/jetbrains/python/PyStringLiteralTest.java b/python/testSrc/com/jetbrains/python/PyStringLiteralTest.java index 016bbe5f8e0b..765cbd15afdd 100644 --- a/python/testSrc/com/jetbrains/python/PyStringLiteralTest.java +++ b/python/testSrc/com/jetbrains/python/PyStringLiteralTest.java @@ -15,6 +15,7 @@ */ package com.jetbrains.python; +import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.TextRange; import com.intellij.psi.LiteralTextEscaper; import com.intellij.psi.PsiFile; @@ -123,13 +124,9 @@ public class PyStringLiteralTest extends PyTestCase { final PyStringLiteralExpression expr = createLiteralFromText(text); assertNotNull(expr); final List characters = new ArrayList(); - expr.iterateCharacterRanges(new PyStringLiteralExpression.TextRangeConsumer() { - @Override - public boolean process(int startOffset, int endOffset, String value) { - characters.add(value); - return true; - } - }); + for (Pair fragment : expr.getDecodedFragments()) { + characters.add(fragment.getSecond()); + } return characters; } }