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

PY-26492 Update the interpreter version when updating a local Python SDK

Browse Source 
The interpreter could be re-created externally by the same path but
with a different Python version, that otherwise will be stored in the
jdk.table.xml forever.
This commit is contained in:
Andrey Vlasovskikh
2018-06-15 21:24:41 +03:00
parent 8ffcba1128
commit 33d9060397
1 changed files with 47 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/sdk/PythonSdkUpdater.java
+47 -11
View File
@@ -34,9 +34,11 @@ import com.intellij.openapi.roots.OrderRootType;
import com.intellij.openapi.startup.StartupActivity;
import com.intellij.openapi.ui.Messages;
import com.intellij.openapi.util.io.FileUtilRt;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.StandardFileSystems;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.util.PathMappingSettings;
import com.intellij.util.Processor;
import com.intellij.util.concurrency.BlockingSet;
import com.intellij.util.concurrency.EdtExecutorService;
import com.jetbrains.python.PyBundle;
@@ -134,6 +136,8 @@ public class PythonSdkUpdater implements StartupActivity {
}
}
updateLocalSdkVersion(sdk, sdkModificator);
if (!updateLocalSdkPaths(sdk, sdkModificator, project)) {
return false;
}
@@ -241,6 +245,24 @@ public class PythonSdkUpdater implements StartupActivity {
}
}
/**
* Changes the version string of an SDK if it's out of date.
*
* May be invoked from any thread. May freeze the current thread while evaluating the run-time Python version.
*/
private static void updateLocalSdkVersion(@NotNull Sdk sdk, @Nullable SdkModificator sdkModificator) {
if (!PythonSdkType.isRemote(sdk)) {
final SdkModificator modificatorToRead = sdkModificator != null ? sdkModificator : sdk.getSdkModificator();
final String versionString = sdk.getSdkType().getVersionString(sdk);
if (!StringUtil.equals(versionString, modificatorToRead.getVersionString())) {
changeSdkModificator(sdk, sdkModificator, modificatorToWrite -> {
modificatorToWrite.setVersionString(versionString);
return true;
});
}
}
}
/**
* Updates the paths of a local SDK.
*
@@ -438,24 +460,38 @@ public class PythonSdkUpdater implements StartupActivity {
@Nullable final SdkModificator sdkModificator,
@NotNull final List<VirtualFile> sdkPaths,
boolean forceCommit) {
final String key = PythonSdkType.getSdkKey(sdk);
final SdkModificator modificatorToGetRoots = sdkModificator != null ? sdkModificator : sdk.getSdkModificator();
final List<VirtualFile> currentSdkPaths = Arrays.asList(modificatorToGetRoots.getRoots(OrderRootType.CLASSES));
final SdkModificator modificatorToRead = sdkModificator != null ? sdkModificator : sdk.getSdkModificator();
final List<VirtualFile> currentSdkPaths = Arrays.asList(modificatorToRead.getRoots(OrderRootType.CLASSES));
if (forceCommit || !Sets.newHashSet(sdkPaths).equals(Sets.newHashSet(currentSdkPaths))) {
TransactionGuard.getInstance().assertWriteSafeContext(ModalityState.defaultModalityState());
ApplicationManager.getApplication().invokeAndWait(() -> {
final Sdk sdkInsideInvoke = PythonSdkType.findSdkByKey(key);
final SdkModificator modificatorToCommit = sdkModificator != null ? sdkModificator :
sdkInsideInvoke != null ? sdkInsideInvoke.getSdkModificator() : modificatorToGetRoots;
modificatorToCommit.removeAllRoots();
changeSdkModificator(sdk, sdkModificator, effectiveModificator -> {
effectiveModificator.removeAllRoots();
for (VirtualFile sdkPath : sdkPaths) {
modificatorToCommit.addRoot(PythonSdkType.getSdkRootVirtualFile(sdkPath), OrderRootType.CLASSES);
effectiveModificator.addRoot(PythonSdkType.getSdkRootVirtualFile(sdkPath), OrderRootType.CLASSES);
}
modificatorToCommit.commitChanges();
return true;
});
}
}
/**
* Applies a processor to an SDK modificator or an SDK and commits it.
*
* You may invoke it from any threads. Blocks until the commit is done in the AWT thread.
*/
private static void changeSdkModificator(@NotNull Sdk sdk, @Nullable SdkModificator sdkModificator,
@NotNull Processor<SdkModificator> processor) {
final String key = PythonSdkType.getSdkKey(sdk);
TransactionGuard.getInstance().assertWriteSafeContext(ModalityState.defaultModalityState());
ApplicationManager.getApplication().invokeAndWait(() -> {
final Sdk sdkInsideInvoke = PythonSdkType.findSdkByKey(key);
final SdkModificator effectiveModificator = sdkModificator != null ? sdkModificator :
sdkInsideInvoke != null ? sdkInsideInvoke.getSdkModificator() : sdk.getSdkModificator();
if (processor .process(effectiveModificator)) {
effectiveModificator.commitChanges();
}
});
}
/**
* Returns unique Python SDKs for the open modules of the project.
*/