From 755aabd0968f6d459278c95d8705665b35e99bba Mon Sep 17 00:00:00 2001
From: Devon Carew <devoncarew@google.com>
Date: Sat, 11 Nov 2023 01:52:16 +0000
Subject: [PATCH] [pkg] switches the default linting for pkg/ packages to
 dart_flutter_team_lints

Change-Id: I201b984fd8794e04bf6e0131ed4f85192f641ef4
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/335502
Reviewed-by: Nate Bosch <nbosch@google.com>
Commit-Queue: Devon Carew <devoncarew@google.com>
---
 pkg/analysis_options.yaml               | 12 +-----------
 pkg/dart2js_tools/analysis_options.yaml |  1 +
 pkg/heap_snapshot/analysis_options.yaml |  1 +
 pkg/mmap/analysis_options.yaml          |  1 +
 pkg/mmap/lib/src/mmap_impl.dart         |  2 +-
 pkg/mmap/pubspec.yaml                   |  2 +-
 pkg/mmap/test/mmap_test.dart            |  2 +-
 pkg/pkg.dart                            | 10 ++++++----
 8 files changed, 13 insertions(+), 18 deletions(-)
 create mode 100644 pkg/dart2js_tools/analysis_options.yaml
 create mode 100644 pkg/heap_snapshot/analysis_options.yaml
 create mode 100644 pkg/mmap/analysis_options.yaml

diff --git a/pkg/analysis_options.yaml b/pkg/analysis_options.yaml
index a6b5454471a..d978f811cce 100644
--- a/pkg/analysis_options.yaml
+++ b/pkg/analysis_options.yaml
@@ -1,11 +1 @@
-include: package:lints/recommended.yaml
-
-# analyzer:
-#   language:
-#     strict-casts: true
-
-linter:
-  rules:
-    depend_on_referenced_packages: true
-    directives_ordering: true
-    sort_pub_dependencies: true
+include: package:dart_flutter_team_lints/analysis_options.yaml
diff --git a/pkg/dart2js_tools/analysis_options.yaml b/pkg/dart2js_tools/analysis_options.yaml
new file mode 100644
index 00000000000..572dd239d09
--- /dev/null
+++ b/pkg/dart2js_tools/analysis_options.yaml
@@ -0,0 +1 @@
+include: package:lints/recommended.yaml
diff --git a/pkg/heap_snapshot/analysis_options.yaml b/pkg/heap_snapshot/analysis_options.yaml
new file mode 100644
index 00000000000..572dd239d09
--- /dev/null
+++ b/pkg/heap_snapshot/analysis_options.yaml
@@ -0,0 +1 @@
+include: package:lints/recommended.yaml
diff --git a/pkg/mmap/analysis_options.yaml b/pkg/mmap/analysis_options.yaml
new file mode 100644
index 00000000000..572dd239d09
--- /dev/null
+++ b/pkg/mmap/analysis_options.yaml
@@ -0,0 +1 @@
+include: package:lints/recommended.yaml
diff --git a/pkg/mmap/lib/src/mmap_impl.dart b/pkg/mmap/lib/src/mmap_impl.dart
index 531402b08dc..083ca3caf99 100644
--- a/pkg/mmap/lib/src/mmap_impl.dart
+++ b/pkg/mmap/lib/src/mmap_impl.dart
@@ -143,7 +143,7 @@ final finalizerAddress = () {
   return finalizerStub.cast<Void>();
 }();
 
-class PeerData extends Struct {
+base class PeerData extends Struct {
   external Pointer<Void> close;
   external Pointer<Void> munmap;
   external Pointer<Void> free;
diff --git a/pkg/mmap/pubspec.yaml b/pkg/mmap/pubspec.yaml
index c37def0f81c..b8bfb15ff0f 100644
--- a/pkg/mmap/pubspec.yaml
+++ b/pkg/mmap/pubspec.yaml
@@ -4,7 +4,7 @@ name: mmap
 publish_to: none
 
 environment:
-  sdk: '>=2.14.0 <3.0.0'
+  sdk: ^3.0.0
 
 # Use 'any' constraints here; we get our versions from the DEPS file.
 dependencies:
diff --git a/pkg/mmap/test/mmap_test.dart b/pkg/mmap/test/mmap_test.dart
index 77f554e10f4..d57c65a233d 100644
--- a/pkg/mmap/test/mmap_test.dart
+++ b/pkg/mmap/test/mmap_test.dart
@@ -18,7 +18,7 @@ final sizesToTest = [
   2 * kPageSize
 ];
 
-main() {
+void main() {
   final tempDir = Directory.systemTemp.createTempSync('mmap_test');
   try {
     testMmapOrReadFile(tempDir);
diff --git a/pkg/pkg.dart b/pkg/pkg.dart
index 887037f0b11..7afb5f951c7 100644
--- a/pkg/pkg.dart
+++ b/pkg/pkg.dart
@@ -23,18 +23,20 @@ void main(List<String> args) {
     var options = File('${dir.path}/analysis_options.yaml');
     var name = dir.path.split('/').last;
 
+    var type = 'default';
     if (options.existsSync()) {
-      var type = '** custom **';
+      type = '** custom **';
       var optionsContent = options.readAsStringSync();
       if (optionsContent.contains('package:lints/core.yaml')) {
         type = 'core';
       } else if (optionsContent.contains('package:lints/recommended.yaml')) {
         type = 'recommended';
+      } else if (optionsContent
+          .contains('package:dart_flutter_team_lints/analysis_options.yaml')) {
+        type = 'dart_flutter_team_lints';
       }
-      print('${name.padRight(indent)}: ${type.padRight(12)} $slocDesc');
-    } else {
-      print('${name.padRight(indent)}: default      $slocDesc');
     }
+    print('${name.padRight(indent)}: ${type.padRight(23)} $slocDesc');
   }
 }