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 remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Ekaterina Tuzova
2013-10-09 17:12:01 +04:00
parent bd9fe15b34 6ecf618431
commit 22be935a60
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/build/python-plugin-dependencies.xml
-1
View File
@@ -10,6 +10,5 @@
<depends optional="true" config-file="python-remote-interpreter-plugin.xml">com.jetbrains.plugins.webDeployment</depends>
<depends>org.jetbrains.plugins.remote-run</depends>
<xi:include href="/META-INF/pycharm-numpy-plugin.xml" xpointer="xpointer(/idea-plugin/*)"/>
<xi:include href="/META-INF/pycharm-flask-plugin.xml" xpointer="xpointer(/idea-plugin/*)"/>
</idea-plugin>
python/helpers/pydev/pydev_monkey.py
+1 -1
View File
@@ -29,7 +29,7 @@ def patch_args(args):
if is_python(args[0]):
try:
indC = args.index('-c')
except KeyError:
except ValueError:
indC = -1
if indC != -1:
python/src/com/jetbrains/python/codeInsight/completion/PythonCompletionWeigher.java
+2 -2
View File
@@ -4,7 +4,7 @@ import com.intellij.codeInsight.completion.CompletionLocation;
import com.intellij.codeInsight.completion.CompletionWeigher;
import com.intellij.codeInsight.lookup.LookupElement;
import com.intellij.codeInsight.lookup.LookupElementPresentation;
import com.intellij.psi.util.PsiUtilBase;
import com.intellij.psi.util.PsiUtilCore;
import com.jetbrains.python.PythonLanguage;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
@@ -20,7 +20,7 @@ public class PythonCompletionWeigher extends CompletionWeigher {
@Override
public Comparable weigh(@NotNull final LookupElement element, @NotNull final CompletionLocation location) {
if (!PsiUtilBase.findLanguageFromElement(location.getCompletionParameters().getPosition()).isKindOf(PythonLanguage.getInstance())) {
if (!PsiUtilCore.findLanguageFromElement(location.getCompletionParameters().getPosition()).isKindOf(PythonLanguage.getInstance())) {
return 0;
}
python/src/com/jetbrains/python/console/PydevConsoleRunner.java
+5 -2
View File
@@ -94,6 +94,7 @@ public class PydevConsoleRunner extends AbstractConsoleRunnerWithHistory<PythonC
private Map<String, String> myEnvironmentVariables;
private String myCommandLine;
private String[] myStatementsToExecute = ArrayUtil.EMPTY_STRING_ARRAY;
private ConsoleHistoryController myHistoryController;
public static Key<ConsoleCommunication> CONSOLE_KEY = new Key<ConsoleCommunication>("PYDEV_CONSOLE_KEY");
@@ -144,6 +145,7 @@ public class PydevConsoleRunner extends AbstractConsoleRunnerWithHistory<PythonC
AnAction showVarsAction = new ShowVarsAction();
toolbarActions.add(showVarsAction);
toolbarActions.add(myHistoryController.getBrowseHistory());
return actions;
}
@@ -552,8 +554,9 @@ public class PydevConsoleRunner extends AbstractConsoleRunnerWithHistory<PythonC
myConsoleExecuteActionHandler =
new PydevConsoleExecuteActionHandler(getConsoleView(), getProcessHandler(), myPydevConsoleCommunication);
myConsoleExecuteActionHandler.setEnabled(false);
new ConsoleHistoryController(myConsoleType.getTypeId(), "", getLanguageConsole(),
myConsoleExecuteActionHandler.getConsoleHistoryModel()).install();
myHistoryController = new ConsoleHistoryController(myConsoleType.getTypeId(), "", getLanguageConsole(),
myConsoleExecuteActionHandler.getConsoleHistoryModel());
myHistoryController.install();
return myConsoleExecuteActionHandler;
}