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

Python: break python validation cycle that led to SO.

Browse Source 
`PythonSdkFlavor` checks if file is executable. It is usually enough to validate sdk.

But on Windows we might have appx pythons (from store). They aren't "executable" (not even "exist") from the file system perspective, but still can be executed.


Merge-request: IJ-MR-158490
Merged-by: Ilya Kazakevich <ilya.kazakevich@jetbrains.com>

GitOrigin-RevId: 1fbd4e42d8a5cd94dc55fe6326924cf898bbbcc4
This commit is contained in:
Ilya Kazakevich
2025-03-26 21:04:20 +00:00
committed by intellij-monorepo-bot
parent 967395512a
commit fb1f6a609f
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/sdk/flavors/WinPythonSdkFlavor.java
+10 -10
View File
@@ -86,36 +86,36 @@ public class WinPythonSdkFlavor extends CPythonSdkFlavor<PyFlavorData.Empty> {
}
@Override
public boolean sdkSeemsValid(@NotNull Sdk sdk,
PyFlavorData.@NotNull Empty flavorData,
@Nullable TargetEnvironmentConfiguration targetConfig) {
public final boolean sdkSeemsValid(@NotNull Sdk sdk,
PyFlavorData.@NotNull Empty flavorData,
@Nullable TargetEnvironmentConfiguration targetConfig) {
if (super.sdkSeemsValid(sdk, flavorData, targetConfig) || targetConfig != null) {
// non-local, cant check for appx
return true;
}
var path = tryResolvePath(sdk.getHomePath());
return path != null && isLocalPathValidPython(path);
String path = sdk.getHomePath();
return path != null && isValidSdkPath(path);
}
@Override
public boolean isValidSdkPath(final @NotNull String pathStr) {
public final boolean isValidSdkPath(final @NotNull String pathStr) {
if (super.isValidSdkPath(pathStr)) {
return true;
return true; // File is local and executable
}
var path = tryResolvePath(pathStr);
return path != null && isLocalPathValidPython(path);
return path != null && isPythonFromStore(path); // Python from store might be non-executable, but still usable
}
private boolean isLocalPathValidPython(@NotNull Path path) {
private boolean isPythonFromStore(@NotNull Path path) {
String pathStr = path.toString();
if (myAppxCache.getValue().contains(pathStr)) {
return true;
}
String product = getAppxProduct(path);
return product != null && product.contains(APPX_PRODUCT) && isValidSdkPath(pathStr);
return product != null && product.contains(APPX_PRODUCT);
}
@Override