From 5bab9188608b60d0237021365268e05128d2b720 Mon Sep 17 00:00:00 2001 From: Till Friebe Date: Thu, 8 Apr 2021 20:47:14 +0200 Subject: [PATCH] Prefer interpolation to compose strings Using interpolation when composing strings and values is usually easier to write and read than concatenation. --- analysis_options.yaml | 1 + lib/models/documents/nodes/line.dart | 2 +- lib/utils/color.dart | 2 +- lib/utils/diff_delta.dart | 6 +----- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/analysis_options.yaml b/analysis_options.yaml index 22b167da..df405fed 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -26,6 +26,7 @@ linter: - prefer_final_locals - prefer_initializing_formals - prefer_int_literals + - prefer_interpolation_to_compose_strings - prefer_relative_imports - prefer_single_quotes - unnecessary_parenthesis diff --git a/lib/models/documents/nodes/line.dart b/lib/models/documents/nodes/line.dart index 08ec39ee..f3473ac9 100644 --- a/lib/models/documents/nodes/line.dart +++ b/lib/models/documents/nodes/line.dart @@ -55,7 +55,7 @@ class Line extends Container { } @override - String toPlainText() => super.toPlainText() + '\n'; + String toPlainText() => '${super.toPlainText()}\n'; @override String toString() { diff --git a/lib/utils/color.dart b/lib/utils/color.dart index f4c26040..93b6e12b 100644 --- a/lib/utils/color.dart +++ b/lib/utils/color.dart @@ -119,7 +119,7 @@ Color stringToColor(String? s) { } var hex = s.replaceFirst('#', ''); - hex = hex.length == 6 ? 'ff' + hex : hex; + hex = hex.length == 6 ? 'ff$hex' : hex; final val = int.parse(hex, radix: 16); return Color(val); } diff --git a/lib/utils/diff_delta.dart b/lib/utils/diff_delta.dart index a3653eb0..1e6d913e 100644 --- a/lib/utils/diff_delta.dart +++ b/lib/utils/diff_delta.dart @@ -79,11 +79,7 @@ int getPositionDelta(Delta user, Delta actual) { final userOperation = userItr.next(length as int); final actualOperation = actualItr.next(length); if (userOperation.length != actualOperation.length) { - throw 'userOp ' + - userOperation.length.toString() + - ' does not match ' + - ' actualOp ' + - actualOperation.length.toString(); + throw 'userOp ${userOperation.length} does not match actualOp ${actualOperation.length}'; } if (userOperation.key == actualOperation.key) { continue;