diff --git a/pkgs/dart_services/lib/src/analysis.dart b/pkgs/dart_services/lib/src/analysis.dart index a376b9a23..891b35e55 100644 --- a/pkgs/dart_services/lib/src/analysis.dart +++ b/pkgs/dart_services/lib/src/analysis.dart @@ -350,10 +350,7 @@ class AnalysisServerWrapper { ...importIssues, ...issues, ], - packageImports: imports - .where((import) => import.packageImport) - .map((import) => import.packageName) - .toList(), + packageImports: [], ); } diff --git a/pkgs/dart_services/lib/src/shared/model.dart b/pkgs/dart_services/lib/src/shared/model.dart index c27d74870..dde22cdc7 100644 --- a/pkgs/dart_services/lib/src/shared/model.dart +++ b/pkgs/dart_services/lib/src/shared/model.dart @@ -25,11 +25,13 @@ class SourceRequest { @JsonSerializable() class AnalysisResponse { final List issues; - final List packageImports; + + @Deprecated('This field was unused and will be removed in a future update.') + final List? packageImports; AnalysisResponse({ required this.issues, - required this.packageImports, + this.packageImports, }); factory AnalysisResponse.fromJson(Map json) => diff --git a/pkgs/dart_services/lib/src/shared/model.g.dart b/pkgs/dart_services/lib/src/shared/model.g.dart index 5e9577936..9c1bf5383 100644 --- a/pkgs/dart_services/lib/src/shared/model.g.dart +++ b/pkgs/dart_services/lib/src/shared/model.g.dart @@ -23,8 +23,8 @@ AnalysisResponse _$AnalysisResponseFromJson(Map json) => issues: (json['issues'] as List) .map((e) => AnalysisIssue.fromJson(e as Map)) .toList(), - packageImports: (json['packageImports'] as List) - .map((e) => e as String) + packageImports: (json['packageImports'] as List?) + ?.map((e) => e as String) .toList(), ); diff --git a/pkgs/dart_services/test/server_test.dart b/pkgs/dart_services/test/server_test.dart index d0fa43160..56d2abc5e 100644 --- a/pkgs/dart_services/test/server_test.dart +++ b/pkgs/dart_services/test/server_test.dart @@ -76,7 +76,7 @@ class MyApp extends StatelessWidget { expect(result, isNotNull); expect(result.issues, isEmpty); - expect(result.packageImports, contains('flutter')); + expect(result.packageImports, isEmpty); }); test('analyze errors', () async { diff --git a/pkgs/dartpad_shared/lib/model.dart b/pkgs/dartpad_shared/lib/model.dart index c27d74870..dde22cdc7 100644 --- a/pkgs/dartpad_shared/lib/model.dart +++ b/pkgs/dartpad_shared/lib/model.dart @@ -25,11 +25,13 @@ class SourceRequest { @JsonSerializable() class AnalysisResponse { final List issues; - final List packageImports; + + @Deprecated('This field was unused and will be removed in a future update.') + final List? packageImports; AnalysisResponse({ required this.issues, - required this.packageImports, + this.packageImports, }); factory AnalysisResponse.fromJson(Map json) => diff --git a/pkgs/dartpad_shared/lib/model.g.dart b/pkgs/dartpad_shared/lib/model.g.dart index 5e9577936..9c1bf5383 100644 --- a/pkgs/dartpad_shared/lib/model.g.dart +++ b/pkgs/dartpad_shared/lib/model.g.dart @@ -23,8 +23,8 @@ AnalysisResponse _$AnalysisResponseFromJson(Map json) => issues: (json['issues'] as List) .map((e) => AnalysisIssue.fromJson(e as Map)) .toList(), - packageImports: (json['packageImports'] as List) - .map((e) => e as String) + packageImports: (json['packageImports'] as List?) + ?.map((e) => e as String) .toList(), ); diff --git a/pkgs/sketch_pad/lib/model.dart b/pkgs/sketch_pad/lib/model.dart index 40af2482f..8d529a046 100644 --- a/pkgs/sketch_pad/lib/model.dart +++ b/pkgs/sketch_pad/lib/model.dart @@ -40,7 +40,6 @@ class AppModel { final ValueNotifier appReady = ValueNotifier(false); final ValueNotifier> analysisIssues = ValueNotifier([]); - final ValueNotifier> packageImports = ValueNotifier([]); final ValueNotifier title = ValueNotifier(''); @@ -318,7 +317,6 @@ class AppServices { SourceRequest(source: appModel.sourceCodeController.text), ); appModel.analysisIssues.value = results.issues; - appModel.packageImports.value = results.packageImports; } catch (error) { appModel.analysisIssues.value = [ AnalysisIssue( @@ -327,7 +325,6 @@ class AppServices { location: Location(line: 0, column: 0), ), ]; - appModel.packageImports.value = []; } }