From 53fbe4f7ef4fc1f94e37dc13dc777b35d9596e15 Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Mon, 8 May 2023 14:49:34 +0200 Subject: [PATCH] chore: sort imports --- lib/fake_matrix_api.dart | 1 + lib/src/generated/api.dart | 26 +++++++++---------- lib/src/generated/model.dart | 11 ++++---- lib/src/model/events/image_pack_content.dart | 2 +- .../model/events/room_encrypted_content.dart | 1 - lib/src/model/matrix_exception.dart | 1 + lib/src/utils/print_logs_web.dart | 3 ++- pubspec.yaml | 1 + test/event_content_test.dart | 3 ++- test/map_copy_extension_test.dart | 3 ++- test/matrix_api_test.dart | 3 ++- test/try_get_map_extension_test.dart | 3 ++- 12 files changed, 33 insertions(+), 25 deletions(-) diff --git a/lib/fake_matrix_api.dart b/lib/fake_matrix_api.dart index 3a63be40..fc32738f 100644 --- a/lib/fake_matrix_api.dart +++ b/lib/fake_matrix_api.dart @@ -27,6 +27,7 @@ import 'dart:math'; import 'package:http/http.dart'; import 'package:http/testing.dart'; + import 'package:matrix_api_lite/matrix_api_lite.dart'; Map decodeJson(dynamic data) { diff --git a/lib/src/generated/api.dart b/lib/src/generated/api.dart index c0e63c86..89164749 100644 --- a/lib/src/generated/api.dart +++ b/lib/src/generated/api.dart @@ -1,19 +1,19 @@ -import '../model/auth/authentication_data.dart'; -import '../model/auth/authentication_types.dart'; -import '../model/auth/authentication_identifier.dart'; -import '../model/matrix_keys.dart'; -import '../model/sync_update.dart'; -import '../model/matrix_event.dart'; -import '../model/children_state.dart'; - -import 'model.dart'; -import 'fixed_model.dart'; -import 'internal.dart'; - -import 'package:http/http.dart'; import 'dart:convert'; import 'dart:typed_data'; +import 'package:http/http.dart'; + +import '../model/auth/authentication_data.dart'; +import '../model/auth/authentication_identifier.dart'; +import '../model/auth/authentication_types.dart'; +import '../model/children_state.dart'; +import '../model/matrix_event.dart'; +import '../model/matrix_keys.dart'; +import '../model/sync_update.dart'; +import 'fixed_model.dart'; +import 'internal.dart'; +import 'model.dart'; + class Api { Client httpClient; Uri? baseUri; diff --git a/lib/src/generated/model.dart b/lib/src/generated/model.dart index 5b355f2d..a4341e68 100644 --- a/lib/src/generated/model.dart +++ b/lib/src/generated/model.dart @@ -1,13 +1,14 @@ +import 'package:enhanced_enum/enhanced_enum.dart'; + import '../model/auth/authentication_data.dart'; -import '../model/auth/authentication_types.dart'; import '../model/auth/authentication_identifier.dart'; +import '../model/auth/authentication_types.dart'; +import '../model/children_state.dart'; +import '../model/matrix_event.dart'; import '../model/matrix_keys.dart'; import '../model/sync_update.dart'; -import '../model/matrix_event.dart'; -import '../model/children_state.dart'; - import 'internal.dart'; -import 'package:enhanced_enum/enhanced_enum.dart'; + part 'model.g.dart'; class _NameSource { diff --git a/lib/src/model/events/image_pack_content.dart b/lib/src/model/events/image_pack_content.dart index a7cbdf37..4365f0ea 100644 --- a/lib/src/model/events/image_pack_content.dart +++ b/lib/src/model/events/image_pack_content.dart @@ -21,9 +21,9 @@ * SOFTWARE. */ -import '../basic_event.dart'; import '../../utils/filter_map_extension.dart'; import '../../utils/try_get_map_extension.dart'; +import '../basic_event.dart'; extension ImagePackContentBasicEventExtension on BasicEvent { ImagePackContent get parsedImagePackContent => diff --git a/lib/src/model/events/room_encrypted_content.dart b/lib/src/model/events/room_encrypted_content.dart index 48dc6e24..7d4ef4b0 100644 --- a/lib/src/model/events/room_encrypted_content.dart +++ b/lib/src/model/events/room_encrypted_content.dart @@ -22,7 +22,6 @@ */ import 'package:matrix_api_lite/src/utils/logs.dart'; - import '../../utils/filter_map_extension.dart'; import '../../utils/try_get_map_extension.dart'; import '../basic_event.dart'; diff --git a/lib/src/model/matrix_exception.dart b/lib/src/model/matrix_exception.dart index 48231e3e..0f20c674 100644 --- a/lib/src/model/matrix_exception.dart +++ b/lib/src/model/matrix_exception.dart @@ -24,6 +24,7 @@ import 'dart:convert'; import 'package:http/http.dart' as http; + import 'package:matrix_api_lite/matrix_api_lite.dart'; enum MatrixError { diff --git a/lib/src/utils/print_logs_web.dart b/lib/src/utils/print_logs_web.dart index aa7c6e0f..f13f0311 100644 --- a/lib/src/utils/print_logs_web.dart +++ b/lib/src/utils/print_logs_web.dart @@ -1,6 +1,7 @@ -import 'package:matrix_api_lite/matrix_api_lite.dart'; import 'dart:html'; +import 'package:matrix_api_lite/matrix_api_lite.dart'; + extension PrintLogs on LogEvent { void printOut() { var logsStr = '[Matrix] $title'; diff --git a/pubspec.yaml b/pubspec.yaml index ab670998..594d94c9 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -16,5 +16,6 @@ dependencies: dev_dependencies: build_runner: ^2.1.8 enhanced_enum_generator: ^0.2.4 + import_sorter: ^4.6.0 lints: ^2.0.0 test: ^1.14.4 diff --git a/test/event_content_test.dart b/test/event_content_test.dart index 3b5bf6d4..b6124ce7 100644 --- a/test/event_content_test.dart +++ b/test/event_content_test.dart @@ -23,9 +23,10 @@ import 'dart:convert'; -import 'package:matrix_api_lite/matrix_api_lite.dart'; import 'package:test/test.dart'; +import 'package:matrix_api_lite/matrix_api_lite.dart'; + void main() { group('Event Content tests', () { test('Room Encryption Content', () { diff --git a/test/map_copy_extension_test.dart b/test/map_copy_extension_test.dart index 3578c624..188a18ee 100644 --- a/test/map_copy_extension_test.dart +++ b/test/map_copy_extension_test.dart @@ -21,9 +21,10 @@ * SOFTWARE. */ -import 'package:matrix_api_lite/matrix_api_lite.dart'; import 'package:test/test.dart'; +import 'package:matrix_api_lite/matrix_api_lite.dart'; + void main() { group('Map-copy-extension', () { test('it should work', () { diff --git a/test/matrix_api_test.dart b/test/matrix_api_test.dart index bfef3cb4..0306ad28 100644 --- a/test/matrix_api_test.dart +++ b/test/matrix_api_test.dart @@ -23,9 +23,10 @@ import 'dart:typed_data'; +import 'package:test/test.dart'; + import 'package:matrix_api_lite/fake_matrix_api.dart'; import 'package:matrix_api_lite/matrix_api_lite.dart'; -import 'package:test/test.dart'; const emptyRequest = {}; diff --git a/test/try_get_map_extension_test.dart b/test/try_get_map_extension_test.dart index c31e78e4..13e60c51 100644 --- a/test/try_get_map_extension_test.dart +++ b/test/try_get_map_extension_test.dart @@ -21,9 +21,10 @@ * SOFTWARE. */ -import 'package:matrix_api_lite/matrix_api_lite.dart'; import 'package:test/test.dart'; +import 'package:matrix_api_lite/matrix_api_lite.dart'; + void main() { group('Try-get-map-extension', () { Logs().level = Level.verbose;