diff --git a/pkg/analysis_server/lib/src/services/completion/postfix/postfix_completion.dart b/pkg/analysis_server/lib/src/services/completion/postfix/postfix_completion.dart
index af4edfc022e..c353d4f421a 100644
--- a/pkg/analysis_server/lib/src/services/completion/postfix/postfix_completion.dart
+++ b/pkg/analysis_server/lib/src/services/completion/postfix/postfix_completion.dart
@@ -197,7 +197,7 @@ abstract final class DartPostfixCompletion {
 
   static bool _false(_) => false;
 
-  static Future<PostfixCompletion?> _null(_, __) async => null;
+  static Future<PostfixCompletion?> _null(_, _) async => null;
 }
 
 /// A description of a postfix completion.
diff --git a/pkg/analysis_server/pubspec.yaml b/pkg/analysis_server/pubspec.yaml
index 29ff9c0c220..1a573b3f272 100644
--- a/pkg/analysis_server/pubspec.yaml
+++ b/pkg/analysis_server/pubspec.yaml
@@ -3,7 +3,7 @@ name: analysis_server
 publish_to: none
 
 environment:
-  sdk: '>=3.3.0 <4.0.0'
+  sdk: '>=3.7.0-edge <4.0.0'
 
 # Use 'any' constraints here; we get our versions from the DEPS file.
 dependencies:
diff --git a/pkg/analysis_server/test/lsp/error_or_test.dart b/pkg/analysis_server/test/lsp/error_or_test.dart
index 760a6b47a26..d8e7bd3ab31 100644
--- a/pkg/analysis_server/test/lsp/error_or_test.dart
+++ b/pkg/analysis_server/test/lsp/error_or_test.dart
@@ -24,7 +24,7 @@ final errorY = error(ErrorCodes.ParseError, 'y');
 class ErrorOrRecord2ExtensionTest {
   test_ifResults_error() {
     var called = false;
-    (success(1), errorX).ifResults((_, __) => called = true);
+    (success(1), errorX).ifResults((_, _) => called = true);
     expect(called, isFalse);
   }
 
@@ -75,7 +75,7 @@ class ErrorOrRecord2ExtensionTest {
 class ErrorOrRecord3ExtensionTest {
   test_ifResults_error() {
     var called = false;
-    (success(1), success(1), errorX).ifResults((_, __, ___) => called = true);
+    (success(1), success(1), errorX).ifResults((_, _, _) => called = true);
     expect(called, isFalse);
   }
 
@@ -132,7 +132,7 @@ class ErrorOrRecord4ExtensionTest {
   test_ifResults_error() {
     var called = false;
     (success(1), success(1), success(1), errorX)
-        .ifResults((_, __, ___, ____) => called = true);
+        .ifResults((_, _, _, _) => called = true);
     expect(called, isFalse);
   }
 
diff --git a/pkg/analysis_server/test/src/services/correction/fix/remove_const_test.dart b/pkg/analysis_server/test/src/services/correction/fix/remove_const_test.dart
index e11fdec8da5..c56e60d7471 100644
--- a/pkg/analysis_server/test/src/services/correction/fix/remove_const_test.dart
+++ b/pkg/analysis_server/test/src/services/correction/fix/remove_const_test.dart
@@ -141,7 +141,7 @@ var x = B(a: A(), b: const [0]);
   Future<void> test_implicitConst_invalidConstant() async {
     await resolveTestCode('''
 class A {
-  const A(_, __);
+  const A(_, _);
 }
 
 void f(bool b) {
@@ -151,7 +151,7 @@ void f(bool b) {
 
     await assertHasFix('''
 class A {
-  const A(_, __);
+  const A(_, _);
 }
 
 void f(bool b) {