minor adjustments

Author: carljm

crates/ty_python_semantic/src/semantic_index/builder.rs

@@ -315,6 +315,7 @@ impl<'db, 'ast> SemanticIndexBuilder<'db, 'ast> {
     // Records snapshots of the place states visible from the current eager scope.
     fn record_eager_snapshots(&mut self, popped_scope_id: FileScopeId) {
         let popped_scope = &self.scopes[popped_scope_id];
+        let popped_scope_is_annotation_scope = popped_scope.kind().is_annotation();
 
         // If the scope that we just popped off is an eager scope, we need to "lock" our view of
         // which bindings reach each of the uses in the scope. Loop through each enclosing scope,
@@ -330,6 +331,7 @@ impl<'db, 'ast> SemanticIndexBuilder<'db, 'ast> {
         // ```
         for enclosing_scope_info in self.scope_stack.iter().rev() {
             let enclosing_scope_id = enclosing_scope_info.file_scope_id;
+            let is_immediately_enclosing_scope = popped_scope.parent() == Some(enclosing_scope_id);
             let enclosing_scope_kind = self.scopes[enclosing_scope_id].kind();
             let enclosing_place_table = &self.place_tables[enclosing_scope_id];
 
@@ -352,14 +354,12 @@ impl<'db, 'ast> SemanticIndexBuilder<'db, 'ast> {
                     nested_scope: popped_scope_id,
                     nested_laziness: ScopeLaziness::Eager,
                 };
-                let is_immediately_enclosing_scope = popped_scope.kind().is_annotation()
-                    && popped_scope.parent() == Some(enclosing_scope_id);
                 let eager_snapshot = self.use_def_maps[enclosing_scope_id]
                     .snapshot_enclosing_state(
                         enclosing_place_id,
                         enclosing_scope_kind,
                         enclosing_place,
-                        is_immediately_enclosing_scope,
+                        popped_scope_is_annotation_scope && is_immediately_enclosing_scope,
                     );
                 self.enclosing_snapshots.insert(key, eager_snapshot);
             }

crates/ty_python_semantic/src/semantic_index/use_def.rs

@@ -1188,20 +1188,19 @@ impl<'db> UseDefMapBuilder<'db> {
         enclosing_place: ScopedPlaceId,
         enclosing_scope: ScopeKind,
         enclosing_place_expr: PlaceExprRef,
-        is_immediately_enclosing_scope: bool,
+        is_parent_of_annotation_scope: bool,
     ) -> ScopedEnclosingSnapshotId {
         let bindings = match enclosing_place {
             ScopedPlaceId::Symbol(symbol) => self.symbol_states[symbol].bindings(),
             ScopedPlaceId::Member(member) => self.member_states[member].bindings(),
         };
 
         let is_class_symbol = enclosing_scope.is_class() && enclosing_place.is_symbol();
-        // Names bound in class scopes are never visible to nested scopes (but attributes/subscripts are visible),
-        // so we never need to save eager scope bindings in a class scope.
-        // There is one exception to this rule: annotation scopes can see
-        // names defined in an immediately-enclosing class scope.
-        if (is_class_symbol && !is_immediately_enclosing_scope) || !enclosing_place_expr.is_bound()
-        {
+        // Names bound in class scopes are never visible to nested scopes (but
+        // attributes/subscripts are visible), so we never need to save eager scope bindings in a
+        // class scope. There is one exception to this rule: annotation scopes can see names
+        // defined in an immediately-enclosing class scope.
+        if (is_class_symbol && !is_parent_of_annotation_scope) || !enclosing_place_expr.is_bound() {
             self.enclosing_snapshots.push(EnclosingSnapshot::Constraint(
                 bindings.unbound_narrowing_constraint(),
             ))