Fix LintCode conflict

rrousselGit · rrousselGit · commit 14d3899fedaa · 2024-07-16T18:39:46.000+02:00
diff --git a/packages/custom_lint/CHANGELOG.md b/packages/custom_lint/CHANGELOG.md
@@ -1,3 +1,7 @@
+## Unreleased fix
+
+- Fix compilation error when using latest analyzer
+
 ## 0.6.4 - 2024-03-16
 
 - Improve error message to attempt debugging a certain bug
diff --git a/packages/custom_lint/example/example_lint/lib/custom_lint_example_lint.dart b/packages/custom_lint/example/example_lint/lib/custom_lint_example_lint.dart
@@ -1,4 +1,4 @@
-import 'package:analyzer/error/error.dart';
+import 'package:analyzer/error/error.dart' hide LintCode;
 import 'package:analyzer/error/listener.dart';
 import 'package:analyzer/source/source_range.dart';
 import 'package:custom_lint_builder/custom_lint_builder.dart';
diff --git a/packages/custom_lint/test/cli_test.dart b/packages/custom_lint/test/cli_test.dart
@@ -1,7 +1,7 @@
 import 'dart:convert';
 import 'dart:io';
 
-import 'package:analyzer/error/error.dart';
+import 'package:analyzer/error/error.dart' hide LintCode;
 import 'package:custom_lint/src/output/output_format.dart';
 import 'package:test/test.dart';
 
@@ -472,7 +472,7 @@ Bad state: fail
     final plugin = createPlugin(
       name: 'test_lint',
       main: '''
-import 'package:analyzer/error/error.dart';
+import 'package:analyzer/error/error.dart' hide LintCode;
 import 'package:analyzer/error/listener.dart';
 import 'package:custom_lint_builder/custom_lint_builder.dart';
 
diff --git a/packages/custom_lint/test/create_project.dart b/packages/custom_lint/test/create_project.dart
@@ -1,7 +1,7 @@
 import 'dart:convert';
 import 'dart:io';
 
-import 'package:analyzer/error/error.dart';
+import 'package:analyzer/error/error.dart' hide LintCode;
 import 'package:path/path.dart';
 import 'package:test/scaffolding.dart';
 
@@ -142,7 +142,7 @@ import 'package:analyzer/dart/element/element.dart';
 import 'package:custom_lint_builder/custom_lint_builder.dart';
 import 'package:analyzer/dart/analysis/results.dart';
 import 'package:analyzer/error/listener.dart';
-import 'package:analyzer/error/error.dart';
+import 'package:analyzer/error/error.dart' hide LintCode;
 import 'package:path/path.dart' as p;
 
 PluginBase createPlugin() => _Plugin();
diff --git a/packages/custom_lint_builder/example/example_lint/lib/custom_lint_builder_example_lint.dart b/packages/custom_lint_builder/example/example_lint/lib/custom_lint_builder_example_lint.dart
@@ -1,4 +1,4 @@
-import 'package:analyzer/error/error.dart';
+import 'package:analyzer/error/error.dart' hide LintCode;
 import 'package:analyzer/error/listener.dart';
 import 'package:analyzer/source/source_range.dart';
 import 'package:custom_lint_builder/custom_lint_builder.dart';
diff --git a/packages/custom_lint_builder/lib/src/client.dart b/packages/custom_lint_builder/lib/src/client.dart
@@ -9,7 +9,7 @@ import 'package:analyzer/dart/analysis/analysis_context_collection.dart';
 import 'package:analyzer/dart/analysis/context_root.dart';
 import 'package:analyzer/dart/analysis/results.dart';
 import 'package:analyzer/dart/analysis/session.dart';
-import 'package:analyzer/error/error.dart';
+import 'package:analyzer/error/error.dart' hide LintCode;
 import 'package:analyzer/error/listener.dart';
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:analyzer/file_system/physical_file_system.dart';
diff --git a/packages/custom_lint_builder/lib/src/expect_lint.dart b/packages/custom_lint_builder/lib/src/expect_lint.dart
@@ -1,4 +1,4 @@
-import 'package:analyzer/error/error.dart';
+import 'package:analyzer/error/error.dart' hide LintCode;
 import 'package:analyzer/error/listener.dart';
 import 'package:analyzer/source/line_info.dart';
 import 'package:meta/meta.dart';
diff --git a/packages/custom_lint_builder/lib/src/ignore.dart b/packages/custom_lint_builder/lib/src/ignore.dart
@@ -1,4 +1,4 @@
-import 'package:analyzer/error/error.dart';
+import 'package:analyzer/error/error.dart' hide LintCode;
 import 'package:collection/collection.dart';
 import 'package:custom_lint_core/custom_lint_core.dart';
 
diff --git a/packages/custom_lint_builder/test/analyzer_converter_test.dart b/packages/custom_lint_builder/test/analyzer_converter_test.dart
@@ -1,4 +1,4 @@
-import 'package:analyzer/error/error.dart';
+import 'package:analyzer/error/error.dart' hide LintCode;
 import 'package:analyzer/file_system/memory_file_system.dart';
 import 'package:custom_lint_builder/custom_lint_builder.dart';
 import 'package:custom_lint_builder/src/custom_analyzer_converter.dart';
diff --git a/packages/custom_lint_core/lib/src/fixes.dart b/packages/custom_lint_core/lib/src/fixes.dart
@@ -2,7 +2,7 @@ import 'dart:io';
 
 import 'package:analyzer/dart/analysis/results.dart';
 import 'package:analyzer/dart/analysis/utilities.dart';
-import 'package:analyzer/error/error.dart';
+import 'package:analyzer/error/error.dart' hide LintCode;
 import 'package:analyzer_plugin/protocol/protocol_generated.dart';
 import 'package:meta/meta.dart';
 import 'package:pubspec_parse/pubspec_parse.dart';
diff --git a/packages/custom_lint_core/lib/src/lint_codes.dart b/packages/custom_lint_core/lib/src/lint_codes.dart
@@ -4,7 +4,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'package:analyzer/error/error.dart';
+import 'package:analyzer/error/error.dart' hide LintCode;
 import 'package:meta/meta.dart';
 
 import '../custom_lint_core.dart';
diff --git a/packages/custom_lint_core/lib/src/source_range_extensions.dart b/packages/custom_lint_core/lib/src/source_range_extensions.dart
@@ -1,5 +1,5 @@
 import 'package:analyzer/dart/ast/syntactic_entity.dart';
-import 'package:analyzer/error/error.dart';
+import 'package:analyzer/error/error.dart' hide LintCode;
 import 'package:analyzer/source/source_range.dart';
 
 /// Adds [sourceRange]
diff --git a/packages/custom_lint_core/test/fix_test.dart b/packages/custom_lint_core/test/fix_test.dart
@@ -1,6 +1,6 @@
 import 'package:analyzer/dart/analysis/results.dart';
 import 'package:analyzer/dart/analysis/utilities.dart';
-import 'package:analyzer/error/error.dart';
+import 'package:analyzer/error/error.dart' hide LintCode;
 import 'package:custom_lint_core/src/change_reporter.dart';
 import 'package:custom_lint_core/src/fixes.dart';
 import 'package:custom_lint_core/src/lint_rule.dart';

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import 'package:analyzer/error/error.dart';`
	`1`	`+import 'package:analyzer/error/error.dart' hide LintCode;`
`2`	`2`	`import 'package:analyzer/error/listener.dart';`
`3`	`3`	`import 'package:analyzer/source/source_range.dart';`
`4`	`4`	`import 'package:custom_lint_builder/custom_lint_builder.dart';`