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 'fitermay/pysdk-patch'

Browse Source
This commit is contained in:
Andrey Vlasovskikh
2016-04-26 18:42:47 +02:00
parent 09d257b0fa 86b9e026d7
commit 3900da922c
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/python-community-configure/src/com/jetbrains/python/configuration/PythonSdkDetailsDialog.java
+8 -2
View File
@@ -226,6 +226,7 @@ public class PythonSdkDetailsDialog extends DialogWrapper {
mySdkSettingsWereModified.run();
}
for (SdkModificator modificator : myModifiedModificators) {
/* This should always be true barring bug elsewhere, log error on else? */
if (modificator.isWritable()) {
modificator.commitChanges();
}
@@ -433,8 +434,13 @@ public class PythonSdkDetailsDialog extends DialogWrapper {
}
private void reloadSdk(@NotNull Sdk currentSdk) {
// XXX: Here we are reusing a modifier that we are going to commit later
PythonSdkUpdater.update(currentSdk, myModificators.get(currentSdk), myProject, null);
/* PythonSdkUpdater.update invalidates the modificator so we need to create a new
one for further changes
*/
if (PythonSdkUpdater.update(currentSdk, myModificators.get(currentSdk), myProject, null)){
myModifiedModificators.remove(myModificators.get(currentSdk));
myModificators.put(currentSdk, currentSdk.getSdkModificator());
}
}
private class ToggleVirtualEnvFilterButton extends ToggleActionButton implements DumbAware {
python/src/com/jetbrains/python/testing/VFSTestFrameworkListener.java
+6 -3
View File
@@ -28,7 +28,9 @@ import com.intellij.openapi.vfs.VirtualFileManager;
import com.intellij.openapi.vfs.newvfs.BulkFileListener;
import com.intellij.openapi.vfs.newvfs.events.VFileContentChangeEvent;
import com.intellij.openapi.vfs.newvfs.events.VFileEvent;
import com.intellij.util.Alarm;
import com.intellij.util.messages.MessageBus;
import com.intellij.util.ui.UIUtil;
import com.intellij.util.ui.update.MergingUpdateQueue;
import com.intellij.util.ui.update.Update;
import com.jetbrains.python.PyNames;
@@ -44,7 +46,7 @@ import java.util.List;
*/
public class VFSTestFrameworkListener {
private static final Logger LOG = Logger.getInstance("#com.jetbrains.python.testing.VFSTestFrameworkListener");
private final MergingUpdateQueue myQueue = new MergingUpdateQueue("TestFrameworkChecker", 5000, true, null);
private final MergingUpdateQueue myQueue;
private final PyTestFrameworkService myService;
public VFSTestFrameworkListener() {
@@ -86,6 +88,7 @@ public class VFSTestFrameworkListener {
}
}
});
myQueue = new MergingUpdateQueue("TestFrameworkChecker", 5000, true, null, ApplicationManager.getApplication(), null, Alarm.ThreadToUse.POOLED_THREAD);
}
public void updateAllTestFrameworks(final Sdk sdk) {
@@ -100,8 +103,8 @@ public class VFSTestFrameworkListener {
@Override
public void run() {
final Boolean installed = isTestFrameworkInstalled(sdk, testPackageName);
if (installed != null)
testInstalled(installed, sdk.getHomePath(), testPackageName);
if (installed != null) ApplicationManager.getApplication().invokeLater( ( ()-> testInstalled(installed, sdk.getHomePath(), testPackageName)));
}
});
}