From 7148fbf1941f9d2db2d115b87c32515cdb204230 Mon Sep 17 00:00:00 2001
From: Aleksey Kulikov <skinny.mind@gmail.com>
Date: Fri, 17 Dec 2021 11:20:17 +0300
Subject: [PATCH] style: stricter linting

---
 analysis_options.yaml          | 7 +++++--
 lib/src/bindings/checkout.dart | 2 +-
 lib/src/bindings/diff.dart     | 2 ++
 lib/src/bindings/stash.dart    | 1 +
 lib/src/patch.dart             | 2 +-
 lib/src/repository.dart        | 6 +++---
 lib/src/stash.dart             | 2 +-
 test/repository_test.dart      | 2 +-
 8 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/analysis_options.yaml b/analysis_options.yaml
index a19fa50..d050e6c 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -23,6 +23,7 @@ linter:
     - avoid_setters_without_getters
     - avoid_slow_async_io
     - avoid_type_to_string
+    - avoid_unused_constructor_parameters
     - avoid_void_async
     - cast_nullable_to_non_nullable
     - directives_ordering
@@ -32,6 +33,7 @@ linter:
     - lines_longer_than_80_chars
     - missing_whitespace_between_adjacent_strings
     - noop_primitive_operations
+    - omit_local_variable_types
     - parameter_assignments
     - prefer_const_constructors
     - prefer_constructors_over_static_methods
@@ -41,10 +43,11 @@ linter:
     - prefer_null_aware_method_calls
     - require_trailing_commas
     - sort_constructors_first
+    - sort_pub_dependencies
+    - sort_unnamed_constructors_first
     - type_annotate_public_apis
+    - unawaited_futures
     - use_named_constants
     - use_raw_strings
     - use_setters_to_change_properties
     - use_string_buffers
-    - sort_unnamed_constructors_first
-    - sort_pub_dependencies
diff --git a/lib/src/bindings/checkout.dart b/lib/src/bindings/checkout.dart
index a6f7ccf..a41861e 100644
--- a/lib/src/bindings/checkout.dart
+++ b/lib/src/bindings/checkout.dart
@@ -132,7 +132,7 @@ List<Object> initOptions({
     optsC.ref.target_directory = directory.toNativeUtf8().cast<Int8>();
   }
 
-  List<Pointer<Int8>> pathPointers = [];
+  var pathPointers = <Pointer<Int8>>[];
   Pointer<Pointer<Int8>> strArray = nullptr;
   if (paths != null) {
     pathPointers = paths.map((e) => e.toNativeUtf8().cast<Int8>()).toList();
diff --git a/lib/src/bindings/diff.dart b/lib/src/bindings/diff.dart
index 2dd45dd..1bd3bbe 100644
--- a/lib/src/bindings/diff.dart
+++ b/lib/src/bindings/diff.dart
@@ -336,6 +336,7 @@ bool apply({
   if (hunkIndex != null) {
     _counter = 0;
     const except = -1;
+    // ignore: omit_local_variable_types
     final git_apply_hunk_cb callback = Pointer.fromFunction(_hunkCb, except);
     payload = calloc<Int32>()..value = hunkIndex;
     opts.ref.payload = payload.cast();
@@ -369,6 +370,7 @@ Pointer<git_index> applyToTree({
   if (hunkIndex != null) {
     _counter = 0;
     const except = -1;
+    // ignore: omit_local_variable_types
     final git_apply_hunk_cb callback = Pointer.fromFunction(_hunkCb, except);
     payload = calloc<Int32>()..value = hunkIndex;
     opts.ref.payload = payload.cast();
diff --git a/lib/src/bindings/stash.dart b/lib/src/bindings/stash.dart
index 31dee27..f7b04ff 100644
--- a/lib/src/bindings/stash.dart
+++ b/lib/src/bindings/stash.dart
@@ -160,6 +160,7 @@ int _stashCb(
 /// Loop over all the stashed states.
 List<Stash> list(Pointer<git_repository> repo) {
   const except = -1;
+  // ignore: omit_local_variable_types
   final git_stash_cb callBack = Pointer.fromFunction(_stashCb, except);
   libgit2.git_stash_foreach(repo, callBack, nullptr);
 
diff --git a/lib/src/patch.dart b/lib/src/patch.dart
index 5ccf6e9..d82e0cf 100644
--- a/lib/src/patch.dart
+++ b/lib/src/patch.dart
@@ -41,7 +41,7 @@ class Patch {
   }) {
     libgit2.git_libgit2_init();
 
-    final int flagsInt = flags.fold(0, (acc, e) => acc | e.value);
+    final flagsInt = flags.fold(0, (int acc, e) => acc | e.value);
 
     if (a is Blob?) {
       if (b is Blob?) {
diff --git a/lib/src/repository.dart b/lib/src/repository.dart
index c3312c3..93328ec 100644
--- a/lib/src/repository.dart
+++ b/lib/src/repository.dart
@@ -70,7 +70,7 @@ class Repository {
   }) {
     libgit2.git_libgit2_init();
 
-    int flagsInt = flags.fold(0, (acc, e) => acc | e.value);
+    var flagsInt = flags.fold(0, (int acc, e) => acc | e.value);
 
     if (bare) {
       flagsInt |= GitRepositoryInit.bare.value;
@@ -1162,7 +1162,7 @@ class Repository {
     String? directory,
     List<String>? paths,
   }) {
-    final int strat = strategy.fold(0, (acc, e) => acc | e.value);
+    final strat = strategy.fold(0, (int acc, e) => acc | e.value);
 
     if (refName == null) {
       checkout_bindings.index(
@@ -1274,7 +1274,7 @@ class Repository {
     int contextLines = 3,
     int interhunkLines = 0,
   }) {
-    final int flagsInt = flags.fold(0, (acc, e) => acc | e.value);
+    final flagsInt = flags.fold(0, (int acc, e) => acc | e.value);
 
     if (a is Tree && b is Tree) {
       return Diff(
diff --git a/lib/src/stash.dart b/lib/src/stash.dart
index eec4f4c..1ab04e8 100644
--- a/lib/src/stash.dart
+++ b/lib/src/stash.dart
@@ -40,7 +40,7 @@ class Stash {
     String? message,
     Set<GitStash> flags = const {GitStash.defaults},
   }) {
-    final int flagsInt = flags.fold(0, (acc, e) => acc | e.value);
+    final flagsInt = flags.fold(0, (int acc, e) => acc | e.value);
 
     return Oid(
       bindings.save(
diff --git a/test/repository_test.dart b/test/repository_test.dart
index f9a4cbd..13bcfe7 100644
--- a/test/repository_test.dart
+++ b/test/repository_test.dart
@@ -302,7 +302,7 @@ void main() {
       expect(repo.getAttribute(path: 'invalid', name: 'not-there'), null);
 
       final attrFile = await File('${repo.workdir}.gitattributes').create();
-      attrFile.writeAsString('*.dart text\n*.jpg -text\n*.sh eol=lf\n');
+      await attrFile.writeAsString('*.dart text\n*.jpg -text\n*.sh eol=lf\n');
 
       await File('${repo.workdir}file.dart').create();
       await File('${repo.workdir}file.sh').create();