From 0c3f084073bd1fcc29a47e861cd33859a3036b57 Mon Sep 17 00:00:00 2001 From: Marcus Mews Date: Mon, 7 Jul 2025 08:32:59 +0000 Subject: [PATCH] PY-78893: Python scratch file missing built-in print - report warning when module is null (applies to scratch files) - show settings as quickfix when module is null (applies to scratch files) - no change with common module files GitOrigin-RevId: 048aa21b74364273f829cde2dc844246ad02aebf --- .../inspections/PyInterpreterInspection.java | 38 +++++++------------ 1 file changed, 13 insertions(+), 25 deletions(-) diff --git a/python/src/com/jetbrains/python/inspections/PyInterpreterInspection.java b/python/src/com/jetbrains/python/inspections/PyInterpreterInspection.java index e57d1e43b06b..3d4e563ef37a 100644 --- a/python/src/com/jetbrains/python/inspections/PyInterpreterInspection.java +++ b/python/src/com/jetbrains/python/inspections/PyInterpreterInspection.java @@ -46,6 +46,7 @@ import com.jetbrains.python.projectModel.uv.UvProjectModelService; import com.jetbrains.python.projectModel.uv.UvProjectModelService.UvWorkspace; import com.jetbrains.python.psi.LanguageLevel; import com.jetbrains.python.psi.PyFile; +import com.jetbrains.python.psi.impl.PyBuiltinCache; import com.jetbrains.python.psi.types.TypeEvalContext; import com.jetbrains.python.sdk.*; import com.jetbrains.python.sdk.conda.PyCondaSdkCustomizer; @@ -85,8 +86,8 @@ public final class PyInterpreterInspection extends PyInspection { public static class Visitor extends PyInspectionVisitor { /** Invalidated by {@link CacheCleaner}. */ - private static final AsyncLoadingCache> DETECTED_ASSOCIATED_ENVS_CACHE = Caffeine.newBuilder() - .executor(AppExecutorUtil.getAppExecutorService()) + private static final AsyncLoadingCache<@NotNull Module, @NotNull List> DETECTED_ASSOCIATED_ENVS_CACHE = + Caffeine.newBuilder().executor(AppExecutorUtil.getAppExecutorService()) // Even though various listeners invalidate the cache on many actions, it's unfeasible to track for venv/conda interpreters // creation performed outside the IDE. @@ -107,10 +108,9 @@ public final class PyInterpreterInspection extends PyInspection { @Override public void visitPyFile(@NotNull PyFile node) { - Module module = guessModule(node); - if (module == null || isFileIgnored(node)) return; - final Sdk sdk = PythonSdkUtil.findPythonSdk(module); - + if (isFileIgnored(node)) return; + @Nullable final Module module = ModuleUtilCore.findModuleForPsiElement(node); + @Nullable final Sdk sdk = PyBuiltinCache.findSdkForFile(node); final boolean pyCharm = PythonIdeLanguageCustomization.isMainlyPythonIde(); final List fixes = new ArrayList<>(); @@ -126,7 +126,7 @@ public final class PyInterpreterInspection extends PyInspection { } else { final @NlsSafe String associatedModulePath = PySdkExtKt.getAssociatedModulePath(sdk); - if (!PlatformUtils.isFleetBackend() && + if (module != null && !PlatformUtils.isFleetBackend() && (associatedModulePath == null || PySdkExtKt.isAssociatedWithAnotherModule(sdk, module)) && !(Registry.is("python.project.model.uv", false) && isAssociatedWithUvWorkspaceRootModule(associatedModulePath, module))) { final PyInterpreterInspectionQuickFixData fixData = PySdkProvider.EP_NAME.getExtensionList().stream() @@ -179,15 +179,15 @@ public final class PyInterpreterInspection extends PyInspection { private void registerProblemWithCommonFixes(PyFile node, @InspectionMessage String message, - Module module, + @Nullable Module module, Sdk sdk, List fixes, boolean pyCharm) { - if (pyCharm && sdk == null) { + if (module != null && pyCharm && sdk == null) { final String sdkName = ProjectRootManager.getInstance(node.getProject()).getProjectSdkName(); ContainerUtil.addIfNotNull(fixes, getSuitableSdkFix(sdkName, module)); } - if (pyCharm) { + if (module != null && pyCharm) { fixes.add(new ConfigureInterpreterFix()); } else { @@ -374,27 +374,15 @@ public final class PyInterpreterInspection extends PyInspection { } } - private static @Nullable Module guessModule(@NotNull PsiElement element) { - Module module = ModuleUtilCore.findModuleForPsiElement(element); - if (module == null) { - Module[] modules = ModuleManager.getInstance(element.getProject()).getModules(); - if (modules.length != 1) { - return null; - } - module = modules[0]; - } - return module; - } - private static boolean isFileIgnored(@NotNull PyFile pyFile) { return PyInspectionExtension.EP_NAME.getExtensionList().stream().anyMatch(ep -> ep.ignoreInterpreterWarnings(pyFile)); } public static final class InterpreterSettingsQuickFix implements LocalQuickFix { - private final @NotNull Module myModule; + private final @Nullable Module myModule; - public InterpreterSettingsQuickFix(@NotNull Module module) { + public InterpreterSettingsQuickFix(@Nullable Module module) { myModule = module; } @@ -456,7 +444,7 @@ public final class PyInterpreterInspection extends PyInspection { final PsiElement element = descriptor.getPsiElement(); if (element == null) return; - final Module module = guessModule(element); + final Module module = ModuleUtilCore.findModuleForPsiElement(element); if (module == null) return; PySdkPopupFactory.Companion.createAndShow(module);