Merge pull request #32356 from mkouba/issue-32299

quarkusio · Apr 3, 2023 · 2188dcc · 2188dcc
2 parents 54a565a + 1b2afda
commit 2188dcc
Show file tree

Hide file tree

Showing 3 changed files with 507 additions and 329 deletions.
diff --git a/...ions/qute/deployment/src/main/java/io/quarkus/qute/deployment/MessageBundleProcessor.java b/...ions/qute/deployment/src/main/java/io/quarkus/qute/deployment/MessageBundleProcessor.java
@@ -85,8 +85,8 @@
 import io.quarkus.qute.LoopSectionHelper;
 import io.quarkus.qute.Namespaces;
 import io.quarkus.qute.Resolver;
-import io.quarkus.qute.deployment.QuteProcessor.LookupConfig;
-import io.quarkus.qute.deployment.QuteProcessor.Match;
+import io.quarkus.qute.deployment.QuteProcessor.JavaMemberLookupConfig;
+import io.quarkus.qute.deployment.QuteProcessor.MatchResult;
 import io.quarkus.qute.deployment.TemplatesAnalysisBuildItem.TemplateAnalysis;
 import io.quarkus.qute.deployment.Types.AssignableInfo;
 import io.quarkus.qute.deployment.Types.HierarchyIndexer;
@@ -453,7 +453,8 @@ public String apply(String id) {
         List<TemplateExtensionMethodBuildItem> regularExtensionMethods = templateExtensionMethods.stream()
                 .filter(Predicate.not(TemplateExtensionMethodBuildItem::hasNamespace)).collect(Collectors.toUnmodifiableList());
 
-        LookupConfig lookupConfig = new QuteProcessor.FixedLookupConfig(index, QuteProcessor.initDefaultMembersFilter(), false);
+        JavaMemberLookupConfig lookupConfig = new QuteProcessor.FixedJavaMemberLookupConfig(index,
+                QuteProcessor.initDefaultMembersFilter(), false);
         Map<DotName, AssignableInfo> assignableCache = new HashMap<>();
         HierarchyIndexer hierarchyIndexer = new HierarchyIndexer(index);
 
@@ -507,7 +508,7 @@ public String apply(String id) {
                         }
                     }
 
-                    Map<Integer, Match> generatedIdsToMatches = Collections.emptyMap();
+                    Map<Integer, MatchResult> generatedIdsToMatches = Collections.emptyMap();
                     for (TemplateExpressionMatchesBuildItem templateExpressionMatchesBuildItem : expressionMatches) {
                         if (templateExpressionMatchesBuildItem.templateGeneratedId.equals(templateAnalysis.generatedId)) {
                             generatedIdsToMatches = templateExpressionMatchesBuildItem.getGeneratedIdsToMatches();
@@ -558,7 +559,7 @@ public String apply(String id) {
                             int idx = 0;
                             for (Expression param : params) {
                                 if (param.hasTypeInfo()) {
-                                    Map<String, Match> results = new HashMap<>();
+                                    Map<String, MatchResult> results = new HashMap<>();
 
                                     final List<Predicate<TypeCheckExcludeBuildItem.TypeCheck>> excludes = new ArrayList<>();
                                     // subset of excludes specific for extension methods
@@ -576,7 +577,7 @@ public String apply(String id) {
                                             extensionMethodExcludes, checkedTemplate, lookupConfig, namedBeans,
                                             namespaceTemplateData, regularExtensionMethods, namespaceExtensionMethods,
                                             assignableCache, hierarchyIndexer);
-                                    Match match = results.get(param.toOriginalString());
+                                    MatchResult match = results.get(param.toOriginalString());
                                     if (match != null && !match.isEmpty() && !Types.isAssignableFrom(match.type(),
                                             methodParams.get(idx), index, assignableCache)) {
                                         incorrectExpressions