diff --git a/packages/pigeon/CHANGELOG.md b/packages/pigeon/CHANGELOG.md
index d14e07c1b4b..16ca19f5515 100644
--- a/packages/pigeon/CHANGELOG.md
+++ b/packages/pigeon/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 26.3.2
+
+* Updates `analyzer` dependency to support version 10.
+
 ## 26.3.1
 
 * Fixes dartdoc comments that accidentally used HTML.
diff --git a/packages/pigeon/lib/src/generator_tools.dart b/packages/pigeon/lib/src/generator_tools.dart
index 2890bb57154..e06ddf0bd22 100644
--- a/packages/pigeon/lib/src/generator_tools.dart
+++ b/packages/pigeon/lib/src/generator_tools.dart
@@ -15,7 +15,7 @@ import 'generator.dart';
 /// The current version of pigeon.
 ///
 /// This must match the version in pubspec.yaml.
-const String pigeonVersion = '26.3.1';
+const String pigeonVersion = '26.3.2';
 
 /// Default plugin package name.
 const String defaultPluginPackageName = 'dev.flutter.pigeon';
diff --git a/packages/pigeon/lib/src/pigeon_lib_internal.dart b/packages/pigeon/lib/src/pigeon_lib_internal.dart
index 75bbb96a293..19da4613ce4 100644
--- a/packages/pigeon/lib/src/pigeon_lib_internal.dart
+++ b/packages/pigeon/lib/src/pigeon_lib_internal.dart
@@ -1922,10 +1922,14 @@ class RootBuilder extends dart_ast_visitor.RecursiveAstVisitor<Object?> {
         // resolved return type, via
         // `node.declaredFragment!.element.returnType`.
         String erroneousDeclaration = node.name.lexeme;
-        final dart_ast.AstNode? enclosingDeclaration = node.parent;
+        dart_ast.AstNode? enclosingDeclaration = node.parent;
+        while (enclosingDeclaration != null &&
+            enclosingDeclaration is! dart_ast.ClassDeclaration) {
+          enclosingDeclaration = enclosingDeclaration.parent;
+        }
         if (enclosingDeclaration is dart_ast.ClassDeclaration) {
           erroneousDeclaration =
-              '${enclosingDeclaration.name}.$erroneousDeclaration';
+              '${enclosingDeclaration.name.lexeme}.$erroneousDeclaration';
         }
         _errors.add(
           Error(
diff --git a/packages/pigeon/pubspec.yaml b/packages/pigeon/pubspec.yaml
index 0fc8a2cdd64..7a1359aec30 100644
--- a/packages/pigeon/pubspec.yaml
+++ b/packages/pigeon/pubspec.yaml
@@ -2,13 +2,13 @@ name: pigeon
 description: Code generator tool to make communication between Flutter and the host platform type-safe and easier.
 repository: https://github.com/flutter/packages/tree/main/packages/pigeon
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+pigeon%22
-version: 26.3.1 # This must match the version in lib/src/generator_tools.dart
+version: 26.3.2 # This must match the version in lib/src/generator_tools.dart
 
 environment:
   sdk: ^3.9.0
 
 dependencies:
-  analyzer: ">=8.0.0 <10.0.0"
+  analyzer: ">=8.0.0 <11.0.0"
   args: ^2.5.0
   code_builder: ^4.10.0
   collection: ^1.15.0
@@ -27,3 +27,4 @@ topics:
   - interop
   - platform-channels
   - plugin-development
+