diff --git a/pkg/analysis_server/test/mock_packages/flutter/lib/src/foundation/diagnostics.dart b/pkg/analysis_server/test/mock_packages/flutter/lib/src/foundation/diagnostics.dart
index ffe35305a74..6f001066c13 100644
--- a/pkg/analysis_server/test/mock_packages/flutter/lib/src/foundation/diagnostics.dart
+++ b/pkg/analysis_server/test/mock_packages/flutter/lib/src/foundation/diagnostics.dart
@@ -2,9 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-///// todo (pq): remove when linter 0.1.118 is integrated.
-mixin DiagnosticableMixin {}
-
 mixin Diagnosticable {}
 
 abstract class DiagnosticableTree with Diagnosticable {
diff --git a/pkg/analysis_server/test/src/services/correction/fix/add_diagnostic_property_reference_test.dart b/pkg/analysis_server/test/src/services/correction/fix/add_diagnostic_property_reference_test.dart
index f64cdf23b55..e51de1840f6 100644
--- a/pkg/analysis_server/test/src/services/correction/fix/add_diagnostic_property_reference_test.dart
+++ b/pkg/analysis_server/test/src/services/correction/fix/add_diagnostic_property_reference_test.dart
@@ -90,12 +90,11 @@ class AddDiagnosticPropertyReferenceTest extends FixProcessorLintTest {
   }
 
   Future<void> test_boolField() async {
-    // todo(pq): when linter 0.1.118 is integrated, update DiagnosticableMixin to Diagnosticable
     await resolveTestCode('''
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 
-class C extends Widget with DiagnosticableMixin {
+class C extends Widget with Diagnosticable {
   bool get absorbing => _absorbing;
   bool _absorbing = false;
   bool ignoringSemantics = false;
@@ -110,7 +109,7 @@ class C extends Widget with DiagnosticableMixin {
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 
-class C extends Widget with DiagnosticableMixin {
+class C extends Widget with Diagnosticable {
   bool get absorbing => _absorbing;
   bool _absorbing = false;
   bool ignoringSemantics = false;
@@ -129,7 +128,7 @@ class C extends Widget with DiagnosticableMixin {
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 
-class C extends Widget with DiagnosticableMixin {
+class C extends Widget with Diagnosticable {
   bool ignoringSemantics = false;
   @override
   void debugFillProperties(DiagnosticPropertiesBuilder properties) {
@@ -140,7 +139,7 @@ class C extends Widget with DiagnosticableMixin {
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 
-class C extends Widget with DiagnosticableMixin {
+class C extends Widget with Diagnosticable {
   bool ignoringSemantics = false;
   @override
   void debugFillProperties(DiagnosticPropertiesBuilder properties) {
@@ -155,7 +154,7 @@ class C extends Widget with DiagnosticableMixin {
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 
-class C extends Widget with DiagnosticableMixin {
+class C extends Widget with Diagnosticable {
   bool ignoringSemantics = false;
   @override
   void debugFillProperties(DiagnosticPropertiesBuilder props) {
@@ -166,7 +165,7 @@ class C extends Widget with DiagnosticableMixin {
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 
-class C extends Widget with DiagnosticableMixin {
+class C extends Widget with Diagnosticable {
   bool ignoringSemantics = false;
   @override
   void debugFillProperties(DiagnosticPropertiesBuilder props) {
@@ -181,7 +180,7 @@ class C extends Widget with DiagnosticableMixin {
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 
-class C extends Widget with DiagnosticableMixin {
+class C extends Widget with Diagnosticable {
   bool get absorbing => _absorbing;
   bool _absorbing = false;
   @override
@@ -194,7 +193,7 @@ class C extends Widget with DiagnosticableMixin {
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 
-class C extends Widget with DiagnosticableMixin {
+class C extends Widget with Diagnosticable {
   bool get absorbing => _absorbing;
   bool _absorbing = false;
   @override
@@ -212,7 +211,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 
-class C extends Widget with DiagnosticableMixin {
+class C extends Widget with Diagnosticable {
   Color field = Color(0);
   @override
   void debugFillProperties(DiagnosticPropertiesBuilder properties) {
@@ -225,7 +224,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 
-class C extends Widget with DiagnosticableMixin {
+class C extends Widget with Diagnosticable {
   Color field = Color(0);
   @override
   void debugFillProperties(DiagnosticPropertiesBuilder properties) {
@@ -241,7 +240,7 @@ class C extends Widget with DiagnosticableMixin {
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 
-class C extends Widget with DiagnosticableMixin {
+class C extends Widget with Diagnosticable {
   double field = 4.2;
   @override
   void debugFillProperties(DiagnosticPropertiesBuilder properties) {
@@ -253,7 +252,7 @@ class C extends Widget with DiagnosticableMixin {
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 
-class C extends Widget with DiagnosticableMixin {
+class C extends Widget with Diagnosticable {
   double field = 4.2;
   @override
   void debugFillProperties(DiagnosticPropertiesBuilder properties) {
@@ -269,7 +268,7 @@ class C extends Widget with DiagnosticableMixin {
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 
-class C extends Widget with DiagnosticableMixin {
+class C extends Widget with Diagnosticable {
   dynamic field;
   @override
   void debugFillProperties(DiagnosticPropertiesBuilder properties) {
@@ -281,7 +280,7 @@ class C extends Widget with DiagnosticableMixin {
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 
-class C extends Widget with DiagnosticableMixin {
+class C extends Widget with Diagnosticable {
   dynamic field;
   @override
   void debugFillProperties(DiagnosticPropertiesBuilder properties) {
@@ -297,7 +296,7 @@ class C extends Widget with DiagnosticableMixin {
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 
-class C extends Widget with DiagnosticableMixin {
+class C extends Widget with Diagnosticable {
   Foo field = Foo.bar;
   @override
   void debugFillProperties(DiagnosticPropertiesBuilder properties) {
@@ -310,7 +309,7 @@ enum Foo {bar}
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 
-class C extends Widget with DiagnosticableMixin {
+class C extends Widget with Diagnosticable {
   Foo field = Foo.bar;
   @override
   void debugFillProperties(DiagnosticPropertiesBuilder properties) {
@@ -328,7 +327,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 
-class C extends Widget with DiagnosticableMixin {
+class C extends Widget with Diagnosticable {
   ValueChanged<double> onChanged = (d) {};
   @override
   void debugFillProperties(DiagnosticPropertiesBuilder properties) {
@@ -342,7 +341,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 
-class C extends Widget with DiagnosticableMixin {
+class C extends Widget with Diagnosticable {
   ValueChanged<double> onChanged = (d) {};
   @override
   void debugFillProperties(DiagnosticPropertiesBuilder properties) {
@@ -359,7 +358,7 @@ typedef ValueChanged<T> = void Function(T value);
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 
-class C extends Widget with DiagnosticableMixin {
+class C extends Widget with Diagnosticable {
   int field = 0;
   @override
   void debugFillProperties(DiagnosticPropertiesBuilder properties) {
@@ -371,7 +370,7 @@ class C extends Widget with DiagnosticableMixin {
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 
-class C extends Widget with DiagnosticableMixin {
+class C extends Widget with Diagnosticable {
   int field = 0;
   @override
   void debugFillProperties(DiagnosticPropertiesBuilder properties) {
@@ -387,7 +386,7 @@ class C extends Widget with DiagnosticableMixin {
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 
-class C extends Widget with DiagnosticableMixin {
+class C extends Widget with Diagnosticable {
   Iterable<String> field = [];
   @override
   void debugFillProperties(DiagnosticPropertiesBuilder properties) {
@@ -399,7 +398,7 @@ class C extends Widget with DiagnosticableMixin {
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 
-class C extends Widget with DiagnosticableMixin {
+class C extends Widget with Diagnosticable {
   Iterable<String> field = [];
   @override
   void debugFillProperties(DiagnosticPropertiesBuilder properties) {
@@ -415,7 +414,7 @@ class C extends Widget with DiagnosticableMixin {
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 
-class C extends Widget with DiagnosticableMixin {
+class C extends Widget with Diagnosticable {
   List<List<String>> field = [];
   @override
   void debugFillProperties(DiagnosticPropertiesBuilder properties) {
@@ -427,7 +426,7 @@ class C extends Widget with DiagnosticableMixin {
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 
-class C extends Widget with DiagnosticableMixin {
+class C extends Widget with Diagnosticable {
   List<List<String>> field = [];
   @override
   void debugFillProperties(DiagnosticPropertiesBuilder properties) {
@@ -448,7 +447,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 import 'package:vector_math/vector_math_64.dart';
 
-class C extends Widget with DiagnosticableMixin {
+class C extends Widget with Diagnosticable {
   Matrix4 field = Matrix4();
   @override
   void debugFillProperties(DiagnosticPropertiesBuilder properties) {
@@ -461,7 +460,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 import 'package:vector_math/vector_math_64.dart';
 
-class C extends Widget with DiagnosticableMixin {
+class C extends Widget with Diagnosticable {
   Matrix4 field = Matrix4();
   @override
   void debugFillProperties(DiagnosticPropertiesBuilder properties) {
@@ -477,7 +476,7 @@ class C extends Widget with DiagnosticableMixin {
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 
-class C extends Widget with DiagnosticableMixin {
+class C extends Widget with Diagnosticable {
   Object field = '';
   @override
   void debugFillProperties(DiagnosticPropertiesBuilder properties) {
@@ -489,7 +488,7 @@ class C extends Widget with DiagnosticableMixin {
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 
-class C extends Widget with DiagnosticableMixin {
+class C extends Widget with Diagnosticable {
   Object field = '';
   @override
   void debugFillProperties(DiagnosticPropertiesBuilder properties) {
@@ -505,7 +504,7 @@ class C extends Widget with DiagnosticableMixin {
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 
-class C extends Widget with DiagnosticableMixin {
+class C extends Widget with Diagnosticable {
   String field = '';
   @override
   void debugFillProperties(DiagnosticPropertiesBuilder properties) {
@@ -517,7 +516,7 @@ class C extends Widget with DiagnosticableMixin {
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 
-class C extends Widget with DiagnosticableMixin {
+class C extends Widget with Diagnosticable {
   String field = '';
   @override
   void debugFillProperties(DiagnosticPropertiesBuilder properties) {
@@ -533,7 +532,7 @@ class C extends Widget with DiagnosticableMixin {
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 
-class C extends Widget with DiagnosticableMixin {
+class C extends Widget with Diagnosticable {
   String field = '';
 }
 ''');
@@ -541,7 +540,7 @@ class C extends Widget with DiagnosticableMixin {
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 
-class C extends Widget with DiagnosticableMixin {
+class C extends Widget with Diagnosticable {
   String field = '';
   @override
   void debugFillProperties(DiagnosticPropertiesBuilder properties) {
@@ -557,7 +556,7 @@ class C extends Widget with DiagnosticableMixin {
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 
-class C extends Widget with DiagnosticableMixin {
+class C extends Widget with Diagnosticable {
   ClassNotInScope<bool> onChanged;
 
   @override
@@ -570,7 +569,7 @@ class C extends Widget with DiagnosticableMixin {
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 
-class C extends Widget with DiagnosticableMixin {
+class C extends Widget with Diagnosticable {
   ClassNotInScope<bool> onChanged;
 
   @override
@@ -589,7 +588,7 @@ class C extends Widget with DiagnosticableMixin {
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 
-class C extends Widget with DiagnosticableMixin {
+class C extends Widget with Diagnosticable {
   ClassNotInScope<bool> get onChanged => null;
 
   @override
@@ -602,7 +601,7 @@ class C extends Widget with DiagnosticableMixin {
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 
-class C extends Widget with DiagnosticableMixin {
+class C extends Widget with Diagnosticable {
   ClassNotInScope<bool> get onChanged => null;
 
   @override
@@ -621,7 +620,7 @@ class C extends Widget with DiagnosticableMixin {
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 
-class C extends Widget with DiagnosticableMixin {
+class C extends Widget with Diagnosticable {
   var field;
   @override
   void debugFillProperties(DiagnosticPropertiesBuilder properties) {
@@ -633,7 +632,7 @@ class C extends Widget with DiagnosticableMixin {
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 
-class C extends Widget with DiagnosticableMixin {
+class C extends Widget with Diagnosticable {
   var field;
   @override
   void debugFillProperties(DiagnosticPropertiesBuilder properties) {