Skip to content

Commit 5f18bb6

Browse files
committed
Deal with linter infos
1 parent 68ad242 commit 5f18bb6

File tree

10 files changed

+102
-95
lines changed

10 files changed

+102
-95
lines changed

example/main.dart

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,20 @@ var loggerNoStack = Logger(
1111

1212
void main() {
1313
print(
14-
"Run with either `dart example/lib/main.dart` or `dart --enable-asserts example/lib/main.dart`.");
14+
'Run with either `dart example/lib/main.dart` or `dart --enable-asserts example/lib/main.dart`.');
1515
demo();
1616
}
1717

1818
void demo() {
19-
logger.d("Log message with 2 methods");
19+
logger.d('Log message with 2 methods');
2020

21-
loggerNoStack.i("Info message");
21+
loggerNoStack.i('Info message');
2222

23-
loggerNoStack.w("Just a warning!");
23+
loggerNoStack.w('Just a warning!');
2424

25-
logger.e("Error! Something bad happened", "Test Error");
25+
logger.e('Error! Something bad happened', 'Test Error');
2626

27-
loggerNoStack.v({"key": 5, "value": "something"});
27+
loggerNoStack.v({'key': 5, 'value': 'something'});
2828

29-
Logger(printer: SimplePrinter()..useColor = true).v("boom");
29+
Logger(printer: SimplePrinter()..useColor = true).v('boom');
3030
}

lib/src/ansi_color.dart

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ class AnsiColor {
33
static const ansiEsc = '\x1B[';
44

55
/// Reset all colors and options for current SGRs to terminal defaults.
6-
static const ansiDefault = "${ansiEsc}0m";
6+
static const ansiDefault = '${ansiEsc}0m';
77

88
final int fg;
99
final int bg;
@@ -22,19 +22,20 @@ class AnsiColor {
2222
: fg = null,
2323
color = true;
2424

25+
@override
2526
String toString() {
2627
if (fg != null) {
27-
return "${ansiEsc}38;5;${fg}m";
28+
return '${ansiEsc}38;5;${fg}m';
2829
} else if (bg != null) {
29-
return "${ansiEsc}48;5;${bg}m";
30+
return '${ansiEsc}48;5;${bg}m';
3031
} else {
31-
return "";
32+
return '';
3233
}
3334
}
3435

3536
String call(String msg) {
3637
if (color) {
37-
return "${this}$msg$ansiDefault";
38+
return '${this}$msg$ansiDefault';
3839
} else {
3940
return msg;
4041
}
@@ -45,10 +46,10 @@ class AnsiColor {
4546
AnsiColor toBg() => AnsiColor.bg(fg);
4647

4748
/// Defaults the terminal's foreground color without altering the background.
48-
String get resetForeground => color ? "${ansiEsc}39m" : "";
49+
String get resetForeground => color ? '${ansiEsc}39m' : '';
4950

5051
/// Defaults the terminal's background color without altering the foreground.
51-
String get resetBackground => color ? "${ansiEsc}49m" : "";
52+
String get resetBackground => color ? '${ansiEsc}49m' : '';
5253

5354
static int grey(double level) => 232 + (level.clamp(0.0, 1.0) * 23).round();
5455
}

lib/src/logger.dart

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ class OutputEvent {
3333
OutputEvent(this.level, this.lines);
3434
}
3535

36-
@Deprecated("Use a custom LogFilter instead")
36+
@Deprecated('Use a custom LogFilter instead')
3737
typedef LogCallback = void Function(LogEvent event);
3838

39-
@Deprecated("Use a custom LogOutput instead")
39+
@Deprecated('Use a custom LogOutput instead')
4040
typedef OutputCallback = void Function(OutputEvent event);
4141

4242
/// Use instances of logger to send log messages to the [LogPrinter].
@@ -109,11 +109,11 @@ class Logger {
109109
void log(Level level, dynamic message,
110110
[dynamic error, StackTrace stackTrace]) {
111111
if (!_active) {
112-
throw ArgumentError("Logger has already been closed.");
112+
throw ArgumentError('Logger has already been closed.');
113113
} else if (error != null && error is StackTrace) {
114-
throw ArgumentError("Error parameter cannot take a StackTrace!");
114+
throw ArgumentError('Error parameter cannot take a StackTrace!');
115115
} else if (level == Level.nothing) {
116-
throw ArgumentError("Log events cannot have Level.nothing");
116+
throw ArgumentError('Log events cannot have Level.nothing');
117117
}
118118
var logEvent = LogEvent(level, message, error, stackTrace);
119119
if (_filter.shouldLog(logEvent)) {
@@ -143,29 +143,29 @@ class Logger {
143143
}
144144

145145
/// Register a [LogCallback] which is called for each new [LogEvent].
146-
@Deprecated("Use a custom LogFilter instead")
146+
@Deprecated('Use a custom LogFilter instead')
147147
static void addLogListener(LogCallback callback) {
148148
_logCallbacks.add(callback);
149149
}
150150

151151
/// Removes a [LogCallback] which was previously registered.
152152
///
153153
/// Returns wheter the callback was successfully removed.
154-
@Deprecated("Use a custom LogFilter instead")
154+
@Deprecated('Use a custom LogFilter instead')
155155
static bool removeLogListener(LogCallback callback) {
156156
return _logCallbacks.remove(callback);
157157
}
158158

159159
/// Register an [OutputCallback] which is called for each new [OutputEvent].
160-
@Deprecated("Use a custom LogOutput instead")
160+
@Deprecated('Use a custom LogOutput instead')
161161
static void addOutputListener(OutputCallback callback) {
162162
_outputCallbacks.add(callback);
163163
}
164164

165165
/// Removes a [OutputCallback] which was previously registered.
166166
///
167167
/// Returns wheter the callback was successfully removed.
168-
@Deprecated("Use a custom LogOutput instead")
168+
@Deprecated('Use a custom LogOutput instead')
169169
static void removeOutputListener(OutputCallback callback) {
170170
_outputCallbacks.remove(callback);
171171
}

lib/src/printers/logfmt_printer.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class LogfmtPrinter extends LogPrinter {
1717

1818
@override
1919
List<String> log(LogEvent event) {
20-
var output = StringBuffer("level=${levelPrefixes[event.level]}");
20+
var output = StringBuffer('level=${levelPrefixes[event.level]}');
2121
if (event.message is String) {
2222
output.write(' msg="${event.message}"');
2323
} else if (event.message is Map) {

lib/src/printers/pretty_printer.dart

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ class PrettyPrinter extends LogPrinter {
2121
static const bottomLeftCorner = '└';
2222
static const middleCorner = '├';
2323
static const verticalLine = '│';
24-
static const doubleDivider = "─";
25-
static const singleDivider = "┄";
24+
static const doubleDivider = '─';
25+
static const singleDivider = '┄';
2626

2727
static final levelColors = {
2828
Level.verbose: AnsiColor.fg(AnsiColor.grey(0.5)),
@@ -69,14 +69,14 @@ class PrettyPrinter extends LogPrinter {
6969

7070
var doubleDividerLine = StringBuffer();
7171
var singleDividerLine = StringBuffer();
72-
for (int i = 0; i < lineLength - 1; i++) {
72+
for (var i = 0; i < lineLength - 1; i++) {
7373
doubleDividerLine.write(doubleDivider);
7474
singleDividerLine.write(singleDivider);
7575
}
7676

77-
_topBorder = "$topLeftCorner$doubleDividerLine";
78-
_middleBorder = "$middleCorner$singleDividerLine";
79-
_bottomBorder = "$bottomLeftCorner$doubleDividerLine";
77+
_topBorder = '$topLeftCorner$doubleDividerLine';
78+
_middleBorder = '$middleCorner$singleDividerLine';
79+
_bottomBorder = '$bottomLeftCorner$doubleDividerLine';
8080
}
8181

8282
@override
@@ -109,7 +109,7 @@ class PrettyPrinter extends LogPrinter {
109109
}
110110

111111
String formatStackTrace(StackTrace stackTrace, int methodCount) {
112-
var lines = stackTrace.toString().split("\n");
112+
var lines = stackTrace.toString().split('\n');
113113

114114
var formatted = <String>[];
115115
var count = 0;
@@ -119,7 +119,7 @@ class PrettyPrinter extends LogPrinter {
119119
if (match.group(2).startsWith('package:logger')) {
120120
continue;
121121
}
122-
var newLine = "#$count ${match.group(1)} (${match.group(2)})";
122+
var newLine = '#$count ${match.group(1)} (${match.group(2)})';
123123
formatted.add(newLine.replaceAll('<anonymous closure>', '()'));
124124
if (++count == methodCount) {
125125
break;
@@ -138,23 +138,23 @@ class PrettyPrinter extends LogPrinter {
138138

139139
String getTime() {
140140
String _threeDigits(int n) {
141-
if (n >= 100) return "$n";
142-
if (n >= 10) return "0$n";
143-
return "00$n";
141+
if (n >= 100) return '$n';
142+
if (n >= 10) return '0$n';
143+
return '00$n';
144144
}
145145

146146
String _twoDigits(int n) {
147-
if (n >= 10) return "$n";
148-
return "0$n";
147+
if (n >= 10) return '$n';
148+
return '0$n';
149149
}
150150

151151
var now = DateTime.now();
152-
String h = _twoDigits(now.hour);
153-
String min = _twoDigits(now.minute);
154-
String sec = _twoDigits(now.second);
155-
String ms = _threeDigits(now.millisecond);
152+
var h = _twoDigits(now.hour);
153+
var min = _twoDigits(now.minute);
154+
var sec = _twoDigits(now.second);
155+
var ms = _threeDigits(now.millisecond);
156156
var timeSinceStart = now.difference(_startTime).toString();
157-
return "$h:$min:$sec.$ms (+$timeSinceStart)";
157+
return '$h:$min:$sec.$ms (+$timeSinceStart)';
158158
}
159159

160160
String stringifyMessage(dynamic message) {
@@ -190,7 +190,7 @@ class PrettyPrinter extends LogPrinter {
190190
if (printEmojis) {
191191
return levelEmojis[level];
192192
} else {
193-
return "";
193+
return '';
194194
}
195195
}
196196

@@ -201,6 +201,8 @@ class PrettyPrinter extends LogPrinter {
201201
String error,
202202
String stacktrace,
203203
) {
204+
// This code is non trivial and a type annotation here helps understanding.
205+
// ignore: omit_local_variable_types
204206
List<String> buffer = [];
205207
var color = _getLevelColor(level);
206208
buffer.add(color(_topBorder));

lib/src/printers/simple_printer.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ class SimplePrinter extends LogPrinter {
4343
@override
4444
List<String> log(LogEvent event) {
4545
var messageStr = _stringifyMessage(event.message);
46-
var errorStr = event.error != null ? " ERROR: ${event.error}" : "";
47-
var timeStr = printTime ? "TIME: ${DateTime.now().toIso8601String()}" : "";
48-
return ["${_labelFor(event.level)} $timeStr $messageStr$errorStr"];
46+
var errorStr = event.error != null ? ' ERROR: ${event.error}' : '';
47+
var timeStr = printTime ? 'TIME: ${DateTime.now().toIso8601String()}' : '';
48+
return ['${_labelFor(event.level)} $timeStr $messageStr$errorStr'];
4949
}
5050

5151
String _labelFor(Level level) {

0 commit comments

Comments
 (0)