Skip to content
Closed
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 10 additions & 14 deletions packages/talker/lib/src/models/talker_data.dart
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,13 @@ class TalkerData {
DateTime? time,
this.pen,
this.key,
}) {
_time = time ?? DateTime.now();
}

late DateTime _time;
}) : time = time ?? DateTime.now();

/// {@template talker_data_message}
/// [String] [message] - message describes what happened
/// {@endtemplate}
final String? message;

final String? key;

/// {@template talker_data_loglevel}
/// [LogLevel] [logLevel] - to control logging output
/// {@endtemplate}
Expand All @@ -42,24 +36,26 @@ class TalkerData {
/// {@endtemplate}
final Error? error;

/// {@template talker_data_title}
/// Title of Talker log
/// {@endtemplate}
String? title;

/// {@template talker_data_stackTrace}
/// StackTrace?] [stackTrace] - stackTrace if [exception] or [error] happened
/// {@endtemplate}
final StackTrace? stackTrace;

/// {@template talker_data_title}
/// Title of Talker log
/// {@endtemplate}
String? title;

/// {@template talker_data_time}
/// Internal time when the log occurred
/// {@endtemplate}
DateTime get time => _time;
final DateTime time;

/// [AnsiPen?] [pen] - sets your own log color for console
AnsiPen? pen;

final String? key;

/// {@template talker_data_generateTextMessage}
/// Internal method that generates
/// a complete message about the event
Expand All @@ -72,7 +68,7 @@ class TalkerData {
/// {@endtemplate}
String generateTextMessage(
{TimeFormat timeFormat = TimeFormat.timeAndSeconds}) {
return '${displayTitleWithTime(timeFormat: timeFormat)}$message$displayStackTrace';
return '${displayTitleWithTime(timeFormat: timeFormat)}$displayMessage$displayException$displayError$displayStackTrace';
Comment on lines 69 to +71
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

suggestion: Missing delimiters between concatenated display segments

Check that each getter adds necessary spacing or newlines, or add explicit delimiters here to prevent segments from merging.

Suggested change
String generateTextMessage(
{TimeFormat timeFormat = TimeFormat.timeAndSeconds}) {
return '${displayTitleWithTime(timeFormat: timeFormat)}$message$displayStackTrace';
return '${displayTitleWithTime(timeFormat: timeFormat)}$displayMessage$displayException$displayError$displayStackTrace';
String generateTextMessage(
{TimeFormat timeFormat = TimeFormat.timeAndSeconds}) {
return '${displayTitleWithTime(timeFormat: timeFormat)}\n'
'${displayMessage ?? ''}${displayMessage != null ? '\n' : ''}'
'${displayException ?? ''}${displayException != null ? '\n' : ''}'
'${displayError ?? ''}${displayError != null ? '\n' : ''}'
'${displayStackTrace ?? ''}';

}
}

Expand Down
19 changes: 6 additions & 13 deletions packages/talker/lib/src/models/talker_error.dart
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,12 @@ class TalkerError extends TalkerData {
String? key,
super.title,
LogLevel? logLevel,
}) : super(message, error: error) {
_key = key ?? TalkerLogType.error.key;
_logLevel = logLevel ?? LogLevel.error;
}

late String _key;
late LogLevel _logLevel;

@override
String get key => _key;

@override
LogLevel? get logLevel => _logLevel;
}) : super(
message,
logLevel: logLevel ?? LogLevel.error,
error: error,
key: key ?? TalkerLogType.error.key,
);

/// {@macro talker_data_generateTextMessage}
@override
Expand Down
21 changes: 7 additions & 14 deletions packages/talker/lib/src/models/talker_exception.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'package:talker/talker.dart';

/// Base implementation of [TalkerData]
/// to handle ONLY [Exceptions]s
/// to handle ONLY [Exception]s
class TalkerException extends TalkerData {
TalkerException(
Exception exception, {
Expand All @@ -10,19 +10,12 @@ class TalkerException extends TalkerData {
String? key,
super.title,
LogLevel? logLevel,
}) : super(message, exception: exception) {
_key = key ?? TalkerLogType.exception.key;
_logLevel = logLevel ?? LogLevel.error;
}

late String _key;
late LogLevel _logLevel;

@override
String get key => _key;

@override
LogLevel? get logLevel => _logLevel;
}) : super(
message,
logLevel: logLevel ?? LogLevel.error,
exception: exception,
key: key ?? TalkerLogType.exception.key,
);

/// {@macro talker_data_generateTextMessage}
@override
Expand Down
2 changes: 1 addition & 1 deletion packages/talker/lib/src/models/talker_log.dart
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ class TalkerLog extends TalkerData {
@override
String generateTextMessage(
{TimeFormat timeFormat = TimeFormat.timeAndSeconds}) {
return '${displayTitleWithTime(timeFormat: timeFormat)}$displayMessage$displayException$displayStackTrace';
return '${displayTitleWithTime(timeFormat: timeFormat)}$displayMessage$displayException$displayError$displayStackTrace';
}
}