MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-08 15:09:39 +07:00
Code Issues Packages Projects Releases Wiki Activity

PY-78893: Python scratch file missing built-in print

Browse Source 
- 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

(cherry picked from commit 048aa21b74364273f829cde2dc844246ad02aebf)

IJ-MR-167296

GitOrigin-RevId: d47ad325e29a7804b0dbaa136d482c9271569144
This commit is contained in:
Marcus Mews
2025-07-07 08:32:59 +00:00
committed by intellij-monorepo-bot
parent 85b3197346
commit 1979594075
1 changed files with 13 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
python/src/com/jetbrains/python/inspections/PyInterpreterInspection.java
View File

@@ -47,6 +47,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;
@@ -86,8 +87,8 @@ public final class PyInterpreterInspection extends PyInspection {
public static class Visitor extends PyInspectionVisitor {
/** Invalidated by {@link CacheCleaner}. */
private static final AsyncLoadingCache<Module, List<PyDetectedSdk>> DETECTED_ASSOCIATED_ENVS_CACHE = Caffeine.newBuilder()
.executor(AppExecutorUtil.getAppExecutorService())
private static final AsyncLoadingCache<@NotNull Module, @NotNull List<PyDetectedSdk>> 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.
@@ -108,10 +109,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<LocalQuickFix> fixes = new ArrayList<>();
@@ -127,7 +127,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()
@@ -181,15 +181,15 @@ public final class PyInterpreterInspection extends PyInspection {
private void registerProblemWithCommonFixes(PyFile node,
@InspectionMessage String message,
Module module,
@Nullable Module module,
Sdk sdk,
List<LocalQuickFix> 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 {
@@ -376,27 +376,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;
}
@@ -458,7 +446,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);