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

Don't inject any language into percent-based Python formatting even without formatting operator (PY-10771)

Browse Source
This commit is contained in:
Andrey Vlasovskikh
2013-11-22 21:28:24 +04:00
parent 67c086f0bc
commit f4a5f9aba6
1 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/codeInsight/PyInjectionUtil.java
+20 -4
View File
@@ -55,7 +55,7 @@ public class PyInjectionUtil {
* string concatenations or formatting.
*/
public static void registerStringLiteralInjection(@NotNull PsiElement element, @NotNull MultiHostRegistrar registrar) {
processStringLiteral(element, registrar, "", "", Formatting.NONE);
processStringLiteral(element, registrar, "", "", Formatting.PERCENT);
}
private static boolean isStringLiteralPart(@NotNull PsiElement element) {
@@ -108,9 +108,25 @@ public class PyInjectionUtil {
final FormatStringChunk chunk = chunks.get(i);
if (chunk instanceof ConstantChunk) {
final int nextIndex = i + 1;
final String chunkPrefix = i == 1 && chunks.get(0) instanceof SubstitutionChunk ? missingValue : "";
final String chunkSuffix = nextIndex < chunks.size() &&
chunks.get(nextIndex) instanceof SubstitutionChunk ? missingValue : "";
final String chunkPrefix;
if (i == 1 && chunks.get(0) instanceof SubstitutionChunk) {
chunkPrefix = missingValue;
}
else if (i == 0) {
chunkPrefix = prefix;
} else {
chunkPrefix = "";
}
final String chunkSuffix;
if (nextIndex < chunks.size() && chunks.get(nextIndex) instanceof SubstitutionChunk) {
chunkSuffix = missingValue;
}
else if (nextIndex == chunks.size()) {
chunkSuffix = suffix;
}
else {
chunkSuffix = "";
}
final TextRange chunkRange = chunk.getTextRange().shiftRight(range.getStartOffset());
registrar.addPlace(chunkPrefix, chunkSuffix, expr, chunkRange);
}