Remove some deprecated fields from dart_services models (#2948)

dart-lang · May 6, 2024 · 9393c5c · 9393c5c
1 parent 7e660d4
commit 9393c5c
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 73 deletions.
diff --git a/pkgs/dart_services/analysis_options.yaml b/pkgs/dart_services/analysis_options.yaml
@@ -12,8 +12,6 @@ analyzer:
   errors:
     lines_longer_than_80_chars: ignore
     unreachable_from_main: ignore
-    # Remove this once we remove the AnalysisIssue.sourceName field.
-    deprecated_member_use_from_same_package: ignore
 
 linter:
   rules:

diff --git a/pkgs/dart_services/lib/src/analysis.dart b/pkgs/dart_services/lib/src/analysis.dart
@@ -285,7 +285,6 @@ class AnalysisServerWrapper {
             ),
           );
         }).toList(),
-        sourceName: path.basename(error.location.file),
       );
 
       return issue;
@@ -359,13 +358,7 @@ class AnalysisServerWrapper {
       }
     }
 
-    return api.AnalysisResponse(
-      issues: [
-        ...importIssues,
-        ...issues,
-      ],
-      packageImports: [],
-    );
+    return api.AnalysisResponse(issues: [...importIssues, ...issues]);
   }
 
   /// Cleanly shutdown the Analysis Server.

diff --git a/pkgs/dart_services/lib/src/shared/model.dart b/pkgs/dart_services/lib/src/shared/model.dart
diff --git a/pkgs/dart_services/lib/src/shared/model.g.dart b/pkgs/dart_services/lib/src/shared/model.g.dart
diff --git a/pkgs/dart_services/test/server_test.dart b/pkgs/dart_services/test/server_test.dart
@@ -49,7 +49,6 @@ void main() {
 }
 '''));
       expect(result.issues, isEmpty);
-      expect(result.packageImports, isEmpty);
     });
 
     test('analyze flutter', () async {
@@ -76,7 +75,6 @@ class MyApp extends StatelessWidget {
 
       expect(result, isNotNull);
       expect(result.issues, isEmpty);
-      expect(result.packageImports, isEmpty);
     });
 
     test('analyze errors', () async {

diff --git a/pkgs/dartpad_shared/analysis_options.yaml b/pkgs/dartpad_shared/analysis_options.yaml
@@ -5,9 +5,6 @@ analyzer:
     strict-casts: true
     strict-inference: true
     strict-raw-types: true
-  errors:
-    # Remove this once we remove the AnalysisIssue.sourceName field.
-    deprecated_member_use_from_same_package: ignore
 
 linter:
   rules:

diff --git a/pkgs/dartpad_shared/lib/model.dart b/pkgs/dartpad_shared/lib/model.dart
@@ -26,12 +26,8 @@ class SourceRequest {
 class AnalysisResponse {
   final List<AnalysisIssue> issues;
 
-  @Deprecated('This field was unused and will be removed in a future update.')
-  final List<String>? packageImports;
-
   AnalysisResponse({
     required this.issues,
-    this.packageImports,
   });
 
   factory AnalysisResponse.fromJson(Map<String, dynamic> json) =>
@@ -49,8 +45,6 @@ class AnalysisIssue {
   final String? correction;
   final String? url;
   final List<DiagnosticMessage>? contextMessages;
-  @Deprecated('Remove this once no longer referenced')
-  final String sourceName;
 
   AnalysisIssue({
     required this.kind,
@@ -60,7 +54,6 @@ class AnalysisIssue {
     this.correction,
     this.url,
     this.contextMessages,
-    this.sourceName = 'main.dart',
   });
 
   factory AnalysisIssue.fromJson(Map<String, dynamic> json) =>

diff --git a/pkgs/dartpad_shared/lib/model.g.dart b/pkgs/dartpad_shared/lib/model.g.dart
diff --git a/pkgs/dartpad_shared/pubspec.yaml b/pkgs/dartpad_shared/pubspec.yaml
@@ -7,9 +7,9 @@ environment:
 
 dependencies:
   http: ^1.1.0
-  json_annotation: ^4.8.1
+  json_annotation: ^4.9.0
 
 dev_dependencies:
   build_runner: ^2.4.5
   dart_flutter_team_lints: ^2.1.1
-  json_serializable: ^6.7.0
+  json_serializable: ^6.8.0