refactor: use loops inside list literals

This commit is contained in:
Aleksey Kulikov 2022-05-25 12:08:23 +03:00
parent c35d336a56
commit 5c9c23f9f5
13 changed files with 65 additions and 106 deletions

View file

@ -13,10 +13,10 @@ List<String> list(Pointer<git_repository> repo) {
final out = calloc<git_strarray>();
libgit2.git_remote_list(out, repo);
final result = <String>[];
for (var i = 0; i < out.ref.count; i++) {
result.add(out.ref.strings[i].cast<Utf8>().toDartString());
}
final result = <String>[
for (var i = 0; i < out.ref.count; i++)
out.ref.strings[i].cast<Utf8>().toDartString()
];
calloc.free(out);
@ -162,11 +162,13 @@ List<String> rename({
calloc.free(out);
throw LibGit2Error(libgit2.git_error_last());
} else {
final result = <String>[];
for (var i = 0; i < out.ref.count; i++) {
result.add(out.ref.strings[i].cast<Utf8>().toDartString());
}
final result = <String>[
for (var i = 0; i < out.ref.count; i++)
out.ref.strings[i].cast<Utf8>().toDartString()
];
calloc.free(out);
return result;
}
}
@ -253,11 +255,13 @@ List<String> fetchRefspecs(Pointer<git_remote> remote) {
final out = calloc<git_strarray>();
libgit2.git_remote_get_fetch_refspecs(out, remote);
final result = <String>[];
for (var i = 0; i < out.ref.count; i++) {
result.add(out.ref.strings[i].cast<Utf8>().toDartString());
}
final result = <String>[
for (var i = 0; i < out.ref.count; i++)
out.ref.strings[i].cast<Utf8>().toDartString()
];
calloc.free(out);
return result;
}
@ -266,11 +270,13 @@ List<String> pushRefspecs(Pointer<git_remote> remote) {
final out = calloc<git_strarray>();
libgit2.git_remote_get_push_refspecs(out, remote);
final result = <String>[];
for (var i = 0; i < out.ref.count; i++) {
result.add(out.ref.strings[i].cast<Utf8>().toDartString());
}
final result = <String>[
for (var i = 0; i < out.ref.count; i++)
out.ref.strings[i].cast<Utf8>().toDartString()
];
calloc.free(out);
return result;
}

View file

@ -124,7 +124,6 @@ Pointer<git_repository> clone({
required String localPath,
required bool bare,
RemoteCallback? remoteCallback,
// Repository Function(String, bool)? repository,
RepositoryCallback? repositoryCallback,
String? checkoutBranch,
required Callbacks callbacks,

View file

@ -110,11 +110,13 @@ List<String> list(Pointer<git_repository> repo) {
calloc.free(out);
throw LibGit2Error(libgit2.git_error_last());
} else {
final result = <String>[];
for (var i = 0; i < out.ref.count; i++) {
result.add(out.ref.strings[i].cast<Utf8>().toDartString());
}
final result = <String>[
for (var i = 0; i < out.ref.count; i++)
out.ref.strings[i].cast<Utf8>().toDartString()
];
calloc.free(out);
return result;
}
}

View file

@ -264,18 +264,11 @@ class Commit extends Equatable {
/// List of parent commits [Oid]s.
List<Oid> get parents {
final parents = <Oid>[];
final parentCount = bindings.parentCount(_commitPointer);
for (var i = 0; i < parentCount; i++) {
final parentOid = bindings.parentId(
commitPointer: _commitPointer,
position: i,
);
parents.add(Oid(parentOid));
}
return parents;
return <Oid>[
for (var i = 0; i < parentCount; i++)
Oid(bindings.parentId(commitPointer: _commitPointer, position: i))
];
}
/// Returns the specified parent of the commit at provided 0-based [position].

View file

@ -285,28 +285,18 @@ class Diff extends Equatable {
/// revisions.
List<DiffDelta> get deltas {
final length = bindings.length(_diffPointer);
final deltas = <DiffDelta>[];
for (var i = 0; i < length; i++) {
deltas.add(
DiffDelta(
bindings.getDeltaByIndex(
diffPointer: _diffPointer,
index: i,
),
),
);
}
return deltas;
return <DiffDelta>[
for (var i = 0; i < length; i++)
DiffDelta(bindings.getDeltaByIndex(diffPointer: _diffPointer, index: i))
];
}
/// A List of [Patch]es.
List<Patch> get patches {
final length = bindings.length(_diffPointer);
final patches = <Patch>[];
for (var i = 0; i < length; i++) {
patches.add(Patch.fromDiff(diff: this, index: i));
}
return patches;
return <Patch>[
for (var i = 0; i < length; i++) Patch.fromDiff(diff: this, index: i)
];
}
/// The patch diff text.

View file

@ -237,10 +237,10 @@ class Patch extends Equatable {
);
}
final intHeader = <int>[];
for (var i = 0; i < hunkPointer.ref.header_len; i++) {
intHeader.add(hunkPointer.ref.header[i]);
}
final intHeader = <int>[
for (var i = 0; i < hunkPointer.ref.header_len; i++)
hunkPointer.ref.header[i]
];
hunks.add(
DiffHunk._(

View file

@ -47,18 +47,13 @@ class Rebase {
/// List of operations that are to be applied.
List<RebaseOperation> get operations {
final result = <RebaseOperation>[];
final operationsCount = bindings.operationsCount(_rebasePointer);
for (var i = 0; i < operationsCount; i++) {
final operation = bindings.getOperationByIndex(
rebase: _rebasePointer,
index: i,
);
result.add(RebaseOperation._(operation));
}
return result;
return <RebaseOperation>[
for (var i = 0; i < operationsCount; i++)
RebaseOperation._(
bindings.getOperationByIndex(rebase: _rebasePointer, index: i),
)
];
}
/// Index of the rebase operation that is currently being applied. If the

View file

@ -203,14 +203,9 @@ class Reference extends Equatable {
///
/// Throws an [Exception] if error occured.
Oid get target {
late final Pointer<git_oid> oidPointer;
if (type == ReferenceType.direct) {
oidPointer = bindings.target(_refPointer);
} else {
oidPointer = bindings.target(bindings.resolve(_refPointer));
}
return Oid(oidPointer);
return type == ReferenceType.direct
? Oid(bindings.target(_refPointer))
: Oid(bindings.target(bindings.resolve(_refPointer)));
}
/// Recursively peel reference until object of the specified [type] is found.

View file

@ -211,20 +211,16 @@ class Remote extends Equatable {
final refs = bindings.lsRemotes(_remotePointer);
bindings.disconnect(_remotePointer);
final result = <RemoteReference>[];
for (final ref in refs) {
result.add(
return <RemoteReference>[
for (final ref in refs)
RemoteReference._(
isLocal: ref['local']! as bool,
localId: ref['loid'] as Oid?,
name: ref['name']! as String,
oid: ref['oid']! as Oid,
symRef: ref['symref']! as String,
),
);
}
return result;
)
];
}
/// Downloads new data and updates tips.

View file

@ -22,11 +22,9 @@ class RevParse {
spec: spec,
);
object = Commit(pointers[0].cast<git_commit>());
if (pointers.length == 2) {
reference = Reference(pointers[1].cast<git_reference>());
} else {
reference = null;
}
reference = pointers.length == 2
? Reference(pointers[1].cast<git_reference>())
: null;
}
/// Object found by a revision string.

View file

@ -43,14 +43,12 @@ class Stash extends Equatable {
String? message,
Set<GitStash> flags = const {GitStash.defaults},
}) {
final flagsInt = flags.fold(0, (int acc, e) => acc | e.value);
return Oid(
bindings.save(
repoPointer: repo.pointer,
stasherPointer: stasher.pointer,
message: message,
flags: flagsInt,
flags: flags.fold(0, (int acc, e) => acc | e.value),
),
);
}

View file

@ -208,11 +208,7 @@ class Tag extends Equatable {
/// Tagger (author) of a tag if there is one.
Signature? get tagger {
final sigPointer = bindings.tagger(_tagPointer);
if (sigPointer != nullptr) {
return Signature(sigPointer);
} else {
return null;
}
return sigPointer != nullptr ? Signature(sigPointer) : null;
}
/// Releases memory allocated for tag object.

View file

@ -35,19 +35,10 @@ class Tree extends Equatable {
/// List with tree entries of a tree.
List<TreeEntry> get entries {
final entryCount = bindings.entryCount(_treePointer);
final result = <TreeEntry>[];
for (var i = 0; i < entryCount; i++) {
result.add(
TreeEntry(
bindings.getByIndex(
treePointer: _treePointer,
index: i,
),
),
);
}
return result;
return <TreeEntry>[
for (var i = 0; i < entryCount; i++)
TreeEntry(bindings.getByIndex(treePointer: _treePointer, index: i))
];
}
/// Lookups a tree entry in the tree.