diff --git a/pkg/analysis_server/test/integration/analysis/get_errors_non_standard_sdk_test.dart b/pkg/analysis_server/test/integration/analysis/get_errors_non_standard_sdk_test.dart
index fb8cb1ef9c7..e8ba7bf8e9e 100644
--- a/pkg/analysis_server/test/integration/analysis/get_errors_non_standard_sdk_test.dart
+++ b/pkg/analysis_server/test/integration/analysis/get_errors_non_standard_sdk_test.dart
@@ -52,7 +52,7 @@ class Future<T> {}
 ''');
 
     File(path.join(sdkPath, 'lib', 'fake', 'fake.dart')).writeAsStringSync(r'''
-class Fake {} 
+class Fake {}
 ''');
 
     var libsInternalDir = path.join(sdkPath, 'lib', '_internal');
diff --git a/pkg/analysis_server/test/lsp/semantic_tokens_test.dart b/pkg/analysis_server/test/lsp/semantic_tokens_test.dart
index 08367b21644..1a7a8c293ca 100644
--- a/pkg/analysis_server/test/lsp/semantic_tokens_test.dart
+++ b/pkg/analysis_server/test/lsp/semantic_tokens_test.dart
@@ -335,7 +335,7 @@ class SemanticTokensTest extends AbstractLspAnalysisServerTest {
     class MyClass {
       String aaa;
     }
-      
+
     /// before [bbb] after
     int double(int bbb) => bbb * 2;
     ''';
@@ -708,7 +708,7 @@ class MyClass {}
     final content = '''
     f({String a}) {
       f(a: a);
-    }    
+    }
     ''';
 
     final expected = [
diff --git a/pkg/analysis_server/test/plugin/protocol_dart_test.dart b/pkg/analysis_server/test/plugin/protocol_dart_test.dart
index ae69a11e8f9..bfaddb0e975 100644
--- a/pkg/analysis_server/test/plugin/protocol_dart_test.dart
+++ b/pkg/analysis_server/test/plugin/protocol_dart_test.dart
@@ -25,7 +25,7 @@ class ConvertElementNullableTest extends AbstractSingleUnitTest {
   Future<void> test_CONSTRUCTOR_required_parameters_1() async {
     writeTestPackageConfig(meta: true);
     await resolveTestCode('''
-import 'package:meta/meta.dart';    
+import 'package:meta/meta.dart';
 class A {
   const A.myConstructor(int a, {int b, @required int c});
 }''');
@@ -40,7 +40,7 @@ class A {
   Future<void> test_CONSTRUCTOR_required_parameters_2() async {
     writeTestPackageConfig(meta: true);
     await resolveTestCode('''
-import 'package:meta/meta.dart';    
+import 'package:meta/meta.dart';
 class A {
   const A.myConstructor(int a, {int b, @required int d, @required int c});
 }''');
@@ -57,7 +57,7 @@ class A {
     writeTestPackageConfig(meta: true);
     verifyNoTestUnitErrors = false;
     await resolveTestCode('''
-import 'package:meta/meta.dart';    
+import 'package:meta/meta.dart';
 class A {
   const A.myConstructor(int a, {int b, @required int d, @required int c, int a});
 }''');
@@ -138,7 +138,7 @@ class A {
   Future<void> test_CONSTRUCTOR_required_parameters_1() async {
     writeTestPackageConfig(meta: true);
     await resolveTestCode('''
-import 'package:meta/meta.dart';    
+import 'package:meta/meta.dart';
 class A {
   const A.myConstructor(int a, {int? b, required int c});
 }''');
@@ -153,7 +153,7 @@ class A {
   Future<void> test_CONSTRUCTOR_required_parameters_2() async {
     writeTestPackageConfig(meta: true);
     await resolveTestCode('''
-import 'package:meta/meta.dart';    
+import 'package:meta/meta.dart';
 class A {
   const A.myConstructor(int a, {int? b, required int d, required int c});
 }''');
@@ -170,7 +170,7 @@ class A {
     writeTestPackageConfig(meta: true);
     verifyNoTestUnitErrors = false;
     await resolveTestCode('''
-import 'package:meta/meta.dart';    
+import 'package:meta/meta.dart';
 class A {
   const A.myConstructor(int a, {int b, required int d, required int c, int a});
 }''');
diff --git a/pkg/analysis_server/test/services/completion/dart/extension_member_contributor_test.dart b/pkg/analysis_server/test/services/completion/dart/extension_member_contributor_test.dart
index 12a2cad347c..5def9963ccf 100644
--- a/pkg/analysis_server/test/services/completion/dart/extension_member_contributor_test.dart
+++ b/pkg/analysis_server/test/services/completion/dart/extension_member_contributor_test.dart
@@ -30,7 +30,7 @@ class B extends A {
   int b = 0;
 }
 extension E on B {
-  void e() { 
+  void e() {
     ^
   }
 }
@@ -49,7 +49,7 @@ class B extends A {
   set b(int b) { }
 }
 extension E on B {
-  void e() { 
+  void e() {
     ^
   }
 }
@@ -68,7 +68,7 @@ class B extends A {
   void b() { }
 }
 extension E on B {
-  void e() { 
+  void e() {
     ^
   }
 }
@@ -85,7 +85,7 @@ class A<T> {
 }
 
 extension E on A<int> {
-  void e() { 
+  void e() {
     ^
   }
 }
diff --git a/pkg/analysis_server/test/services/completion/dart/local_reference_contributor_test.dart b/pkg/analysis_server/test/services/completion/dart/local_reference_contributor_test.dart
index 92149477c05..760fd21074b 100644
--- a/pkg/analysis_server/test/services/completion/dart/local_reference_contributor_test.dart
+++ b/pkg/analysis_server/test/services/completion/dart/local_reference_contributor_test.dart
@@ -373,7 +373,7 @@ void main() {new B().bar(^);}''');
   Future<void> test_ArgumentList_namedFieldParam_tear_off() async {
     addSource('/home/test/lib/a.dart', '''
 typedef void VoidCallback();
-        
+
 class Button {
   final VoidCallback onPressed;
   Button({this.onPressed});
@@ -387,8 +387,8 @@ class PageState {
   build() =>
     new Button(
       onPressed: ^
-    );  
-}    
+    );
+}
 ''');
     await computeSuggestions();
 
@@ -450,7 +450,7 @@ void main() {expect(foo: ^)}''');
   Future<void> test_ArgumentList_namedParam_tear_off() async {
     addSource('/home/test/lib/a.dart', '''
 typedef void VoidCallback();
-        
+
 class Button {
   Button({VoidCallback onPressed});
 }
@@ -463,8 +463,8 @@ class PageState {
   build() =>
     new Button(
       onPressed: ^
-    );  
-}    
+    );
+}
 ''');
     await computeSuggestions();
 
@@ -478,7 +478,7 @@ class PageState {
   Future<void> test_ArgumentList_namedParam_tear_off_1() async {
     addSource('/home/test/lib/a.dart', '''
 typedef void VoidCallback();
-        
+
 class Button {
   Button({VoidCallback onPressed, int x});
 }
@@ -491,8 +491,8 @@ class PageState {
   build() =>
     new Button(
       onPressed: ^
-    );  
-}    
+    );
+}
 ''');
     await computeSuggestions();
 
@@ -506,7 +506,7 @@ class PageState {
   Future<void> test_ArgumentList_namedParam_tear_off_2() async {
     addSource('/home/test/lib/a.dart', '''
 typedef void VoidCallback();
-        
+
 class Button {
   Button({ int x, VoidCallback onPressed);
 }
@@ -519,8 +519,8 @@ class PageState {
   build() =>
     new Button(
       onPressed: ^
-    );  
-}    
+    );
+}
 ''');
     await computeSuggestions();
 
diff --git a/pkg/analysis_server/test/services/refactoring/extract_widget_test.dart b/pkg/analysis_server/test/services/refactoring/extract_widget_test.dart
index 6106c933f98..540729ee96d 100644
--- a/pkg/analysis_server/test/services/refactoring/extract_widget_test.dart
+++ b/pkg/analysis_server/test/services/refactoring/extract_widget_test.dart
@@ -547,7 +547,7 @@ import 'package:flutter/material.dart';
 
 class MyWidget extends StatelessWidget {
   final String foo;
-  
+
   MyWidget(this.foo);
 
   @override
@@ -577,7 +577,7 @@ import 'package:flutter/material.dart';
 
 class MyWidget extends StatelessWidget {
   final String foo;
-  
+
   MyWidget(this.foo);
 
   @override
@@ -622,7 +622,7 @@ import 'package:flutter/material.dart';
 
 class MyWidget extends StatelessWidget {
   final String field;
-  
+
   MyWidget(this.field);
 
   @override
@@ -638,7 +638,7 @@ import 'package:flutter/material.dart';
 
 class MyWidget extends StatelessWidget {
   final String field;
-  
+
   MyWidget(this.field);
 
   @override
@@ -760,7 +760,7 @@ import 'package:flutter/material.dart';
 
 class MyWidget extends StatelessWidget {
   String field;
-  
+
   MyWidget(this.field);
 
   @override
@@ -955,7 +955,7 @@ import 'package:flutter/material.dart';
 
 class MyWidget extends StatelessWidget {
   final String _field;
-  
+
   MyWidget(this._field);
 
   @override
@@ -971,7 +971,7 @@ import 'package:flutter/material.dart';
 
 class MyWidget extends StatelessWidget {
   final String _field;
-  
+
   MyWidget(this._field);
 
   @override
@@ -1003,7 +1003,7 @@ import 'package:flutter/material.dart';
 class MyWidget extends StatelessWidget {
   final int field;
   final String _field;
-  
+
   MyWidget(this.field, this._field);
 
   @override
@@ -1020,7 +1020,7 @@ import 'package:flutter/material.dart';
 class MyWidget extends StatelessWidget {
   final int field;
   final String _field;
-  
+
   MyWidget(this.field, this._field);
 
   @override
@@ -1053,7 +1053,7 @@ import 'package:flutter/material.dart';
 
 class MyWidget extends StatelessWidget {
   final String field;
-  
+
   MyWidget(this.field);
 
   @override
@@ -1075,7 +1075,7 @@ import 'package:flutter/material.dart';
 
 class MyWidget extends StatelessWidget {
   final String field;
-  
+
   MyWidget(this.field);
 
   @override
diff --git a/pkg/analysis_server/test/services/refactoring/rename_extension_member_test.dart b/pkg/analysis_server/test/services/refactoring/rename_extension_member_test.dart
index b7e3770ade5..32dfb0fb6c0 100644
--- a/pkg/analysis_server/test/services/refactoring/rename_extension_member_test.dart
+++ b/pkg/analysis_server/test/services/refactoring/rename_extension_member_test.dart
@@ -228,7 +228,7 @@ extension E on int {
 main() {
   0.test;
   0.test = 2;
-  
+
   E(0).test;
   E(0).test = 3;
 }
@@ -251,7 +251,7 @@ extension E on int {
 main() {
   0.newName;
   0.newName = 2;
-  
+
   E(0).newName;
   E(0).newName = 3;
 }
@@ -271,7 +271,7 @@ extension E on int {
 main() {
   0.test;
   0.test = 2;
-  
+
   E(0).test;
   E(0).test = 3;
 }
@@ -294,7 +294,7 @@ extension E on int {
 main() {
   0.newName;
   0.newName = 2;
-  
+
   E(0).newName;
   E(0).newName = 3;
 }
diff --git a/pkg/analysis_server/test/src/computer/folding_computer_test.dart b/pkg/analysis_server/test/src/computer/folding_computer_test.dart
index d4ed8dfa53e..62e7ad9f5e2 100644
--- a/pkg/analysis_server/test/src/computer/folding_computer_test.dart
+++ b/pkg/analysis_server/test/src/computer/folding_computer_test.dart
@@ -68,7 +68,7 @@ class MyClass2 {/*4:INC*/
   @setterAnnotation1/*7:INC*/
   @setterAnnotation2/*7:EXC:ANNOTATIONS*/
   void set myThing(int value) {}
-  
+
   @methodAnnotation1/*8:INC*/
   @methodAnnotation2/*8:EXC:ANNOTATIONS*/
   void myMethod() {}
diff --git a/pkg/analysis_server/test/src/computer/outline_computer_test.dart b/pkg/analysis_server/test/src/computer/outline_computer_test.dart
index da4b72a14d3..6829836d83e 100644
--- a/pkg/analysis_server/test/src/computer/outline_computer_test.dart
+++ b/pkg/analysis_server/test/src/computer/outline_computer_test.dart
@@ -1026,9 +1026,9 @@ mixin M<N> {
     var unitOutline = await _computeOutline('''
 class A {
   int fieldA, fieldB = 2;
-  
+
   int fieldC;
-  
+
   /// Documentation.
   int fieldD;
 }
@@ -1071,10 +1071,10 @@ class A {
       expect(element.kind, ElementKind.FIELD);
       expect(element.name, 'fieldC');
 
-      expect(outline.offset, 41);
+      expect(outline.offset, 39);
       expect(outline.length, 11);
 
-      expect(outline.codeOffset, 45);
+      expect(outline.codeOffset, 43);
       expect(outline.codeLength, 6);
     }
 
@@ -1085,10 +1085,10 @@ class A {
       expect(element.kind, ElementKind.FIELD);
       expect(element.name, 'fieldD');
 
-      expect(outline.offset, 58);
+      expect(outline.offset, 54);
       expect(outline.length, 32);
 
-      expect(outline.codeOffset, 83);
+      expect(outline.codeOffset, 79);
       expect(outline.codeLength, 6);
     }
   }
@@ -1136,7 +1136,7 @@ class B {}
     var unitOutline = await _computeOutline('''
 class A {
   int methodA() {}
-  
+
   /// Documentation.
   @override
   int methodB() {}
@@ -1166,10 +1166,10 @@ class A {
       expect(element.kind, ElementKind.METHOD);
       expect(element.name, 'methodB');
 
-      expect(outline.offset, 34);
+      expect(outline.offset, 32);
       expect(outline.length, 49);
 
-      expect(outline.codeOffset, 67);
+      expect(outline.codeOffset, 65);
       expect(outline.codeLength, 16);
     }
   }
diff --git a/pkg/analysis_server/test/src/flutter/flutter_outline_computer_test.dart b/pkg/analysis_server/test/src/flutter/flutter_outline_computer_test.dart
index 1cd6ba22900..f1863017dc2 100644
--- a/pkg/analysis_server/test/src/flutter/flutter_outline_computer_test.dart
+++ b/pkg/analysis_server/test/src/flutter/flutter_outline_computer_test.dart
@@ -449,7 +449,7 @@ import 'package:flutter/widgets.dart';
 class WidgetA extends StatelessWidget {
   final Widget top;
   final Widget bottom;
-  
+
   WidgetA({this.top, this.bottom});
 }
 ''');
diff --git a/pkg/analysis_server/test/src/services/correction/assist/shadow_field_test.dart b/pkg/analysis_server/test/src/services/correction/assist/shadow_field_test.dart
index f13b9669ff2..c6a00612948 100644
--- a/pkg/analysis_server/test/src/services/correction/assist/shadow_field_test.dart
+++ b/pkg/analysis_server/test/src/services/correction/assist/shadow_field_test.dart
@@ -44,7 +44,7 @@ class C {
   num f = 0;
 
   void m() {
-    while (true) 
+    while (true)
       if (f is int) {
         print((f as int).abs());
       }
diff --git a/pkg/analysis_server/test/src/services/correction/assist/split_and_condition_test.dart b/pkg/analysis_server/test/src/services/correction/assist/split_and_condition_test.dart
index 2e96ea73494..bf448d75ff1 100644
--- a/pkg/analysis_server/test/src/services/correction/assist/split_and_condition_test.dart
+++ b/pkg/analysis_server/test/src/services/correction/assist/split_and_condition_test.dart
@@ -103,7 +103,7 @@ main() {
 main() {
   if (1 == 1
 // start
-&& 2 
+&& 2
 // end
 == 2
 ) {
diff --git a/pkg/analysis_server/test/src/services/correction/fix/convert_into_expression_body_test.dart b/pkg/analysis_server/test/src/services/correction/fix/convert_into_expression_body_test.dart
index 5bcdd3effb3..33d2b3380f8 100644
--- a/pkg/analysis_server/test/src/services/correction/fix/convert_into_expression_body_test.dart
+++ b/pkg/analysis_server/test/src/services/correction/fix/convert_into_expression_body_test.dart
@@ -27,7 +27,7 @@ class ConvertIntoExpressionBodyTest extends FixProcessorLintTest {
   Future<void> test_async() async {
     await resolveTestCode('''
 class A {
-  mmm() async { 
+  mmm() async {
     return 42;
   }
 }
diff --git a/pkg/analysis_server/test/src/services/correction/fix/data_driven/diagnostics/invalid_value_one_of_test.dart b/pkg/analysis_server/test/src/services/correction/fix/data_driven/diagnostics/invalid_value_one_of_test.dart
index fa9beb57145..97efe0f83e6 100644
--- a/pkg/analysis_server/test/src/services/correction/fix/data_driven/diagnostics/invalid_value_one_of_test.dart
+++ b/pkg/analysis_server/test/src/services/correction/fix/data_driven/diagnostics/invalid_value_one_of_test.dart
@@ -44,13 +44,13 @@ transforms:
     - kind: 'addTypeParameter'
       index: 0
       name: 'T'
-      argumentValue: 
+      argumentValue:
         expression: ''
         variables:
           x:
             kind: 'invalid'
 ''', [
-      error(TransformSetErrorCode.invalidValueOneOf, 280, 9),
+      error(TransformSetErrorCode.invalidValueOneOf, 279, 9),
     ]);
   }
 }
diff --git a/pkg/analysis_server/tool/spec/codegen_analysis_server.dart b/pkg/analysis_server/tool/spec/codegen_analysis_server.dart
index 096db256df2..fbe690fd9d3 100644
--- a/pkg/analysis_server/tool/spec/codegen_analysis_server.dart
+++ b/pkg/analysis_server/tool/spec/codegen_analysis_server.dart
@@ -29,7 +29,7 @@ class CodegenAnalysisServer extends CodegenJavaVisitor {
     writeln('''/**
  * The interface {@code AnalysisServer} defines the behavior of objects that interface to an
  * analysis server.
- * 
+ *
  * @coverage dart.server
  */''');
     makeClass('public interface AnalysisServer', () {
@@ -40,7 +40,7 @@ class CodegenAnalysisServer extends CodegenJavaVisitor {
         writeln('''/**
  * Add the given listener to the list of listeners that will receive notification when new
  * analysis results become available.
- * 
+ *
  * @param listener the listener to be added
  */''');
         writeln(
@@ -54,7 +54,7 @@ class CodegenAnalysisServer extends CodegenJavaVisitor {
         writeln('''/**
  * Remove the given listener from the list of listeners that will receive notification when new
    * analysis results become available.
- * 
+ *
  * @param listener the listener to be removed
  */''');
         writeln(
@@ -68,7 +68,7 @@ class CodegenAnalysisServer extends CodegenJavaVisitor {
         writeln('''/**
  * Add the given listener to the list of listeners that will receive notification when
    * requests are made by an analysis server client.
- * 
+ *
  * @param listener the listener to be added
  */''');
         writeln('public void addRequestListener(RequestListener listener);');
@@ -81,7 +81,7 @@ class CodegenAnalysisServer extends CodegenJavaVisitor {
         writeln('''/**
  * Remove the given listener from the list of listeners that will receive notification when
    * requests are made by an analysis server client.
- * 
+ *
  * @param listener the listener to be removed
  */''');
         writeln('public void removeRequestListener(RequestListener listener);');
@@ -94,7 +94,7 @@ class CodegenAnalysisServer extends CodegenJavaVisitor {
         writeln('''/**
  * Add the given listener to the list of listeners that will receive notification when
  * responses are received by an analysis server client.
- * 
+ *
  * @param listener the listener to be added
  */''');
         writeln('public void addResponseListener(ResponseListener listener);');
@@ -107,7 +107,7 @@ class CodegenAnalysisServer extends CodegenJavaVisitor {
         writeln('''/**
  * Remove the given listener from the list of listeners that will receive notification when
    * responses are received by an analysis server client.
- * 
+ *
  * @param listener the listener to be removed
  */''');
         writeln(
@@ -121,7 +121,7 @@ class CodegenAnalysisServer extends CodegenJavaVisitor {
         writeln('''/**
  * Add the given listener to the list of listeners that will receive notification when the server
  * is not active
- * 
+ *
  * @param listener the listener to be added
  */''');
         writeln(