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 renaming prefix for static roots (PY-9307).

Browse Source
This commit is contained in:
Dmitry Trofimov
2013-03-29 16:45:19 +01:00
parent c47a5d4d95
commit dc1a08662b
2 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/psi-api/src/com/jetbrains/python/psi/PyElementGenerator.java
+2
View File
@@ -33,6 +33,8 @@ public abstract class PyElementGenerator {
public abstract PyStringLiteralExpression createStringLiteralFromString(@Nullable PsiFile destination, String unescaped);
public abstract PyStringLiteralExpression createStringLiteralFromString(@NotNull String unescaped);
public abstract PyStringLiteralExpression createStringLiteral(@NotNull PyStringLiteralExpression oldElement, @NotNull String unescaped);
public abstract PyListLiteralExpression createListLiteral();
public abstract ASTNode createComma();
python/src/com/jetbrains/python/psi/impl/PyElementGeneratorImpl.java
+18 -4
View File
@@ -2,6 +2,7 @@ package com.jetbrains.python.psi.impl;
import com.intellij.lang.ASTNode;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Pair;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
@@ -13,6 +14,7 @@ import com.intellij.util.IncorrectOperationException;
import com.jetbrains.python.PyTokenTypes;
import com.jetbrains.python.PythonFileType;
import com.jetbrains.python.PythonLanguage;
import com.jetbrains.python.PythonStringUtil;
import com.jetbrains.python.psi.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -66,6 +68,16 @@ public class PyElementGeneratorImpl extends PyElementGenerator {
return createStringLiteralFromString(null, unescaped);
}
public PyStringLiteralExpression createStringLiteral(@NotNull PyStringLiteralExpression oldElement, @NotNull String unescaped) {
Pair<String, String> quotes = PythonStringUtil.getQuotes(oldElement.getText());
if (quotes != null) {
return createStringLiteralAlreadyEscaped(quotes.first + unescaped + quotes.second);
}
else {
return createStringLiteralFromString(unescaped);
}
}
public PyStringLiteralExpression createStringLiteralFromString(@Nullable PsiFile destination, @NotNull String unescaped) {
boolean useDouble = !unescaped.contains("\"");
boolean useMulti = unescaped.matches(".*(\r|\n).*");
@@ -253,18 +265,20 @@ public class PyElementGeneratorImpl extends PyElementGenerator {
public PyNamedParameter createParameter(@NotNull String name, @Nullable String defaultValue, @Nullable String annotation,
@NotNull LanguageLevel languageLevel) {
String parameterText = name;
if (annotation != null)
if (annotation != null) {
parameterText += ": " + annotation;
if (defaultValue != null)
}
if (defaultValue != null) {
parameterText += " = " + defaultValue;
}
return createFromText(languageLevel, PyNamedParameter.class, "def f(" + parameterText + "): pass", PATH_PARAMETER);
}
@Override
public PyKeywordArgument createKeywordArgument(LanguageLevel languageLevel, String keyword, String value) {
PyCallExpression callExpression = (PyCallExpression) createExpressionFromText(languageLevel, "foo(" + keyword + "=" + value + ")");
return (PyKeywordArgument) callExpression.getArguments()[0];
PyCallExpression callExpression = (PyCallExpression)createExpressionFromText(languageLevel, "foo(" + keyword + "=" + value + ")");
return (PyKeywordArgument)callExpression.getArguments()[0];
}
@NotNull