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

Merge branch 'PY-10179' of https://github.com/Amarchuk/intellij-community into Amarchuk-PY-10179

Browse Source
This commit is contained in:
Dmitry Trofimov
2014-02-26 14:00:33 +01:00
parent be55f15c06 3d19968c08
commit 5d4d015fd1
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/console/PydevConsoleExecuteActionHandler.java
+2 -3
View File
@@ -137,13 +137,12 @@ public class PydevConsoleExecuteActionHandler extends ProcessBackedConsoleExecut
// multiline strings handling
if (myInMultilineStringState != null) {
if (PyConsoleUtil.isDoubleQuoteMultilineStarts(line)) {
if (PyConsoleUtil.isDoubleQuoteMultilineStarts(line) || PyConsoleUtil.isSingleQuoteMultilineStarts(line)) {
myInMultilineStringState = null;
// restore language
console.setLanguage(PythonLanguage.getInstance());
console.setPrompt(PyConsoleUtil.ORDINARY_PROMPT);
}
else {
} else {
return;
}
}
python/src/com/jetbrains/python/console/RunPythonConsoleAction.java
+1 -1
View File
@@ -221,7 +221,7 @@ public class RunPythonConsoleAction extends AnAction implements DumbAware {
final String path = Joiner.on(", ").join(Collections2.transform(pythonPath, new Function<String, String>() {
@Override
public String apply(String input) {
return "'" + input.replace("\\", "\\\\") + "'";
return "'" + input.replace("\\", "\\\\").replace("'", "\\'") + "'";
}
}));