From 0953f4f163108dedd9f04e10161047221b696e94 Mon Sep 17 00:00:00 2001
From: Nate Bosch <nbosch@google.com>
Date: Tue, 11 Nov 2025 00:11:54 +0000
Subject: [PATCH 1/2] Drop some stale ignores

The `deprecated_member_use_from_same_package` are no longer reported
at these locations and the analyzer now flags them an unnecessary
ignores.
---
 .../lib/src/specs/expression/invoke.dart      |  2 --
 pkgs/code_builder/test/const_test.dart        |  1 -
 .../test/specs/code/expression_test.dart      | 32 ++++---------------
 3 files changed, 6 insertions(+), 29 deletions(-)

diff --git a/pkgs/code_builder/lib/src/specs/expression/invoke.dart b/pkgs/code_builder/lib/src/specs/expression/invoke.dart
index ff1f151e9..0fc5c6d5b 100644
--- a/pkgs/code_builder/lib/src/specs/expression/invoke.dart
+++ b/pkgs/code_builder/lib/src/specs/expression/invoke.dart
@@ -2,8 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-// ignore_for_file: deprecated_member_use_from_same_package
-
 part of '../expression.dart';
 
 /// Represents invoking [target] as a method with arguments.
diff --git a/pkgs/code_builder/test/const_test.dart b/pkgs/code_builder/test/const_test.dart
index e8d1bc3ac..810e00d39 100644
--- a/pkgs/code_builder/test/const_test.dart
+++ b/pkgs/code_builder/test/const_test.dart
@@ -25,7 +25,6 @@ void main() {
 
   test('assignConst', () {
     expect(
-      // ignore: deprecated_member_use_from_same_package
       constMap.assignConst('constField'),
       equalsDart(
         r'''
diff --git a/pkgs/code_builder/test/specs/code/expression_test.dart b/pkgs/code_builder/test/specs/code/expression_test.dart
index bdf78328e..362fdd8c3 100644
--- a/pkgs/code_builder/test/specs/code/expression_test.dart
+++ b/pkgs/code_builder/test/specs/code/expression_test.dart
@@ -497,12 +497,9 @@ void main() {
 
   test('should emit an if null index operator set', () {
     expect(
-      refer('bar')
-          .index(literalTrue)
-          .ifNullThen(literalFalse)
-          // ignore: deprecated_member_use_from_same_package
-          .assignVar('foo')
-          .statement,
+      refer(
+        'bar',
+      ).index(literalTrue).ifNullThen(literalFalse).assignVar('foo').statement,
       equalsDart('var foo = bar[true] ?? false;'),
     );
   });
@@ -516,7 +513,6 @@ void main() {
 
   test('should emit an index operator', () {
     expect(
-      // ignore: deprecated_member_use_from_same_package
       refer('bar').index(literalString('key')).assignVar('foo').statement,
       equalsDart("var foo = bar['key'];"),
     );
@@ -527,7 +523,6 @@ void main() {
       refer('bar')
           .index(literalString('key'))
           .assign(literalFalse)
-          // ignore: deprecated_member_use_from_same_package
           .assignVar('foo')
           .statement,
       equalsDart("var foo = bar['key'] = false;"),
@@ -539,7 +534,6 @@ void main() {
       refer('bar')
           .index(literalTrue)
           .assignNullAware(literalFalse)
-          // ignore: deprecated_member_use_from_same_package
           .assignVar('foo')
           .statement,
       equalsDart('var foo = bar[true] ??= false;'),
@@ -547,35 +541,22 @@ void main() {
   });
 
   test('should emit assigning to a var', () {
-    expect(
-      // ignore: deprecated_member_use_from_same_package
-      literalTrue.assignVar('foo'),
-      equalsDart('var foo = true'),
-    );
+    expect(literalTrue.assignVar('foo'), equalsDart('var foo = true'));
   });
 
   test('should emit assigning to a type', () {
     expect(
-      // ignore: deprecated_member_use_from_same_package
       literalTrue.assignVar('foo', refer('bool')),
       equalsDart('bool foo = true'),
     );
   });
 
   test('should emit assigning to a final', () {
-    expect(
-      // ignore: deprecated_member_use_from_same_package
-      literalTrue.assignFinal('foo'),
-      equalsDart('final foo = true'),
-    );
+    expect(literalTrue.assignFinal('foo'), equalsDart('final foo = true'));
   });
 
   test('should emit assigning to a const', () {
-    expect(
-      // ignore: deprecated_member_use_from_same_package
-      literalTrue.assignConst('foo'),
-      equalsDart('const foo = true'),
-    );
+    expect(literalTrue.assignConst('foo'), equalsDart('const foo = true'));
   });
 
   test('should emit await', () {
@@ -668,7 +649,6 @@ void main() {
 
   test('should emit an operator subtract call', () {
     expect(
-      // ignore: deprecated_member_use_from_same_package
       refer('foo').operatorSubstract(refer('foo2')),
       equalsDart('foo - foo2'),
     );

From b2ea703cd44abc0280611c9b64f8d29caa03345d Mon Sep 17 00:00:00 2001
From: Nate Bosch <nbosch@google.com>
Date: Tue, 11 Nov 2025 00:19:42 +0000
Subject: [PATCH 2/2] Bump to -wip version

Add empty changelog header since nothing user facing is changing yet and
there is no need to publish.
---
 pkgs/code_builder/CHANGELOG.md | 2 ++
 pkgs/code_builder/pubspec.yaml | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/code_builder/CHANGELOG.md b/pkgs/code_builder/CHANGELOG.md
index ddd8505be..fa40c8c84 100644
--- a/pkgs/code_builder/CHANGELOG.md
+++ b/pkgs/code_builder/CHANGELOG.md
@@ -1,3 +1,5 @@
+## 4.11.1-wip
+
 ## 4.11.0
 
 * Export `SpecVisitor`, `ClosureExpression`, `LiteralMapExpression`
diff --git a/pkgs/code_builder/pubspec.yaml b/pkgs/code_builder/pubspec.yaml
index ebf286e98..d551bcbf7 100644
--- a/pkgs/code_builder/pubspec.yaml
+++ b/pkgs/code_builder/pubspec.yaml
@@ -1,5 +1,5 @@
 name: code_builder
-version: 4.11.0
+version: 4.11.1-wip
 description: A fluent, builder-based library for generating valid Dart code.
 repository: https://github.com/dart-lang/tools/tree/main/pkgs/code_builder
 issue_tracker: https://github.com/dart-lang/tools/issues?q=is%3Aissue+is%3Aopen+label%3Apackage%3Acode_builder