Upgrade analyzer, analyzer_plugin, source_gen (#300)

invertase · Jan 8, 2025 · 4970682 · 4970682
1 parent 281fb8a
commit 4970682
Show file tree

Hide file tree

Showing 26 changed files with 245 additions and 132 deletions.
diff --git a/melos.yaml b/melos.yaml
@@ -1,4 +1,6 @@
 name: custom_lint_workspace
 
 packages:
-  - packages/**
+  - packages/custom_lint*
+  - packages/custom_lint*/example**
+  - packages/lint_visitor_generator
diff --git a/packages/custom_lint/CHANGELOG.md b/packages/custom_lint/CHANGELOG.md
@@ -1,3 +1,7 @@
+## Unreleased patch
+
+- Support analyzer 7.0.0
+
 ## 0.7.0 - 2024-10-27
 
 - `custom_lint --fix` and the generated "Fix all <code>" assists

diff --git a/packages/custom_lint/example/example_lint/pubspec.yaml b/packages/custom_lint/example/example_lint/pubspec.yaml
@@ -5,8 +5,8 @@ environment:
   sdk: '>=3.0.0 <4.0.0'
 
 dependencies:
-  analyzer: ">=5.12.0 <7.0.0"
-  analyzer_plugin: ^0.11.2
+  analyzer: ^7.0.0
+  analyzer_plugin: ^0.12.0
   custom_lint_builder:
     path: ../../../custom_lint_builder
 

diff --git a/packages/custom_lint/example/example_lint/pubspec_overrides.yaml b/packages/custom_lint/example/example_lint/pubspec_overrides.yaml
@@ -1,7 +1,7 @@
-# melos_managed_dependency_overrides: custom_lint,custom_lint_builder,custom_lint_core
+# melos_managed_dependency_overrides: custom_lint,custom_lint_builder,custom_lint_core,custom_lint_visitor
 dependency_overrides:
   custom_lint:
-    path: ../../../custom_lint
+    path: ../..
   custom_lint_builder:
     path: ../../../custom_lint_builder
   custom_lint_core:

diff --git a/packages/custom_lint/example/pubspec_overrides.yaml b/packages/custom_lint/example/pubspec_overrides.yaml
@@ -1,7 +1,7 @@
-# melos_managed_dependency_overrides: custom_lint,custom_lint_builder,custom_lint_core,custom_lint_example_lint
+# melos_managed_dependency_overrides: custom_lint,custom_lint_builder,custom_lint_core,custom_lint_example_lint,custom_lint_visitor
 dependency_overrides:
   custom_lint:
-    path: ../../custom_lint
+    path: ..
   custom_lint_builder:
     path: ../../custom_lint_builder
   custom_lint_core:

diff --git a/packages/custom_lint/lib/src/output/render_lints.dart b/packages/custom_lint/lib/src/output/render_lints.dart
@@ -46,9 +46,9 @@ void renderLints(
   // Sort errors by severity, file, line, column, code, message
   // if the output format requires it
   errors = errors.sorted((a, b) {
-    final severityCompare = -AnalysisErrorSeverity.VALUES
+    final severityCompare = -AnalysisErrorSeverity.values
         .indexOf(a.severity)
-        .compareTo(AnalysisErrorSeverity.VALUES.indexOf(b.severity));
+        .compareTo(AnalysisErrorSeverity.values.indexOf(b.severity));
     if (severityCompare != 0) return severityCompare;
 
     final fileCompare =

diff --git a/packages/custom_lint/lib/src/runner.dart b/packages/custom_lint/lib/src/runner.dart
@@ -25,8 +25,6 @@ class CustomLintRunner {
 
   var _closed = false;
 
-  late final _sdkPath = getSdkPath();
-
   /// Starts the plugin and sends the necessary requests for initializing it.
   late final initialize = Future(() async {
     _lintSubscription = channel.lints.listen((event) {
@@ -36,7 +34,7 @@ class CustomLintRunner {
     await channel.sendRequest(
       PluginVersionCheckParams(
         '',
-        _sdkPath,
+        sdkPath,
         _analyzerPluginProtocolVersion,
       ),
     );