ucn 5.5.1 → 5.5.2

package/languages/adapter.js

@@ -13,6 +13,7 @@ const REQUIRED_ADAPTER_OPERATIONS = Object.freeze([
 ]);
 
 const OPTIONAL_HELPERS = Object.freeze([
+    'annotatedReceiverType',
     'findFunctions',
     'findClasses',
     'findStateObjects',
@@ -27,13 +28,18 @@ const OPTIONAL_HELPERS = Object.freeze([
     'findTestCallRanges',
     'getBuiltinCallReturnType',
     'getBuiltinFieldType',
+    'getPrimitiveTypeInfo',
+    'getDerefTypeInfo',
     'findPytestFunctions',
     'findPythonModuleEvidence',
     'findScopeAlternativeBindings',
     'isPlatformConcreteCall',
     'isPlatformConcreteType',
+    'selectorReceiverIsLocal',
     'queryTree',
     'queryTreeIsPlain',
+    'queryUsingDirectives',
+    'implicitBaseCallsOf',
 ]);
 
 function adapterCapabilities(languageModule) {
@@ -87,10 +93,17 @@ function createLanguageAdapter(config) {
             return languageModule.findExportsInCode(code, parser);
         },
         findUsages(code, name, parser, tree, options) {
-            // Only the lexical-scope request (fix #392) reaches the parser;
-            // other query options keep the adapter's historical behavior.
-            return options?.lexicalScopes
-                ? languageModule.findUsagesInCode(code, name, parser, tree, { lexicalScopes: true })
+            // Account callers have already classified indexed call records.
+            // Only parsers of call-shaped macros recover calls here. Kind-only
+            // scans are a separate opt-in; other parsers keep their usual path.
+            const skipCallRecovery = options?.skipCallRecovery && config.traits?.macroInvocationSyntax === 'call';
+            const usageKindsOnly = options?.usageKindsOnly && !options.lexicalScopes && config.traits?.usageKindsOnly;
+            return options?.lexicalScopes || skipCallRecovery || usageKindsOnly
+                ? languageModule.findUsagesInCode(code, name, parser, tree, {
+                    ...(options.lexicalScopes && { lexicalScopes: true }),
+                    ...(skipCallRecovery && { skipCallRecovery: true }),
+                    ...(usageKindsOnly && { usageKindsOnly: true }),
+                })
                 : languageModule.findUsagesInCode(code, name, parser, tree);
         },
         getEntryPointKind(symbol) {
@@ -105,6 +118,7 @@ function createLanguageAdapter(config) {
             // may release analysis-only trees as soon as those records have
             // been extracted. Direct parser/query calls omit this option and
             // retain their bounded cross-operation cache.
+            require('./index').captureLiteralParse(parser, code);
             const parsed = languageModule.parse(code, parser, {
                 releaseAnalysisTree: true,
                 // Macro definitions the file's include closure supplies
@@ -141,6 +155,16 @@ function createLanguageAdapter(config) {
                 const sites = reflectionSitesInTree(analysisTree, config.name, code);
                 if (sites.length > 0) parsed.reflectionSites = sites;
             }
+            // Computed dispatch sites (`handlers[name]()`) of the literal
+            // parse the doctor's blind-spot inventory reads (fix #436): a
+            // query reads them from the index instead of parsing every file.
+            const literalTree = require('./index').takeLiteralParse();
+            if (!Array.isArray(parsed.computedDispatchSites)) {
+                const { safeParse } = require('./index');
+                const { computedDispatchSites } = require('../core/ast-analysis');
+                const tree = literalTree || (parser ? safeParse(parser, code) : null);
+                parsed.computedDispatchSites = tree ? computedDispatchSites(code, config.name, tree) : [];
+            }
             return createFileIR({
                 language: config.name,
                 file,