add a packageImports fields to the analysis reponse (#2687)

dart-lang · Oct 20, 2023 · 4c5b0a7 · 4c5b0a7
1 parent 38f90b8
commit 4c5b0a7
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 10 deletions.
diff --git a/pkgs/dart_services/lib/src/common_server_api.dart b/pkgs/dart_services/lib/src/common_server_api.dart
@@ -67,6 +67,7 @@ class CommonServerApi {
             column: issue.column,
           );
         }).toList(),
+        packageImports: result.packageImports,
       ).toJson());
     } else {
       return unhandledVersion(apiVersion);

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_v3_test.dart b/pkgs/dart_services/test/server_v3_test.dart
@@ -53,6 +53,7 @@ void main() {
 }
 '''));
       expect(result.issues, isEmpty);
+      expect(result.packageImports, isEmpty);
     });
 
     test('analyze flutter', () async {
@@ -79,6 +80,8 @@ class MyApp extends StatelessWidget {
 
       expect(result, isNotNull);
       expect(result.issues, isEmpty);
+      expect(result.packageImports, isNotEmpty);
+      expect(result.packageImports, contains('flutter'));
     });
 
     test('analyze errors', () async {

diff --git a/pkgs/dartpad_shared/lib/model.dart b/pkgs/dartpad_shared/lib/model.dart
@@ -25,8 +25,12 @@ class SourceRequest {
 @JsonSerializable()
 class AnalysisResponse {
   final List<AnalysisIssue> issues;
+  final List<String> packageImports;
 
-  AnalysisResponse({this.issues = const []});
+  AnalysisResponse({
+    required this.issues,
+    required this.packageImports,
+  });
 
   factory AnalysisResponse.fromJson(Map<String, dynamic> json) =>
       _$AnalysisResponseFromJson(json);
@@ -138,6 +142,11 @@ class FlutterBuildResponse {
 
 @JsonSerializable()
 class FixesResponse {
+  static final FixesResponse empty = FixesResponse(
+    fixes: [],
+    assists: [],
+  );
+
   final List<SourceChange> fixes;
   final List<SourceChange> assists;
 
@@ -222,6 +231,12 @@ class DocumentResponse {
 
 @JsonSerializable()
 class CompleteResponse {
+  static final CompleteResponse empty = CompleteResponse(
+    replacementLength: 0,
+    replacementOffset: 0,
+    suggestions: [],
+  );
+
   final int replacementOffset;
   final int replacementLength;
   final List<CompletionSuggestion> suggestions;

diff --git a/pkgs/dartpad_shared/lib/model.g.dart b/pkgs/dartpad_shared/lib/model.g.dart