From 7ece4eb12a3914abb13275c152da13e2d85cc5e7 Mon Sep 17 00:00:00 2001 From: Andrey Vokin Date: Mon, 12 Jan 2026 12:30:06 +0100 Subject: [PATCH] Revert "PY-86493 use only one external type provider" This reverts commit 2aef8be41cf65845932093ff52d33031fbf170bb. GitOrigin-RevId: a9eb3a68b395ee78c40410399bc37b30fc69eebd --- .../src/com/jetbrains/python/psi/types/TypeEvalContext.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/python/python-psi-api/src/com/jetbrains/python/psi/types/TypeEvalContext.java b/python/python-psi-api/src/com/jetbrains/python/psi/types/TypeEvalContext.java index df6beaf8c1f6..441b3ae3b12e 100644 --- a/python/python-psi-api/src/com/jetbrains/python/psi/types/TypeEvalContext.java +++ b/python/python-psi-api/src/com/jetbrains/python/psi/types/TypeEvalContext.java @@ -309,8 +309,8 @@ public sealed class TypeEvalContext { Pair.create(element, this), false, () -> { - var provider = TypeEvalExternalTypeProvider.EP_NAME.getExtensionList().stream().filter(TypeEvalExternalTypeProvider::isAvailable).findFirst().orElse(null); - if (provider != null) { + // Try external providers first + for (var provider : TypeEvalExternalTypeProvider.EP_NAME.getExtensionList()) { try { var provided = provider.provideType(element, this); if (provided != null) { @@ -325,7 +325,6 @@ public sealed class TypeEvalContext { catch (Exception e) { logger.warn("Exception during external type provider " + provider.getClass().getName(), e); } - return null; } PyType type = element.getType(this, Key.INSTANCE);