diff --git a/pkg/dap/analysis_options.yaml b/pkg/dap/analysis_options.yaml index 1a609023d62..572dd239d09 100644 --- a/pkg/dap/analysis_options.yaml +++ b/pkg/dap/analysis_options.yaml @@ -1,7 +1 @@ include: package:lints/recommended.yaml - -analyzer: - errors: - # TODO: We need to address existing instances in - # lib/src/protocol_generated.dart (#53600). - use_super_parameters: ignore diff --git a/pkg/dap/lib/src/protocol_generated.dart b/pkg/dap/lib/src/protocol_generated.dart index 58b637d0eb0..15a91e3e8e3 100644 --- a/pkg/dap/lib/src/protocol_generated.dart +++ b/pkg/dap/lib/src/protocol_generated.dart @@ -46,22 +46,15 @@ class AttachResponse extends Response { AttachResponse.fromMap(obj); AttachResponse({ - Object? body, - required String command, - String? message, - required int requestSeq, - required int seq, - required bool success, - }) : super( - seq: seq, - requestSeq: requestSeq, - success: success, - command: command, - message: message, - body: body, - ); + super.body, + required super.command, + super.message, + required super.requestSeq, + required super.seq, + required super.success, + }); - AttachResponse.fromMap(Map obj) : super.fromMap(obj); + AttachResponse.fromMap(super.obj) : super.fromMap(); static bool canParse(Object? obj) { if (obj is! Map) { @@ -348,23 +341,15 @@ class BreakpointLocationsResponse extends Response { BreakpointLocationsResponse.fromMap(obj); BreakpointLocationsResponse({ - required Map body, - required String command, - String? message, - required int requestSeq, - required int seq, - required bool success, - }) : super( - seq: seq, - requestSeq: requestSeq, - success: success, - command: command, - message: message, - body: body, - ); + required super.body, + required super.command, + super.message, + required super.requestSeq, + required super.seq, + required super.success, + }); - BreakpointLocationsResponse.fromMap(Map obj) - : super.fromMap(obj); + BreakpointLocationsResponse.fromMap(super.obj) : super.fromMap(); static bool canParse(Object? obj) { if (obj is! Map) { @@ -432,22 +417,15 @@ class CancelResponse extends Response { CancelResponse.fromMap(obj); CancelResponse({ - Object? body, - required String command, - String? message, - required int requestSeq, - required int seq, - required bool success, - }) : super( - seq: seq, - requestSeq: requestSeq, - success: success, - command: command, - message: message, - body: body, - ); + super.body, + required super.command, + super.message, + required super.requestSeq, + required super.seq, + required super.success, + }); - CancelResponse.fromMap(Map obj) : super.fromMap(obj); + CancelResponse.fromMap(super.obj) : super.fromMap(); static bool canParse(Object? obj) { if (obj is! Map) { @@ -1234,22 +1212,15 @@ class CompletionsResponse extends Response { CompletionsResponse.fromMap(obj); CompletionsResponse({ - required Map body, - required String command, - String? message, - required int requestSeq, - required int seq, - required bool success, - }) : super( - seq: seq, - requestSeq: requestSeq, - success: success, - command: command, - message: message, - body: body, - ); + required super.body, + required super.command, + super.message, + required super.requestSeq, + required super.seq, + required super.success, + }); - CompletionsResponse.fromMap(Map obj) : super.fromMap(obj); + CompletionsResponse.fromMap(super.obj) : super.fromMap(); static bool canParse(Object? obj) { if (obj is! Map) { @@ -1293,23 +1264,15 @@ class ConfigurationDoneResponse extends Response { ConfigurationDoneResponse.fromMap(obj); ConfigurationDoneResponse({ - Object? body, - required String command, - String? message, - required int requestSeq, - required int seq, - required bool success, - }) : super( - seq: seq, - requestSeq: requestSeq, - success: success, - command: command, - message: message, - body: body, - ); + super.body, + required super.command, + super.message, + required super.requestSeq, + required super.seq, + required super.success, + }); - ConfigurationDoneResponse.fromMap(Map obj) - : super.fromMap(obj); + ConfigurationDoneResponse.fromMap(super.obj) : super.fromMap(); static bool canParse(Object? obj) { if (obj is! Map) { @@ -1372,22 +1335,15 @@ class ContinueResponse extends Response { ContinueResponse.fromMap(obj); ContinueResponse({ - required Map body, - required String command, - String? message, - required int requestSeq, - required int seq, - required bool success, - }) : super( - seq: seq, - requestSeq: requestSeq, - success: success, - command: command, - message: message, - body: body, - ); + required super.body, + required super.command, + super.message, + required super.requestSeq, + required super.seq, + required super.success, + }); - ContinueResponse.fromMap(Map obj) : super.fromMap(obj); + ContinueResponse.fromMap(super.obj) : super.fromMap(); static bool canParse(Object? obj) { if (obj is! Map) { @@ -1529,23 +1485,15 @@ class DataBreakpointInfoResponse extends Response { DataBreakpointInfoResponse.fromMap(obj); DataBreakpointInfoResponse({ - required Map body, - required String command, - String? message, - required int requestSeq, - required int seq, - required bool success, - }) : super( - seq: seq, - requestSeq: requestSeq, - success: success, - command: command, - message: message, - body: body, - ); + required super.body, + required super.command, + super.message, + required super.requestSeq, + required super.seq, + required super.success, + }); - DataBreakpointInfoResponse.fromMap(Map obj) - : super.fromMap(obj); + DataBreakpointInfoResponse.fromMap(super.obj) : super.fromMap(); static bool canParse(Object? obj) { if (obj is! Map) { @@ -1643,22 +1591,15 @@ class DisassembleResponse extends Response { DisassembleResponse.fromMap(obj); DisassembleResponse({ - Map? body, - required String command, - String? message, - required int requestSeq, - required int seq, - required bool success, - }) : super( - seq: seq, - requestSeq: requestSeq, - success: success, - command: command, - message: message, - body: body, - ); + super.body, + required super.command, + super.message, + required super.requestSeq, + required super.seq, + required super.success, + }); - DisassembleResponse.fromMap(Map obj) : super.fromMap(obj); + DisassembleResponse.fromMap(super.obj) : super.fromMap(); static bool canParse(Object? obj) { if (obj is! Map) { @@ -1853,22 +1794,15 @@ class DisconnectResponse extends Response { DisconnectResponse.fromMap(obj); DisconnectResponse({ - Object? body, - required String command, - String? message, - required int requestSeq, - required int seq, - required bool success, - }) : super( - seq: seq, - requestSeq: requestSeq, - success: success, - command: command, - message: message, - body: body, - ); + super.body, + required super.command, + super.message, + required super.requestSeq, + required super.seq, + required super.success, + }); - DisconnectResponse.fromMap(Map obj) : super.fromMap(obj); + DisconnectResponse.fromMap(super.obj) : super.fromMap(); static bool canParse(Object? obj) { if (obj is! Map) { @@ -1889,22 +1823,15 @@ class ErrorResponse extends Response { ErrorResponse.fromMap(obj); ErrorResponse({ - required Map body, - required String command, - String? message, - required int requestSeq, - required int seq, - required bool success, - }) : super( - seq: seq, - requestSeq: requestSeq, - success: success, - command: command, - message: message, - body: body, - ); + required super.body, + required super.command, + super.message, + required super.requestSeq, + required super.seq, + required super.success, + }); - ErrorResponse.fromMap(Map obj) : super.fromMap(obj); + ErrorResponse.fromMap(super.obj) : super.fromMap(); static bool canParse(Object? obj) { if (obj is! Map) { @@ -1990,22 +1917,15 @@ class EvaluateResponse extends Response { EvaluateResponse.fromMap(obj); EvaluateResponse({ - required Map body, - required String command, - String? message, - required int requestSeq, - required int seq, - required bool success, - }) : super( - seq: seq, - requestSeq: requestSeq, - success: success, - command: command, - message: message, - body: body, - ); + required super.body, + required super.command, + super.message, + required super.requestSeq, + required super.seq, + required super.success, + }); - EvaluateResponse.fromMap(Map obj) : super.fromMap(obj); + EvaluateResponse.fromMap(super.obj) : super.fromMap(); static bool canParse(Object? obj) { if (obj is! Map) { @@ -2036,16 +1956,15 @@ class Event extends ProtocolMessage { Event({ this.body, required this.event, - required int seq, + required super.seq, }) : super( - seq: seq, type: 'event', ); - Event.fromMap(Map obj) + Event.fromMap(super.obj) : body = obj['body'], event = obj['event'] as String, - super.fromMap(obj); + super.fromMap(); static bool canParse(Object? obj) { if (obj is! Map) { @@ -2318,22 +2237,15 @@ class ExceptionInfoResponse extends Response { ExceptionInfoResponse.fromMap(obj); ExceptionInfoResponse({ - required Map body, - required String command, - String? message, - required int requestSeq, - required int seq, - required bool success, - }) : super( - seq: seq, - requestSeq: requestSeq, - success: success, - command: command, - message: message, - body: body, - ); + required super.body, + required super.command, + super.message, + required super.requestSeq, + required super.seq, + required super.success, + }); - ExceptionInfoResponse.fromMap(Map obj) : super.fromMap(obj); + ExceptionInfoResponse.fromMap(super.obj) : super.fromMap(); static bool canParse(Object? obj) { if (obj is! Map) { @@ -2542,22 +2454,15 @@ class GotoResponse extends Response { GotoResponse.fromMap(obj); GotoResponse({ - Object? body, - required String command, - String? message, - required int requestSeq, - required int seq, - required bool success, - }) : super( - seq: seq, - requestSeq: requestSeq, - success: success, - command: command, - message: message, - body: body, - ); + super.body, + required super.command, + super.message, + required super.requestSeq, + required super.seq, + required super.success, + }); - GotoResponse.fromMap(Map obj) : super.fromMap(obj); + GotoResponse.fromMap(super.obj) : super.fromMap(); static bool canParse(Object? obj) { if (obj is! Map) { @@ -2717,22 +2622,15 @@ class GotoTargetsResponse extends Response { GotoTargetsResponse.fromMap(obj); GotoTargetsResponse({ - required Map body, - required String command, - String? message, - required int requestSeq, - required int seq, - required bool success, - }) : super( - seq: seq, - requestSeq: requestSeq, - success: success, - command: command, - message: message, - body: body, - ); + required super.body, + required super.command, + super.message, + required super.requestSeq, + required super.seq, + required super.success, + }); - GotoTargetsResponse.fromMap(Map obj) : super.fromMap(obj); + GotoTargetsResponse.fromMap(super.obj) : super.fromMap(); static bool canParse(Object? obj) { if (obj is! Map) { @@ -2936,22 +2834,15 @@ class InitializeResponse extends Response { InitializeResponse.fromMap(obj); InitializeResponse({ - Capabilities? body, - required String command, - String? message, - required int requestSeq, - required int seq, - required bool success, - }) : super( - seq: seq, - requestSeq: requestSeq, - success: success, - command: command, - message: message, - body: body, - ); + super.body, + required super.command, + super.message, + required super.requestSeq, + required super.seq, + required super.success, + }); - InitializeResponse.fromMap(Map obj) : super.fromMap(obj); + InitializeResponse.fromMap(super.obj) : super.fromMap(); static bool canParse(Object? obj) { if (obj is! Map) { @@ -3085,22 +2976,15 @@ class LaunchResponse extends Response { LaunchResponse.fromMap(obj); LaunchResponse({ - Object? body, - required String command, - String? message, - required int requestSeq, - required int seq, - required bool success, - }) : super( - seq: seq, - requestSeq: requestSeq, - success: success, - command: command, - message: message, - body: body, - ); + super.body, + required super.command, + super.message, + required super.requestSeq, + required super.seq, + required super.success, + }); - LaunchResponse.fromMap(Map obj) : super.fromMap(obj); + LaunchResponse.fromMap(super.obj) : super.fromMap(); static bool canParse(Object? obj) { if (obj is! Map) { @@ -3140,22 +3024,15 @@ class LoadedSourcesResponse extends Response { LoadedSourcesResponse.fromMap(obj); LoadedSourcesResponse({ - required Map body, - required String command, - String? message, - required int requestSeq, - required int seq, - required bool success, - }) : super( - seq: seq, - requestSeq: requestSeq, - success: success, - command: command, - message: message, - body: body, - ); + required super.body, + required super.command, + super.message, + required super.requestSeq, + required super.seq, + required super.success, + }); - LoadedSourcesResponse.fromMap(Map obj) : super.fromMap(obj); + LoadedSourcesResponse.fromMap(super.obj) : super.fromMap(); static bool canParse(Object? obj) { if (obj is! Map) { @@ -3438,22 +3315,15 @@ class ModulesResponse extends Response { ModulesResponse.fromMap(obj); ModulesResponse({ - required Map body, - required String command, - String? message, - required int requestSeq, - required int seq, - required bool success, - }) : super( - seq: seq, - requestSeq: requestSeq, - success: success, - command: command, - message: message, - body: body, - ); + required super.body, + required super.command, + super.message, + required super.requestSeq, + required super.seq, + required super.success, + }); - ModulesResponse.fromMap(Map obj) : super.fromMap(obj); + ModulesResponse.fromMap(super.obj) : super.fromMap(); static bool canParse(Object? obj) { if (obj is! Map) { @@ -3528,22 +3398,15 @@ class NextResponse extends Response { NextResponse.fromMap(obj); NextResponse({ - Object? body, - required String command, - String? message, - required int requestSeq, - required int seq, - required bool success, - }) : super( - seq: seq, - requestSeq: requestSeq, - success: success, - command: command, - message: message, - body: body, - ); + super.body, + required super.command, + super.message, + required super.requestSeq, + required super.seq, + required super.success, + }); - NextResponse.fromMap(Map obj) : super.fromMap(obj); + NextResponse.fromMap(super.obj) : super.fromMap(); static bool canParse(Object? obj) { if (obj is! Map) { @@ -3595,22 +3458,15 @@ class PauseResponse extends Response { PauseResponse.fromMap(obj); PauseResponse({ - Object? body, - required String command, - String? message, - required int requestSeq, - required int seq, - required bool success, - }) : super( - seq: seq, - requestSeq: requestSeq, - success: success, - command: command, - message: message, - body: body, - ); + super.body, + required super.command, + super.message, + required super.requestSeq, + required super.seq, + required super.success, + }); - PauseResponse.fromMap(Map obj) : super.fromMap(obj); + PauseResponse.fromMap(super.obj) : super.fromMap(); static bool canParse(Object? obj) { if (obj is! Map) { @@ -3725,22 +3581,15 @@ class ReadMemoryResponse extends Response { ReadMemoryResponse.fromMap(obj); ReadMemoryResponse({ - Map? body, - required String command, - String? message, - required int requestSeq, - required int seq, - required bool success, - }) : super( - seq: seq, - requestSeq: requestSeq, - success: success, - command: command, - message: message, - body: body, - ); + super.body, + required super.command, + super.message, + required super.requestSeq, + required super.seq, + required super.success, + }); - ReadMemoryResponse.fromMap(Map obj) : super.fromMap(obj); + ReadMemoryResponse.fromMap(super.obj) : super.fromMap(); static bool canParse(Object? obj) { if (obj is! Map) { @@ -3771,16 +3620,15 @@ class Request extends ProtocolMessage { Request({ this.arguments, required this.command, - required int seq, + required super.seq, }) : super( - seq: seq, type: 'request', ); - Request.fromMap(Map obj) + Request.fromMap(super.obj) : arguments = obj['arguments'], command = obj['command'] as String, - super.fromMap(obj); + super.fromMap(); static bool canParse(Object? obj) { if (obj is! Map) { @@ -3837,19 +3685,18 @@ class Response extends ProtocolMessage { this.message, required this.requestSeq, required this.success, - required int seq, + required super.seq, }) : super( - seq: seq, type: 'response', ); - Response.fromMap(Map obj) + Response.fromMap(super.obj) : body = obj['body'], command = obj['command'] as String, message = obj['message'] as String?, requestSeq = obj['request_seq'] as int, success = obj['success'] as bool, - super.fromMap(obj); + super.fromMap(); static bool canParse(Object? obj) { if (obj is! Map) { @@ -3963,22 +3810,15 @@ class RestartFrameResponse extends Response { RestartFrameResponse.fromMap(obj); RestartFrameResponse({ - Object? body, - required String command, - String? message, - required int requestSeq, - required int seq, - required bool success, - }) : super( - seq: seq, - requestSeq: requestSeq, - success: success, - command: command, - message: message, - body: body, - ); + super.body, + required super.command, + super.message, + required super.requestSeq, + required super.seq, + required super.success, + }); - RestartFrameResponse.fromMap(Map obj) : super.fromMap(obj); + RestartFrameResponse.fromMap(super.obj) : super.fromMap(); static bool canParse(Object? obj) { if (obj is! Map) { @@ -4000,22 +3840,15 @@ class RestartResponse extends Response { RestartResponse.fromMap(obj); RestartResponse({ - Object? body, - required String command, - String? message, - required int requestSeq, - required int seq, - required bool success, - }) : super( - seq: seq, - requestSeq: requestSeq, - success: success, - command: command, - message: message, - body: body, - ); + super.body, + required super.command, + super.message, + required super.requestSeq, + required super.seq, + required super.success, + }); - RestartResponse.fromMap(Map obj) : super.fromMap(obj); + RestartResponse.fromMap(super.obj) : super.fromMap(); static bool canParse(Object? obj) { if (obj is! Map) { @@ -4079,23 +3912,15 @@ class ReverseContinueResponse extends Response { ReverseContinueResponse.fromMap(obj); ReverseContinueResponse({ - Object? body, - required String command, - String? message, - required int requestSeq, - required int seq, - required bool success, - }) : super( - seq: seq, - requestSeq: requestSeq, - success: success, - command: command, - message: message, - body: body, - ); + super.body, + required super.command, + super.message, + required super.requestSeq, + required super.seq, + required super.success, + }); - ReverseContinueResponse.fromMap(Map obj) - : super.fromMap(obj); + ReverseContinueResponse.fromMap(super.obj) : super.fromMap(); static bool canParse(Object? obj) { if (obj is! Map) { @@ -4202,22 +4027,15 @@ class RunInTerminalResponse extends Response { RunInTerminalResponse.fromMap(obj); RunInTerminalResponse({ - required Map body, - required String command, - String? message, - required int requestSeq, - required int seq, - required bool success, - }) : super( - seq: seq, - requestSeq: requestSeq, - success: success, - command: command, - message: message, - body: body, - ); + required super.body, + required super.command, + super.message, + required super.requestSeq, + required super.seq, + required super.success, + }); - RunInTerminalResponse.fromMap(Map obj) : super.fromMap(obj); + RunInTerminalResponse.fromMap(super.obj) : super.fromMap(); static bool canParse(Object? obj) { if (obj is! Map) { @@ -4409,22 +4227,15 @@ class ScopesResponse extends Response { ScopesResponse.fromMap(obj); ScopesResponse({ - required Map body, - required String command, - String? message, - required int requestSeq, - required int seq, - required bool success, - }) : super( - seq: seq, - requestSeq: requestSeq, - success: success, - command: command, - message: message, - body: body, - ); + required super.body, + required super.command, + super.message, + required super.requestSeq, + required super.seq, + required super.success, + }); - ScopesResponse.fromMap(Map obj) : super.fromMap(obj); + ScopesResponse.fromMap(super.obj) : super.fromMap(); static bool canParse(Object? obj) { if (obj is! Map) { @@ -4517,22 +4328,15 @@ class SetBreakpointsResponse extends Response { SetBreakpointsResponse.fromMap(obj); SetBreakpointsResponse({ - required Map body, - required String command, - String? message, - required int requestSeq, - required int seq, - required bool success, - }) : super( - seq: seq, - requestSeq: requestSeq, - success: success, - command: command, - message: message, - body: body, - ); + required super.body, + required super.command, + super.message, + required super.requestSeq, + required super.seq, + required super.success, + }); - SetBreakpointsResponse.fromMap(Map obj) : super.fromMap(obj); + SetBreakpointsResponse.fromMap(super.obj) : super.fromMap(); static bool canParse(Object? obj) { if (obj is! Map) { @@ -4592,23 +4396,15 @@ class SetDataBreakpointsResponse extends Response { SetDataBreakpointsResponse.fromMap(obj); SetDataBreakpointsResponse({ - required Map body, - required String command, - String? message, - required int requestSeq, - required int seq, - required bool success, - }) : super( - seq: seq, - requestSeq: requestSeq, - success: success, - command: command, - message: message, - body: body, - ); + required super.body, + required super.command, + super.message, + required super.requestSeq, + required super.seq, + required super.success, + }); - SetDataBreakpointsResponse.fromMap(Map obj) - : super.fromMap(obj); + SetDataBreakpointsResponse.fromMap(super.obj) : super.fromMap(); static bool canParse(Object? obj) { if (obj is! Map) { @@ -4715,23 +4511,15 @@ class SetExceptionBreakpointsResponse extends Response { SetExceptionBreakpointsResponse.fromMap(obj); SetExceptionBreakpointsResponse({ - Map? body, - required String command, - String? message, - required int requestSeq, - required int seq, - required bool success, - }) : super( - seq: seq, - requestSeq: requestSeq, - success: success, - command: command, - message: message, - body: body, - ); + super.body, + required super.command, + super.message, + required super.requestSeq, + required super.seq, + required super.success, + }); - SetExceptionBreakpointsResponse.fromMap(Map obj) - : super.fromMap(obj); + SetExceptionBreakpointsResponse.fromMap(super.obj) : super.fromMap(); static bool canParse(Object? obj) { if (obj is! Map) { @@ -4815,22 +4603,15 @@ class SetExpressionResponse extends Response { SetExpressionResponse.fromMap(obj); SetExpressionResponse({ - required Map body, - required String command, - String? message, - required int requestSeq, - required int seq, - required bool success, - }) : super( - seq: seq, - requestSeq: requestSeq, - success: success, - command: command, - message: message, - body: body, - ); + required super.body, + required super.command, + super.message, + required super.requestSeq, + required super.seq, + required super.success, + }); - SetExpressionResponse.fromMap(Map obj) : super.fromMap(obj); + SetExpressionResponse.fromMap(super.obj) : super.fromMap(); static bool canParse(Object? obj) { if (obj is! Map) { @@ -4890,23 +4671,15 @@ class SetFunctionBreakpointsResponse extends Response { SetFunctionBreakpointsResponse.fromMap(obj); SetFunctionBreakpointsResponse({ - required Map body, - required String command, - String? message, - required int requestSeq, - required int seq, - required bool success, - }) : super( - seq: seq, - requestSeq: requestSeq, - success: success, - command: command, - message: message, - body: body, - ); + required super.body, + required super.command, + super.message, + required super.requestSeq, + required super.seq, + required super.success, + }); - SetFunctionBreakpointsResponse.fromMap(Map obj) - : super.fromMap(obj); + SetFunctionBreakpointsResponse.fromMap(super.obj) : super.fromMap(); static bool canParse(Object? obj) { if (obj is! Map) { @@ -4966,23 +4739,15 @@ class SetInstructionBreakpointsResponse extends Response { SetInstructionBreakpointsResponse.fromMap(obj); SetInstructionBreakpointsResponse({ - required Map body, - required String command, - String? message, - required int requestSeq, - required int seq, - required bool success, - }) : super( - seq: seq, - requestSeq: requestSeq, - success: success, - command: command, - message: message, - body: body, - ); + required super.body, + required super.command, + super.message, + required super.requestSeq, + required super.seq, + required super.success, + }); - SetInstructionBreakpointsResponse.fromMap(Map obj) - : super.fromMap(obj); + SetInstructionBreakpointsResponse.fromMap(super.obj) : super.fromMap(); static bool canParse(Object? obj) { if (obj is! Map) { @@ -5067,22 +4832,15 @@ class SetVariableResponse extends Response { SetVariableResponse.fromMap(obj); SetVariableResponse({ - required Map body, - required String command, - String? message, - required int requestSeq, - required int seq, - required bool success, - }) : super( - seq: seq, - requestSeq: requestSeq, - success: success, - command: command, - message: message, - body: body, - ); + required super.body, + required super.command, + super.message, + required super.requestSeq, + required super.seq, + required super.success, + }); - SetVariableResponse.fromMap(Map obj) : super.fromMap(obj); + SetVariableResponse.fromMap(super.obj) : super.fromMap(); static bool canParse(Object? obj) { if (obj is! Map) { @@ -5345,22 +5103,15 @@ class SourceResponse extends Response { SourceResponse.fromMap(obj); SourceResponse({ - required Map body, - required String command, - String? message, - required int requestSeq, - required int seq, - required bool success, - }) : super( - seq: seq, - requestSeq: requestSeq, - success: success, - command: command, - message: message, - body: body, - ); + required super.body, + required super.command, + super.message, + required super.requestSeq, + required super.seq, + required super.success, + }); - SourceResponse.fromMap(Map obj) : super.fromMap(obj); + SourceResponse.fromMap(super.obj) : super.fromMap(); static bool canParse(Object? obj) { if (obj is! Map) { @@ -5558,12 +5309,10 @@ class StackFrameFormat extends ValueFormat { this.parameterTypes, this.parameterValues, this.parameters, - bool? hex, - }) : super( - hex: hex, - ); + super.hex, + }); - StackFrameFormat.fromMap(Map obj) + StackFrameFormat.fromMap(super.obj) : includeAll = obj['includeAll'] as bool?, line = obj['line'] as bool?, module = obj['module'] as bool?, @@ -5571,7 +5320,7 @@ class StackFrameFormat extends ValueFormat { parameterTypes = obj['parameterTypes'] as bool?, parameterValues = obj['parameterValues'] as bool?, parameters = obj['parameters'] as bool?, - super.fromMap(obj); + super.fromMap(); static bool canParse(Object? obj) { if (obj is! Map) { @@ -5682,22 +5431,15 @@ class StackTraceResponse extends Response { StackTraceResponse.fromMap(obj); StackTraceResponse({ - required Map body, - required String command, - String? message, - required int requestSeq, - required int seq, - required bool success, - }) : super( - seq: seq, - requestSeq: requestSeq, - success: success, - command: command, - message: message, - body: body, - ); + required super.body, + required super.command, + super.message, + required super.requestSeq, + required super.seq, + required super.success, + }); - StackTraceResponse.fromMap(Map obj) : super.fromMap(obj); + StackTraceResponse.fromMap(super.obj) : super.fromMap(); static bool canParse(Object? obj) { if (obj is! Map) { @@ -5765,22 +5507,15 @@ class StartDebuggingResponse extends Response { StartDebuggingResponse.fromMap(obj); StartDebuggingResponse({ - Object? body, - required String command, - String? message, - required int requestSeq, - required int seq, - required bool success, - }) : super( - seq: seq, - requestSeq: requestSeq, - success: success, - command: command, - message: message, - body: body, - ); + super.body, + required super.command, + super.message, + required super.requestSeq, + required super.seq, + required super.success, + }); - StartDebuggingResponse.fromMap(Map obj) : super.fromMap(obj); + StartDebuggingResponse.fromMap(super.obj) : super.fromMap(); static bool canParse(Object? obj) { if (obj is! Map) { @@ -5852,22 +5587,15 @@ class StepBackResponse extends Response { StepBackResponse.fromMap(obj); StepBackResponse({ - Object? body, - required String command, - String? message, - required int requestSeq, - required int seq, - required bool success, - }) : super( - seq: seq, - requestSeq: requestSeq, - success: success, - command: command, - message: message, - body: body, - ); + super.body, + required super.command, + super.message, + required super.requestSeq, + required super.seq, + required super.success, + }); - StepBackResponse.fromMap(Map obj) : super.fromMap(obj); + StepBackResponse.fromMap(super.obj) : super.fromMap(); static bool canParse(Object? obj) { if (obj is! Map) { @@ -5948,22 +5676,15 @@ class StepInResponse extends Response { StepInResponse.fromMap(obj); StepInResponse({ - Object? body, - required String command, - String? message, - required int requestSeq, - required int seq, - required bool success, - }) : super( - seq: seq, - requestSeq: requestSeq, - success: success, - command: command, - message: message, - body: body, - ); + super.body, + required super.command, + super.message, + required super.requestSeq, + required super.seq, + required super.success, + }); - StepInResponse.fromMap(Map obj) : super.fromMap(obj); + StepInResponse.fromMap(super.obj) : super.fromMap(); static bool canParse(Object? obj) { if (obj is! Map) { @@ -6094,22 +5815,15 @@ class StepInTargetsResponse extends Response { StepInTargetsResponse.fromMap(obj); StepInTargetsResponse({ - required Map body, - required String command, - String? message, - required int requestSeq, - required int seq, - required bool success, - }) : super( - seq: seq, - requestSeq: requestSeq, - success: success, - command: command, - message: message, - body: body, - ); + required super.body, + required super.command, + super.message, + required super.requestSeq, + required super.seq, + required super.success, + }); - StepInTargetsResponse.fromMap(Map obj) : super.fromMap(obj); + StepInTargetsResponse.fromMap(super.obj) : super.fromMap(); static bool canParse(Object? obj) { if (obj is! Map) { @@ -6184,22 +5898,15 @@ class StepOutResponse extends Response { StepOutResponse.fromMap(obj); StepOutResponse({ - Object? body, - required String command, - String? message, - required int requestSeq, - required int seq, - required bool success, - }) : super( - seq: seq, - requestSeq: requestSeq, - success: success, - command: command, - message: message, - body: body, - ); + super.body, + required super.command, + super.message, + required super.requestSeq, + required super.seq, + required super.success, + }); - StepOutResponse.fromMap(Map obj) : super.fromMap(obj); + StepOutResponse.fromMap(super.obj) : super.fromMap(); static bool canParse(Object? obj) { if (obj is! Map) { @@ -6256,22 +5963,15 @@ class TerminateResponse extends Response { TerminateResponse.fromMap(obj); TerminateResponse({ - Object? body, - required String command, - String? message, - required int requestSeq, - required int seq, - required bool success, - }) : super( - seq: seq, - requestSeq: requestSeq, - success: success, - command: command, - message: message, - body: body, - ); + super.body, + required super.command, + super.message, + required super.requestSeq, + required super.seq, + required super.success, + }); - TerminateResponse.fromMap(Map obj) : super.fromMap(obj); + TerminateResponse.fromMap(super.obj) : super.fromMap(); static bool canParse(Object? obj) { if (obj is! Map) { @@ -6325,23 +6025,15 @@ class TerminateThreadsResponse extends Response { TerminateThreadsResponse.fromMap(obj); TerminateThreadsResponse({ - Object? body, - required String command, - String? message, - required int requestSeq, - required int seq, - required bool success, - }) : super( - seq: seq, - requestSeq: requestSeq, - success: success, - command: command, - message: message, - body: body, - ); + super.body, + required super.command, + super.message, + required super.requestSeq, + required super.seq, + required super.success, + }); - TerminateThreadsResponse.fromMap(Map obj) - : super.fromMap(obj); + TerminateThreadsResponse.fromMap(super.obj) : super.fromMap(); static bool canParse(Object? obj) { if (obj is! Map) { @@ -6400,22 +6092,15 @@ class ThreadsResponse extends Response { ThreadsResponse.fromMap(obj); ThreadsResponse({ - required Map body, - required String command, - String? message, - required int requestSeq, - required int seq, - required bool success, - }) : super( - seq: seq, - requestSeq: requestSeq, - success: success, - command: command, - message: message, - body: body, - ); + required super.body, + required super.command, + super.message, + required super.requestSeq, + required super.seq, + required super.success, + }); - ThreadsResponse.fromMap(Map obj) : super.fromMap(obj); + ThreadsResponse.fromMap(super.obj) : super.fromMap(); static bool canParse(Object? obj) { if (obj is! Map) { @@ -6754,22 +6439,15 @@ class VariablesResponse extends Response { VariablesResponse.fromMap(obj); VariablesResponse({ - required Map body, - required String command, - String? message, - required int requestSeq, - required int seq, - required bool success, - }) : super( - seq: seq, - requestSeq: requestSeq, - success: success, - command: command, - message: message, - body: body, - ); + required super.body, + required super.command, + super.message, + required super.requestSeq, + required super.seq, + required super.success, + }); - VariablesResponse.fromMap(Map obj) : super.fromMap(obj); + VariablesResponse.fromMap(super.obj) : super.fromMap(); static bool canParse(Object? obj) { if (obj is! Map) { @@ -6857,22 +6535,15 @@ class WriteMemoryResponse extends Response { WriteMemoryResponse.fromMap(obj); WriteMemoryResponse({ - Map? body, - required String command, - String? message, - required int requestSeq, - required int seq, - required bool success, - }) : super( - seq: seq, - requestSeq: requestSeq, - success: success, - command: command, - message: message, - body: body, - ); + super.body, + required super.command, + super.message, + required super.requestSeq, + required super.seq, + required super.success, + }); - WriteMemoryResponse.fromMap(Map obj) : super.fromMap(obj); + WriteMemoryResponse.fromMap(super.obj) : super.fromMap(); static bool canParse(Object? obj) { if (obj is! Map) { diff --git a/pkg/dap/tool/codegen.dart b/pkg/dap/tool/codegen.dart index 001b1b5daab..816a61f6f2b 100644 --- a/pkg/dap/tool/codegen.dart +++ b/pkg/dap/tool/codegen.dart @@ -299,8 +299,7 @@ class CodeGenerator { buffer.writeln('this.$fieldName, '); } - // Properties from the base class are standard arguments that will be - // passed to a super() call. + // Properties from the base class are super-parameters. for (final entry in baseProperties.entries.sortedBy((e) => e.key)) { final propertyName = entry.key; // If this field is defined by the class and the base, prefer the @@ -312,12 +311,11 @@ class CodeGenerator { continue; } final isOptional = !type.requiresField(propertyName); - final dartType = propertyType.asDartType(isOptional: isOptional); buffer.writeIndented(''); if (!isOptional) { buffer.write('required '); } - buffer.writeln('$dartType $fieldName, '); + buffer.writeln('super.$fieldName, '); } buffer ..outdent() @@ -325,32 +323,29 @@ class CodeGenerator { } buffer.write(')'); + // We might still need an explicit super() call if we have literal values + // to pass through. if (baseType != null) { - buffer.write(': super('); - if (baseProperties.isNotEmpty) { + final requiredExplicitSuperArgs = baseProperties.entries + .map((entry) => + MapEntry(entry.key, classProperties[entry.key]?.literalValue)) + .where((entry) => entry.value != null) + .toList(); + if (requiredExplicitSuperArgs.isNotEmpty) { buffer + ..write(': super(') ..writeln() ..indent(); - for (final entry in baseProperties.entries) { - final propertyName = entry.key; - // Skip any properties that have literal values defined by the base - // as we won't need to supply them. - if (entry.value.literalValue != null) { - continue; - } - // If this field is defined by the class and the base, prefer the - // class one as it may contain things like the literal values. - final propertyType = classProperties[propertyName] ?? entry.value; - final fieldName = _dartSafeName(propertyName); - final literalValue = propertyType.literalValue; - final value = literalValue != null ? "'$literalValue'" : fieldName; - buffer.writeIndentedln('$fieldName: $value, '); + for (final entry in requiredExplicitSuperArgs) { + final name = entry.key; + final value = entry.value; + buffer.writeIndentedln('$name: \'$value\', '); } buffer ..outdent() - ..writeIndented(''); + ..writeIndented('') + ..write(')'); } - buffer.write(')'); } buffer.writeln(';'); } @@ -544,7 +539,10 @@ class CodeGenerator { Map properties, { bool callSuper = false, }) { - buffer.writeIndented('$name.fromMap(Map obj)'); + buffer + ..writeIndented('$name.fromMap(') + ..write(callSuper ? 'super.obj' : 'Map obj') + ..write(')'); if (properties.isNotEmpty || callSuper) { buffer ..writeln(':') @@ -570,7 +568,7 @@ class CodeGenerator { if (!isFirst) { buffer.writeln(','); } - buffer.writeIndented('super.fromMap(obj)'); + buffer.writeIndented('super.fromMap()'); } buffer.outdent(); }