From 8968e5500a47525aebe53353b9badb051d979e4d Mon Sep 17 00:00:00 2001 From: Konstantin Shcheglov Date: Mon, 26 Feb 2024 19:51:41 +0000 Subject: [PATCH] CQ. Enable avoid_redundant_argument_values in analysis_server/ Change-Id: If9c09f81bdbac890553573a8491ca27cb4f22dd7 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/353805 Reviewed-by: Phil Quitslund Reviewed-by: Brian Wilkerson Commit-Queue: Konstantin Shcheglov --- pkg/analysis_server/analysis_options.yaml | 1 + .../benchmark/integration/driver.dart | 4 +- .../benchmark/perf/dart_analyze.dart | 4 -- .../lib/protocol/protocol_generated.dart | 52 +++++++++---------- .../lib/src/cider/completion.dart | 1 - .../src/flutter/flutter_outline_computer.dart | 1 - pkg/analysis_server/lib/src/g3/utilities.dart | 2 +- .../lib/src/handler/legacy/edit_format.dart | 10 ++-- .../legacy/edit_format_if_enabled.dart | 2 +- .../src/lsp/handlers/handler_completion.dart | 6 +-- .../handler_text_document_changes.dart | 1 - .../handlers/handler_workspace_symbols.dart | 10 ++-- .../lib/src/lsp/handlers/handlers.dart | 2 +- .../lib/src/lsp/source_edits.dart | 3 +- .../lib/src/plugin/plugin_manager.dart | 2 +- .../lib/src/server/driver.dart | 10 ++-- .../dart/library_member_contributor.dart | 11 ++-- .../completion/dart/suggestion_builder.dart | 5 +- .../postfix/postfix_completion.dart | 2 +- .../fix/data_driven/code_fragment_parser.dart | 17 ------ .../fix/data_driven/transform_set_parser.dart | 12 +---- .../lib/src/status/diagnostics.dart | 3 +- .../lib/src/utilities/profiling.dart | 4 +- .../src/utilities/source_change_merger.dart | 2 +- .../usage_tracking/usage_tracking.dart | 3 +- .../test/analysis/get_navigation_test.dart | 6 +-- .../test/domain_completion_test.dart | 2 +- .../test/edit/refactoring_test.dart | 4 +- .../test/lsp/call_hierarchy_test.dart | 1 - .../test/lsp/folding_test.dart | 2 - .../test/lsp/pub_package_service_test.dart | 2 +- .../test/lsp/references_test.dart | 5 +- .../test/lsp/signature_help_test.dart | 4 -- .../correction/name_suggestion_test.dart | 4 +- .../correction/fix/pubspec/test_support.dart | 4 +- .../test/stress/replay/replay.dart | 6 +-- .../completion_metrics/metrics_util_test.dart | 8 +-- .../tool/code_completion/code_metrics.dart | 2 +- .../code_completion/completion_metrics.dart | 10 +--- .../completion_metrics_client.dart | 1 - .../tool/code_completion/flutter_metrics.dart | 8 +-- .../tool/generate_testing_package.dart | 10 ++-- .../tool/spec/codegen_dart_protocol.dart | 22 +++++--- .../lib/src/protocol/protocol_generated.dart | 52 +++++++++---------- .../lib/protocol/protocol_generated.dart | 14 ++--- .../tool/spec/codegen_dart_protocol.dart | 22 +++++--- 46 files changed, 151 insertions(+), 208 deletions(-) diff --git a/pkg/analysis_server/analysis_options.yaml b/pkg/analysis_server/analysis_options.yaml index 7f4995e0560..5b8870063a9 100644 --- a/pkg/analysis_server/analysis_options.yaml +++ b/pkg/analysis_server/analysis_options.yaml @@ -29,6 +29,7 @@ analyzer: linter: rules: + - avoid_redundant_argument_values - flutter_style_todos - library_annotations - prefer_single_quotes diff --git a/pkg/analysis_server/benchmark/integration/driver.dart b/pkg/analysis_server/benchmark/integration/driver.dart index b8b79c5e15c..ca3f54307e1 100644 --- a/pkg/analysis_server/benchmark/integration/driver.dart +++ b/pkg/analysis_server/benchmark/integration/driver.dart @@ -273,12 +273,12 @@ extension on StringBuffer { } void writePadLeft(String text, int keyLength) { - write(text.padLeft(keyLength, ' ')); + write(text.padLeft(keyLength)); write(' '); } void writePadRight(String text, int keyLength) { - write(text.padRight(keyLength, ' ')); + write(text.padRight(keyLength)); write(' '); } } diff --git a/pkg/analysis_server/benchmark/perf/dart_analyze.dart b/pkg/analysis_server/benchmark/perf/dart_analyze.dart index c1a028657a8..afc10112bd4 100644 --- a/pkg/analysis_server/benchmark/perf/dart_analyze.dart +++ b/pkg/analysis_server/benchmark/perf/dart_analyze.dart @@ -39,7 +39,6 @@ abstract class AbstractCmdLineBenchmark extends Benchmark { '$dartSdkPath/bin/dart', ['analyze', '--suppress-analytics', ...analyzeThis], cwd: workingDir, - failOnError: true, verbose: false, ); stopwatchNoCache.stop(); @@ -49,7 +48,6 @@ abstract class AbstractCmdLineBenchmark extends Benchmark { '$dartSdkPath/bin/dart', ['analyze', '--suppress-analytics', ...analyzeThis], cwd: workingDir, - failOnError: true, verbose: false, ); stopwatchWithCache.stop(); @@ -73,7 +71,6 @@ abstract class AbstractCmdLineBenchmark extends Benchmark { ...analyzeThis ], cwd: workingDir, - failOnError: true, verbose: false, stdout: stdout, ); @@ -91,7 +88,6 @@ abstract class AbstractCmdLineBenchmark extends Benchmark { ...analyzeThis ], cwd: workingDir, - failOnError: true, verbose: false, stdout: stdout, ); diff --git a/pkg/analysis_server/lib/protocol/protocol_generated.dart b/pkg/analysis_server/lib/protocol/protocol_generated.dart index bf372a97dfe..d6d1d116cd2 100644 --- a/pkg/analysis_server/lib/protocol/protocol_generated.dart +++ b/pkg/analysis_server/lib/protocol/protocol_generated.dart @@ -930,7 +930,7 @@ class AnalysisGetLibraryDependenciesParams implements RequestParams { @override Request toRequest(String id) { - return Request(id, 'analysis.getLibraryDependencies', null); + return Request(id, 'analysis.getLibraryDependencies'); } @override @@ -2457,7 +2457,7 @@ class AnalysisReanalyzeParams implements RequestParams { @override Request toRequest(String id) { - return Request(id, 'analysis.reanalyze', null); + return Request(id, 'analysis.reanalyze'); } @override @@ -2476,7 +2476,7 @@ class AnalysisReanalyzeResult implements ResponseResult { @override Response toResponse(String id) { - return Response(id, result: null); + return Response(id); } @override @@ -2720,7 +2720,7 @@ class AnalysisSetAnalysisRootsResult implements ResponseResult { @override Response toResponse(String id) { - return Response(id, result: null); + return Response(id); } @override @@ -2808,7 +2808,7 @@ class AnalysisSetGeneralSubscriptionsResult implements ResponseResult { @override Response toResponse(String id) { - return Response(id, result: null); + return Response(id); } @override @@ -2895,7 +2895,7 @@ class AnalysisSetPriorityFilesResult implements ResponseResult { @override Response toResponse(String id) { - return Response(id, result: null); + return Response(id); } @override @@ -2996,7 +2996,7 @@ class AnalysisSetSubscriptionsResult implements ResponseResult { @override Response toResponse(String id) { - return Response(id, result: null); + return Response(id); } @override @@ -3279,7 +3279,7 @@ class AnalysisUpdateOptionsResult implements ResponseResult { @override Response toResponse(String id) { - return Response(id, result: null); + return Response(id); } @override @@ -3359,7 +3359,7 @@ class AnalyticsEnableResult implements ResponseResult { @override Response toResponse(String id) { - return Response(id, result: null); + return Response(id); } @override @@ -3378,7 +3378,7 @@ class AnalyticsIsEnabledParams implements RequestParams { @override Request toRequest(String id) { - return Request(id, 'analytics.isEnabled', null); + return Request(id, 'analytics.isEnabled'); } @override @@ -3521,7 +3521,7 @@ class AnalyticsSendEventResult implements ResponseResult { @override Response toResponse(String id) { - return Response(id, result: null); + return Response(id); } @override @@ -3615,7 +3615,7 @@ class AnalyticsSendTimingResult implements ResponseResult { @override Response toResponse(String id) { - return Response(id, result: null); + return Response(id); } @override @@ -4615,7 +4615,7 @@ class CompletionRegisterLibraryPathsResult implements ResponseResult { @override Response toResponse(String id) { - return Response(id, result: null); + return Response(id); } @override @@ -4796,7 +4796,7 @@ class DiagnosticGetDiagnosticsParams implements RequestParams { @override Request toRequest(String id) { - return Request(id, 'diagnostic.getDiagnostics', null); + return Request(id, 'diagnostic.getDiagnostics'); } @override @@ -4885,7 +4885,7 @@ class DiagnosticGetServerPortParams implements RequestParams { @override Request toRequest(String id) { - return Request(id, 'diagnostic.getServerPort', null); + return Request(id, 'diagnostic.getServerPort'); } @override @@ -6978,7 +6978,7 @@ class EditListPostfixCompletionTemplatesParams implements RequestParams { @override Request toRequest(String id) { - return Request(id, 'edit.listPostfixCompletionTemplates', null); + return Request(id, 'edit.listPostfixCompletionTemplates'); } @override @@ -7852,7 +7852,7 @@ class ExecutionDeleteContextResult implements ResponseResult { @override Response toResponse(String id) { - return Response(id, result: null); + return Response(id); } @override @@ -8540,7 +8540,7 @@ class ExecutionSetSubscriptionsResult implements ResponseResult { @override Response toResponse(String id) { - return Response(id, result: null); + return Response(id); } @override @@ -10210,7 +10210,7 @@ class FlutterSetSubscriptionsResult implements ResponseResult { @override Response toResponse(String id) { - return Response(id, result: null); + return Response(id); } @override @@ -14920,7 +14920,7 @@ class ServerCancelRequestResult implements ResponseResult { @override Response toResponse(String id) { - return Response(id, result: null); + return Response(id); } @override @@ -15106,7 +15106,7 @@ class ServerGetVersionParams implements RequestParams { @override Request toRequest(String id) { - return Request(id, 'server.getVersion', null); + return Request(id, 'server.getVersion'); } @override @@ -15479,7 +15479,7 @@ class ServerOpenUrlRequestResult implements ResponseResult { @override Response toResponse(String id) { - return Response(id, result: null); + return Response(id); } @override @@ -15651,7 +15651,7 @@ class ServerSetClientCapabilitiesResult implements ResponseResult { @override Response toResponse(String id) { - return Response(id, result: null); + return Response(id); } @override @@ -15738,7 +15738,7 @@ class ServerSetSubscriptionsResult implements ResponseResult { @override Response toResponse(String id) { - return Response(id, result: null); + return Response(id); } @override @@ -15922,7 +15922,7 @@ class ServerShutdownParams implements RequestParams { @override Request toRequest(String id) { - return Request(id, 'server.shutdown', null); + return Request(id, 'server.shutdown'); } @override @@ -15941,7 +15941,7 @@ class ServerShutdownResult implements ResponseResult { @override Response toResponse(String id) { - return Response(id, result: null); + return Response(id); } @override diff --git a/pkg/analysis_server/lib/src/cider/completion.dart b/pkg/analysis_server/lib/src/cider/completion.dart index 219750af755..2052196cf65 100644 --- a/pkg/analysis_server/lib/src/cider/completion.dart +++ b/pkg/analysis_server/lib/src/cider/completion.dart @@ -85,7 +85,6 @@ class CiderCompletionComputer { enclosingNode: enclosingNode, offset: offset, unit: resolvedUnit.parsedUnit, - dartdocDirectiveInfo: null, ); var suggestions = await performance.runAsync( diff --git a/pkg/analysis_server/lib/src/flutter/flutter_outline_computer.dart b/pkg/analysis_server/lib/src/flutter/flutter_outline_computer.dart index b680d079496..0584aa3fee4 100644 --- a/pkg/analysis_server/lib/src/flutter/flutter_outline_computer.dart +++ b/pkg/analysis_server/lib/src/flutter/flutter_outline_computer.dart @@ -22,7 +22,6 @@ class FlutterOutlineComputer { protocol.FlutterOutline compute() { var dartOutline = DartUnitOutlineComputer( resolvedUnit, - withBasicFlutter: false, ).compute(); // Convert Dart outlines into Flutter outlines. diff --git a/pkg/analysis_server/lib/src/g3/utilities.dart b/pkg/analysis_server/lib/src/g3/utilities.dart index 80500390d34..30ca4e2ec27 100644 --- a/pkg/analysis_server/lib/src/g3/utilities.dart +++ b/pkg/analysis_server/lib/src/g3/utilities.dart @@ -20,7 +20,7 @@ import 'package:dart_style/dart_style.dart'; /// Return a formatted string if successful, throws a [FormatterException] if /// unable to format. Takes a string as input. String format(String content) { - final code = SourceCode(content, uri: null, isCompilationUnit: true); + final code = SourceCode(content); var formatter = DartFormatter(); SourceCode formattedResult; formattedResult = formatter.formatSource(code); diff --git a/pkg/analysis_server/lib/src/handler/legacy/edit_format.dart b/pkg/analysis_server/lib/src/handler/legacy/edit_format.dart index ef1407e3f4e..4e9009c451e 100644 --- a/pkg/analysis_server/lib/src/handler/legacy/edit_format.dart +++ b/pkg/analysis_server/lib/src/handler/legacy/edit_format.dart @@ -44,11 +44,11 @@ class EditFormatHandler extends LegacyHandler { length = null; } - var code = SourceCode(unformattedCode, - uri: null, - isCompilationUnit: true, - selectionStart: start, - selectionLength: length); + var code = SourceCode( + unformattedCode, + selectionStart: start, + selectionLength: length, + ); var formatter = DartFormatter(pageWidth: params.lineLength); SourceCode formattedResult; try { diff --git a/pkg/analysis_server/lib/src/handler/legacy/edit_format_if_enabled.dart b/pkg/analysis_server/lib/src/handler/legacy/edit_format_if_enabled.dart index e0a0c5671de..3ba08617f75 100644 --- a/pkg/analysis_server/lib/src/handler/legacy/edit_format_if_enabled.dart +++ b/pkg/analysis_server/lib/src/handler/legacy/edit_format_if_enabled.dart @@ -29,7 +29,7 @@ class EditFormatIfEnabledHandler extends LegacyHandler { // TODO(brianwilkerson): Move this to a superclass when `edit.format` is // implemented by a handler class so the code can be shared. var originalContent = file.readAsStringSync(); - var code = SourceCode(originalContent, uri: null, isCompilationUnit: true); + var code = SourceCode(originalContent); var formatter = DartFormatter(); var formatResult = formatter.formatSource(code); diff --git a/pkg/analysis_server/lib/src/lsp/handlers/handler_completion.dart b/pkg/analysis_server/lib/src/lsp/handlers/handler_completion.dart index fc1d2e946dd..61b03813546 100644 --- a/pkg/analysis_server/lib/src/lsp/handlers/handler_completion.dart +++ b/pkg/analysis_server/lib/src/lsp/handlers/handler_completion.dart @@ -608,8 +608,7 @@ class CompletionHandler // Perform fuzzy matching based on the identifier in front of the caret to // reduce the size of the payload. final fuzzyPattern = suggestions.targetPrefix; - final fuzzyMatcher = - FuzzyMatcher(fuzzyPattern, matchStyle: MatchStyle.TEXT); + final fuzzyMatcher = FuzzyMatcher(fuzzyPattern); final completionItems = suggestions.suggestions .where((item) => @@ -945,8 +944,7 @@ class _FuzzyScoreHelper { final FuzzyMatcher _matcher; - _FuzzyScoreHelper(this.prefix) - : _matcher = FuzzyMatcher(prefix, matchStyle: MatchStyle.TEXT); + _FuzzyScoreHelper(this.prefix) : _matcher = FuzzyMatcher(prefix); bool completionItemMatches(CompletionItem item) => stringMatches(item.filterText ?? item.label); diff --git a/pkg/analysis_server/lib/src/lsp/handlers/handler_text_document_changes.dart b/pkg/analysis_server/lib/src/lsp/handlers/handler_text_document_changes.dart index 3c6b76183d6..345a7acb28d 100644 --- a/pkg/analysis_server/lib/src/lsp/handlers/handler_text_document_changes.dart +++ b/pkg/analysis_server/lib/src/lsp/handlers/handler_text_document_changes.dart @@ -165,7 +165,6 @@ class TextDocumentRegistrations extends FeatureRegistration change: TextDocumentSyncKind.Incremental, willSave: false, willSaveWaitUntil: false, - save: null, )); @override diff --git a/pkg/analysis_server/lib/src/lsp/handlers/handler_workspace_symbols.dart b/pkg/analysis_server/lib/src/lsp/handlers/handler_workspace_symbols.dart index 349bb7fda18..0a51b30b492 100644 --- a/pkg/analysis_server/lib/src/lsp/handlers/handler_workspace_symbols.dart +++ b/pkg/analysis_server/lib/src/lsp/handlers/handler_workspace_symbols.dart @@ -111,11 +111,11 @@ class WorkspaceSymbolHandler extends SharedMessageHandler { // TODO(dantup): Merge this into HandlerHelperMixin by converting to methods // so T can be inferred. final fileModifiedError = error(ErrorCodes.ContentModified, - 'Document was modified before operation completed', null); + 'Document was modified before operation completed'); final serverNotInitializedError = error(ErrorCodes.ServerNotInitialized, 'Request not valid before server is initialized'); diff --git a/pkg/analysis_server/lib/src/lsp/source_edits.dart b/pkg/analysis_server/lib/src/lsp/source_edits.dart index b407d440a38..4737c252b4f 100644 --- a/pkg/analysis_server/lib/src/lsp/source_edits.dart +++ b/pkg/analysis_server/lib/src/lsp/source_edits.dart @@ -81,8 +81,7 @@ ErrorOr?> generateEditsForFormatting( }) { final unformattedSource = result.content; - final code = - SourceCode(unformattedSource, uri: null, isCompilationUnit: true); + final code = SourceCode(unformattedSource); SourceCode formattedResult; try { // Create a new formatter on every request because it may contain state that diff --git a/pkg/analysis_server/lib/src/plugin/plugin_manager.dart b/pkg/analysis_server/lib/src/plugin/plugin_manager.dart index 8da39ec8193..a09051a3e72 100644 --- a/pkg/analysis_server/lib/src/plugin/plugin_manager.dart +++ b/pkg/analysis_server/lib/src/plugin/plugin_manager.dart @@ -230,7 +230,7 @@ abstract class PluginInfo { if (currentSession == null) { if (_exception != null) { // Plugin crashed, nothing to do. - return Future.value(null); + return Future.value(); } throw StateError('Cannot stop a plugin that is not running.'); } diff --git a/pkg/analysis_server/lib/src/server/driver.dart b/pkg/analysis_server/lib/src/server/driver.dart index b2fe13c07f8..7f9af8b5ba5 100644 --- a/pkg/analysis_server/lib/src/server/driver.dart +++ b/pkg/analysis_server/lib/src/server/driver.dart @@ -687,8 +687,7 @@ class Driver implements ServerStarter { print(telemetry.analyticsNotice); } print(''); - print(telemetry.createAnalyticsStatusMessage(analytics.enabled, - command: ANALYTICS_FLAG)); + print(telemetry.createAnalyticsStatusMessage(analytics.enabled)); } } @@ -776,7 +775,6 @@ class Driver implements ServerStarter { // This option is hidden but still accepted; it's effectively translated to // the 'protocol' option above. parser.addFlag(USE_LSP, - defaultsTo: false, negatable: false, help: 'Whether to use the Language Server Protocol (LSP).', hide: true); @@ -824,19 +822,17 @@ class Driver implements ServerStarter { // exception-nullifying runZoned() calls. help: 'disable analyzer exception capture for interactive debugging ' 'of the server', - defaultsTo: false, hide: true); parser.addFlag(DISABLE_SERVER_FEATURE_COMPLETION, - help: 'disable all completion features', defaultsTo: false, hide: true); + help: 'disable all completion features', hide: true); parser.addFlag(DISABLE_SERVER_FEATURE_SEARCH, - help: 'disable all search features', defaultsTo: false, hide: true); + help: 'disable all search features', hide: true); parser.addFlag(DISABLE_STATUS_NOTIFICATION_DEBOUNCING, negatable: false, help: 'Suppress debouncing of status notifications.', hide: true); parser.addFlag(INTERNAL_PRINT_TO_CONSOLE, help: 'enable sending `print` output to the console', - defaultsTo: false, negatable: false, hide: true); parser.addOption( diff --git a/pkg/analysis_server/lib/src/services/completion/dart/library_member_contributor.dart b/pkg/analysis_server/lib/src/services/completion/dart/library_member_contributor.dart index 9758e9e0368..267fbdaf7f3 100644 --- a/pkg/analysis_server/lib/src/services/completion/dart/library_member_contributor.dart +++ b/pkg/analysis_server/lib/src/services/completion/dart/library_member_contributor.dart @@ -2,8 +2,6 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -import 'package:analysis_server/src/protocol_server.dart' - show CompletionSuggestionKind; import 'package:analysis_server/src/provisional/completion/dart/completion_dart.dart'; import 'package:analyzer/dart/ast/ast.dart'; import 'package:analyzer/dart/element/element.dart'; @@ -49,8 +47,7 @@ class LibraryMemberContributor extends DartCompletionContributor { for (var constructor in element.constructors) { if (!constructor.isPrivate) { if (!element.isAbstract || constructor.isFactory) { - builder.suggestConstructor(constructor, - kind: CompletionSuggestionKind.INVOCATION); + builder.suggestConstructor(constructor); } } } @@ -59,13 +56,11 @@ class LibraryMemberContributor extends DartCompletionContributor { if (element is InterfaceElement || element is ExtensionElement || element is TypeAliasElement) { - builder.suggestElement(element, - kind: CompletionSuggestionKind.INVOCATION); + builder.suggestElement(element); } else if (!typesOnly && (element is FunctionElement || element is PropertyAccessorElement)) { - builder.suggestElement(element, - kind: CompletionSuggestionKind.INVOCATION); + builder.suggestElement(element); } } } diff --git a/pkg/analysis_server/lib/src/services/completion/dart/suggestion_builder.dart b/pkg/analysis_server/lib/src/services/completion/dart/suggestion_builder.dart index 11b90c5da85..8c2ec43f733 100644 --- a/pkg/analysis_server/lib/src/services/completion/dart/suggestion_builder.dart +++ b/pkg/analysis_server/lib/src/services/completion/dart/suggestion_builder.dart @@ -586,10 +586,7 @@ class SuggestionBuilder { void suggestFunctionCall() { final element = protocol.Element(protocol.ElementKind.METHOD, FunctionElement.CALL_METHOD_NAME, protocol.Element.makeFlags(), - location: null, - typeParameters: null, - parameters: '()', - returnType: 'void'); + parameters: '()', returnType: 'void'); _addSuggestion( CompletionSuggestion( CompletionSuggestionKind.INVOCATION, diff --git a/pkg/analysis_server/lib/src/services/completion/postfix/postfix_completion.dart b/pkg/analysis_server/lib/src/services/completion/postfix/postfix_completion.dart index f3c61da04ca..6bffbe0593b 100644 --- a/pkg/analysis_server/lib/src/services/completion/postfix/postfix_completion.dart +++ b/pkg/analysis_server/lib/src/services/completion/postfix/postfix_completion.dart @@ -149,7 +149,7 @@ class DartPostfixCompletion { static Future expandTry( PostfixCompletionProcessor processor, PostfixCompletionKind kind) async { - return processor.expandTry(kind, processor.findStatement, withOn: false); + return processor.expandTry(kind, processor.findStatement); } static Future expandTryon( diff --git a/pkg/analysis_server/lib/src/services/correction/fix/data_driven/code_fragment_parser.dart b/pkg/analysis_server/lib/src/services/correction/fix/data_driven/code_fragment_parser.dart index 2a238d4134b..3f5c6bf02e0 100644 --- a/pkg/analysis_server/lib/src/services/correction/fix/data_driven/code_fragment_parser.dart +++ b/pkg/analysis_server/lib/src/services/correction/fix/data_driven/code_fragment_parser.dart @@ -85,8 +85,6 @@ class CodeFragmentParser { length: token.length, errorCode: TransformSetErrorCode.wrongToken, arguments: ['.', token.kind.displayName], - contextMessages: null, - data: null, ); return null; } @@ -117,8 +115,6 @@ class CodeFragmentParser { length: token.length, errorCode: TransformSetErrorCode.unexpectedToken, arguments: [token.kind.displayName], - contextMessages: null, - data: null, ); return null; } @@ -157,8 +153,6 @@ class CodeFragmentParser { length: length, errorCode: TransformSetErrorCode.missingToken, arguments: [validKindsDisplayString()], - contextMessages: null, - data: null, ); return null; } @@ -168,8 +162,6 @@ class CodeFragmentParser { length: token.length, errorCode: TransformSetErrorCode.wrongToken, arguments: [validKindsDisplayString(), token.kind.displayName], - contextMessages: null, - data: null, ); return null; } @@ -243,8 +235,6 @@ class CodeFragmentParser { length: token.length, errorCode: TransformSetErrorCode.unknownAccessor, arguments: [identifier], - contextMessages: null, - data: null, ); return null; } @@ -325,8 +315,6 @@ class CodeFragmentParser { length: token.length, errorCode: TransformSetErrorCode.undefinedVariable, arguments: [variableName], - contextMessages: null, - data: null, ); return null; } @@ -357,9 +345,6 @@ class CodeFragmentParser { offset: offset, length: length, errorCode: TransformSetErrorCode.expectedPrimary, - arguments: null, - contextMessages: null, - data: null, ); return null; } @@ -495,8 +480,6 @@ class _CodeFragmentScanner { length: 1, errorCode: TransformSetErrorCode.invalidCharacter, arguments: [content.substring(offset, offset + 1)], - contextMessages: null, - data: null, ); return null; } diff --git a/pkg/analysis_server/lib/src/services/correction/fix/data_driven/transform_set_parser.dart b/pkg/analysis_server/lib/src/services/correction/fix/data_driven/transform_set_parser.dart index d60b2f05ed1..43b4be6880d 100644 --- a/pkg/analysis_server/lib/src/services/correction/fix/data_driven/transform_set_parser.dart +++ b/pkg/analysis_server/lib/src/services/correction/fix/data_driven/transform_set_parser.dart @@ -194,9 +194,6 @@ class TransformSetParser { offset: templateOffset + variableStart, length: 2, errorCode: TransformSetErrorCode.missingTemplateEnd, - arguments: null, - contextMessages: null, - data: null, ); // Ignore the invalid component, treating it as if it extended to the // end of the template. @@ -210,8 +207,6 @@ class TransformSetParser { length: name.length, errorCode: TransformSetErrorCode.undefinedVariable, arguments: [name], - contextMessages: null, - data: null, ); // Ignore the invalid component. } else { @@ -266,8 +261,6 @@ class TransformSetParser { length: length, errorCode: TransformSetErrorCode.yamlSyntaxError, arguments: [e.message], - contextMessages: null, - data: null, ); } return null; @@ -284,8 +277,6 @@ class TransformSetParser { length: span.length, errorCode: code, arguments: arguments, - contextMessages: null, - data: null, ); } @@ -596,8 +587,7 @@ class TransformSetParser { } var argumentValueNode = node.valueAt(_argumentValueKey); var argumentValue = _translateCodeTemplate(argumentValueNode, - ErrorContext(key: _argumentValueKey, parentNode: node), - canBeConditionallyRequired: false); + ErrorContext(key: _argumentValueKey, parentNode: node)); (_parameterModifications ??= []).add( ChangeParameterType( reference: reference, diff --git a/pkg/analysis_server/lib/src/status/diagnostics.dart b/pkg/analysis_server/lib/src/status/diagnostics.dart index e40e7d8501a..8f3f2e4f74d 100644 --- a/pkg/analysis_server/lib/src/status/diagnostics.dart +++ b/pkg/analysis_server/lib/src/status/diagnostics.dart @@ -473,8 +473,7 @@ class CollectReportPage extends DiagnosticPage { } if (startedServiceProtocol) { - await developer.Service.controlWebServer( - enable: false, silenceOutput: true); + await developer.Service.controlWebServer(silenceOutput: true); } const JsonEncoder encoder = JsonEncoder.withIndent(' '); diff --git a/pkg/analysis_server/lib/src/utilities/profiling.dart b/pkg/analysis_server/lib/src/utilities/profiling.dart index 8c8d389d5c8..a643620104d 100644 --- a/pkg/analysis_server/lib/src/utilities/profiling.dart +++ b/pkg/analysis_server/lib/src/utilities/profiling.dart @@ -63,7 +63,7 @@ class _PosixProcessProfiler extends ProcessProfiler { Process.run('ps', ['-o', '%cpu=,rss=', processId.toString()]); return future.then((ProcessResult result) { if (result.exitCode != 0) { - return Future.value(null); + return Future.value(); } return Future.value(_parse(result.stdout as String)); @@ -95,7 +95,7 @@ class _WindowsProcessProfiler extends ProcessProfiler { 'tasklist', ['/FI', 'PID eq $processId', '/NH', '/FO', 'csv']); if (result.exitCode != 0) { - return Future.value(null); + return Future.value(); } return Future.value(_parse(result.stdout as String)); diff --git a/pkg/analysis_server/lib/src/utilities/source_change_merger.dart b/pkg/analysis_server/lib/src/utilities/source_change_merger.dart index 04322426439..932741f2695 100644 --- a/pkg/analysis_server/lib/src/utilities/source_change_merger.dart +++ b/pkg/analysis_server/lib/src/utilities/source_change_merger.dart @@ -74,7 +74,7 @@ class SourceChangeMerger { for (final edit in edits) { debugBuffer.writeln(' $edit'); } - debugBuffer.writeln(''); + debugBuffer.writeln(); } /// Merges (in-place) any sequential edits that are overlapping or touching. diff --git a/pkg/analysis_server/lib/src/utilities/usage_tracking/usage_tracking.dart b/pkg/analysis_server/lib/src/utilities/usage_tracking/usage_tracking.dart index 02d58b3499a..a74236e6584 100644 --- a/pkg/analysis_server/lib/src/utilities/usage_tracking/usage_tracking.dart +++ b/pkg/analysis_server/lib/src/utilities/usage_tracking/usage_tracking.dart @@ -10,7 +10,6 @@ void configureMemoryUsageTracking( UsageCallback callback, ) { final config = UsageTrackingConfig( - interval: const Duration(seconds: 1), usageEventsConfig: UsageEventsConfig( callback, deltaMb: 512, @@ -36,7 +35,7 @@ AutoSnapshottingConfig? parseAutoSnapshottingConfig(List args) { arg = arg.replaceAll('-', '='); arg = '--$arg'; - var parser = ArgParser()..addMultiOption(argName, splitCommas: true); + var parser = ArgParser()..addMultiOption(argName); final parsedArgs = parser.parse([arg]); assert(parsedArgs.options.contains(argName)); final values = parsedArgs[argName] as List; diff --git a/pkg/analysis_server/test/analysis/get_navigation_test.dart b/pkg/analysis_server/test/analysis/get_navigation_test.dart index 83a82e686c7..cf5e30c3b5a 100644 --- a/pkg/analysis_server/test/analysis/get_navigation_test.dart +++ b/pkg/analysis_server/test/analysis/get_navigation_test.dart @@ -347,7 +347,7 @@ part of 'test.dart'; part 'a.dart'; '''); await waitForTasksFinished(); - await _getNavigation(offset: 8, length: 0); + await _getNavigation(offset: 8); expect(regions, hasLength(1)); assertHasRegionString("'a.dart'"); expect(testTargets, hasLength(1)); @@ -367,7 +367,7 @@ part 'test.dart'; part of foo; '''); await waitForTasksFinished(); - await _getNavigation(offset: 10, length: 0); + await _getNavigation(offset: 10); expect(regions, hasLength(1)); assertHasRegionString('foo'); expect(testTargets, hasLength(1)); @@ -386,7 +386,7 @@ part 'test.dart'; part of 'a.dart'; '''); await waitForTasksFinished(); - await _getNavigation(offset: 11, length: 0); + await _getNavigation(offset: 11); expect(regions, hasLength(1)); assertHasRegionString("'a.dart'"); expect(testTargets, hasLength(1)); diff --git a/pkg/analysis_server/test/domain_completion_test.dart b/pkg/analysis_server/test/domain_completion_test.dart index 329147e96f8..db7f99b226a 100644 --- a/pkg/analysis_server/test/domain_completion_test.dart +++ b/pkg/analysis_server/test/domain_completion_test.dart @@ -446,7 +446,7 @@ suggestions await _configureWithWorkspaceRoot(); // Empty budget, so no not yet imported libraries. - server.completionState.budgetDuration = const Duration(milliseconds: 0); + server.completionState.budgetDuration = const Duration(); var response = await _getTestCodeSuggestions(''' void f() { diff --git a/pkg/analysis_server/test/edit/refactoring_test.dart b/pkg/analysis_server/test/edit/refactoring_test.dart index 65e2374b492..f1ae36b9f10 100644 --- a/pkg/analysis_server/test/edit/refactoring_test.dart +++ b/pkg/analysis_server/test/edit/refactoring_test.dart @@ -243,7 +243,7 @@ class ExtractLocalVariableTest extends _AbstractGetRefactoring_Test { var kind = RefactoringKind.EXTRACT_LOCAL_VARIABLE; var options = name != null ? ExtractLocalVariableOptions(name, extractAll) : null; - return sendRequest(kind, offset, length, options, false); + return sendRequest(kind, offset, length, options); } Future sendStringRequest( @@ -826,7 +826,7 @@ int? res(int b) { Future _sendExtractRequest() { var kind = RefactoringKind.EXTRACT_METHOD; - return sendRequest(kind, offset, length, options, false); + return sendRequest(kind, offset, length, options); } void _setOffsetLengthForStartEnd() { diff --git a/pkg/analysis_server/test/lsp/call_hierarchy_test.dart b/pkg/analysis_server/test/lsp/call_hierarchy_test.dart index 251cf73a2ae..e2eb2c6778d 100644 --- a/pkg/analysis_server/test/lsp/call_hierarchy_test.dart +++ b/pkg/analysis_server/test/lsp/call_hierarchy_test.dart @@ -112,7 +112,6 @@ final x = foo(); // Container of the call from: CallHierarchyItem( name: 'other.dart', - detail: null, kind: SymbolKind.File, uri: otherFileUri, range: entireRange(otherCode.code), diff --git a/pkg/analysis_server/test/lsp/folding_test.dart b/pkg/analysis_server/test/lsp/folding_test.dart index 0a28ad8a4ae..b31af10fcf0 100644 --- a/pkg/analysis_server/test/lsp/folding_test.dart +++ b/pkg/analysis_server/test/lsp/folding_test.dart @@ -57,8 +57,6 @@ class FoldingTest extends AbstractLspAnalysisServerTest { startCharacter: lineFoldingOnly ? null : range.start.character, endLine: range.end.line, endCharacter: lineFoldingOnly ? null : range.end.character, - // We (and VS Code) don't currently support this. - collapsedText: null, kind: entry.value, ); }).toSet(); diff --git a/pkg/analysis_server/test/lsp/pub_package_service_test.dart b/pkg/analysis_server/test/lsp/pub_package_service_test.dart index 5b7cd590000..4af5f74e22d 100644 --- a/pkg/analysis_server/test/lsp/pub_package_service_test.dart +++ b/pkg/analysis_server/test/lsp/pub_package_service_test.dart @@ -460,7 +460,7 @@ class PubPackageServiceTest extends AbstractLspAnalysisServerTest { final maxHours = PackageDetailsCache.maxCacheAge.inHours; // Very old cache should have no time remaining. - expectHoursRemaining(DateTime(2020, 12, 1), 0); + expectHoursRemaining(DateTime(2020, 12), 0); // Cache from 1 hour ago should max-1 hours remaining. expectHoursRemaining(DateTime.now().add(Duration(hours: -1)), maxHours - 1); diff --git a/pkg/analysis_server/test/lsp/references_test.dart b/pkg/analysis_server/test/lsp/references_test.dart index d0a8f2fdeb2..0b68aab477e 100644 --- a/pkg/analysis_server/test/lsp/references_test.dart +++ b/pkg/analysis_server/test/lsp/references_test.dart @@ -72,7 +72,6 @@ void f() { await _checkRanges( mainContent, otherContent: otherContent, - includeDeclarations: false, ); } @@ -227,7 +226,7 @@ int f(Object o) { } '''; - await _checkRanges(content, includeDeclarations: false); + await _checkRanges(content); } Future test_singleFile_withoutDeclaration() async { @@ -237,7 +236,7 @@ f^oo() { } '''; - await _checkRanges(content, includeDeclarations: false); + await _checkRanges(content); } Future test_type() async { diff --git a/pkg/analysis_server/test/lsp/signature_help_test.dart b/pkg/analysis_server/test/lsp/signature_help_test.dart index 5103920a564..ec4003e70ca 100644 --- a/pkg/analysis_server/test/lsp/signature_help_test.dart +++ b/pkg/analysis_server/test/lsp/signature_help_test.dart @@ -287,7 +287,6 @@ foo(String s, int i) { ParameterInformation(label: 'String s'), ParameterInformation(label: 'int i'), ], - expectedFormat: MarkupKind.Markdown, ); } @@ -363,7 +362,6 @@ foo(String s, int i) { ParameterInformation(label: 'String s'), ParameterInformation(label: 'int i'), ], - expectedFormat: MarkupKind.Markdown, ); } @@ -387,7 +385,6 @@ foo(String s, int i) { ParameterInformation(label: 'String s'), ParameterInformation(label: 'int i'), ], - expectedFormat: MarkupKind.Markdown, context: SignatureHelpContext( triggerKind: SignatureHelpTriggerKind.Invoked, isRetrigger: false, @@ -631,7 +628,6 @@ foo(String s, int i) { ParameterInformation(label: 'String s'), ParameterInformation(label: 'int i'), ], - expectedFormat: MarkupKind.Markdown, context: SignatureHelpContext( triggerKind: SignatureHelpTriggerKind.Invoked, isRetrigger: false, diff --git a/pkg/analysis_server/test/services/correction/name_suggestion_test.dart b/pkg/analysis_server/test/services/correction/name_suggestion_test.dart index 9bbb267abce..9ab3b6db341 100644 --- a/pkg/analysis_server/test/services/correction/name_suggestion_test.dart +++ b/pkg/analysis_server/test/services/correction/name_suggestion_test.dart @@ -108,9 +108,7 @@ class A { '''); var excluded = {}; var expr = findNode.instanceCreation('Map('); - expect( - getVariableNameSuggestionsForExpression(null, expr, excluded, - isMethod: false), + expect(getVariableNameSuggestionsForExpression(null, expr, excluded), unorderedEquals(['map'])); expect( getVariableNameSuggestionsForExpression(null, expr, excluded, diff --git a/pkg/analysis_server/test/src/services/correction/fix/pubspec/test_support.dart b/pkg/analysis_server/test/src/services/correction/fix/pubspec/test_support.dart index 5ae3e692322..4835fb70216 100644 --- a/pkg/analysis_server/test/src/services/correction/fix/pubspec/test_support.dart +++ b/pkg/analysis_server/test/src/services/correction/fix/pubspec/test_support.dart @@ -50,9 +50,7 @@ abstract class PubspecFixTest with ResourceProviderMixin { final errors = pubspec_validator.validatePubspec( source: pubspecFile.createSource(), contents: node, - provider: resourceProvider, - // TODO(sigurdm): Can/should we pass analysis-options here? - analysisOptions: null); + provider: resourceProvider); expect(errors.length, 1); error = errors[0]; } diff --git a/pkg/analysis_server/test/stress/replay/replay.dart b/pkg/analysis_server/test/stress/replay/replay.dart index 28c9c890ac8..67c9df23e85 100644 --- a/pkg/analysis_server/test/stress/replay/replay.dart +++ b/pkg/analysis_server/test/stress/replay/replay.dart @@ -136,10 +136,7 @@ class Driver { ArgParser _createArgParser() { var parser = ArgParser(); parser.addFlag(HELP_FLAG_NAME, - abbr: 'h', - help: 'Print usage information', - defaultsTo: false, - negatable: false); + abbr: 'h', help: 'Print usage information', negatable: false); parser.addOption(OVERLAY_STYLE_OPTION_NAME, help: 'The style of interaction to use for analysis.updateContent requests', @@ -152,7 +149,6 @@ class Driver { parser.addFlag(VERBOSE_FLAG_NAME, abbr: 'v', help: 'Produce verbose output for debugging', - defaultsTo: false, negatable: false); return parser; } diff --git a/pkg/analysis_server/test/tool/completion_metrics/metrics_util_test.dart b/pkg/analysis_server/test/tool/completion_metrics/metrics_util_test.dart index b9f74334cec..0969a7efb88 100644 --- a/pkg/analysis_server/test/tool/completion_metrics/metrics_util_test.dart +++ b/pkg/analysis_server/test/tool/completion_metrics/metrics_util_test.dart @@ -51,7 +51,7 @@ void main() { test('clear', () { var counter = Counter('name'); - counter.count('bucket-1', 1); + counter.count('bucket-1'); expect(counter.map, isNotEmpty); expect(counter.totalCount, equals(1)); @@ -62,9 +62,9 @@ void main() { test('getCountOf', () { var counter = Counter('name'); - counter.count('bucket-1', 1); - counter.count('bucket-2', 1); - counter.count('bucket-2', 1); + counter.count('bucket-1'); + counter.count('bucket-2'); + counter.count('bucket-2'); counter.count('bucket-3', 3); expect(counter.name, equals('name')); expect(counter.map, isNotEmpty); diff --git a/pkg/analysis_server/tool/code_completion/code_metrics.dart b/pkg/analysis_server/tool/code_completion/code_metrics.dart index fd34420b929..93fbf4bb7f7 100644 --- a/pkg/analysis_server/tool/code_completion/code_metrics.dart +++ b/pkg/analysis_server/tool/code_completion/code_metrics.dart @@ -1456,7 +1456,7 @@ class CodeShapeMetricsComputer { /// Write the child data to the [sink]. void _writeChildData(StringSink sink) { - sink.writeln(''); + sink.writeln(); sink.writeln('Child data'); // TODO(brianwilkerson): This misses all node kinds for which zero instances diff --git a/pkg/analysis_server/tool/code_completion/completion_metrics.dart b/pkg/analysis_server/tool/code_completion/completion_metrics.dart index c0d966738e6..1c237975a5e 100644 --- a/pkg/analysis_server/tool/code_completion/completion_metrics.dart +++ b/pkg/analysis_server/tool/code_completion/completion_metrics.dart @@ -172,25 +172,21 @@ ArgParser createArgParser() { 'completion will be requested this many characters in from the ' 'start of the token being completed.') ..addFlag(CompletionMetricsQualityOptions.PRINT_MISSED_COMPLETION_DETAILS, - defaultsTo: false, help: 'Print detailed information every time a completion request fails ' 'to produce a suggestions matching the expected suggestion.', negatable: false) ..addFlag(CompletionMetricsQualityOptions.PRINT_MISSED_COMPLETION_SUMMARY, - defaultsTo: false, help: 'Print summary information about the times that a completion ' 'request failed to produce a suggestions matching the expected ' 'suggestion.', negatable: false) ..addFlag(CompletionMetricsQualityOptions.PRINT_MISSING_INFORMATION, - defaultsTo: false, help: 'Print information about places where no completion location was ' 'computed and about information that is missing in the completion ' 'tables.', negatable: false) ..addFlag(CompletionMetricsQualityOptions.PRINT_MRR_BY_LOCATION, - defaultsTo: false, help: 'Print information about the mrr score achieved at each completion ' 'location. This can help focus efforts to improve the overall ' @@ -198,18 +194,15 @@ ArgParser createArgParser() { 'impact.', negatable: false) ..addFlag(CompletionMetricsQualityOptions.PRINT_SHADOWED_COMPLETION_DETAILS, - defaultsTo: false, help: 'Print detailed information every time a completion request ' 'produces a suggestion whose name matches the expected suggestion ' 'but that is referencing a different element', negatable: false) ..addFlag(CompletionMetricsOptions.PRINT_SLOWEST_RESULTS, - defaultsTo: false, help: 'Print information about the completion requests that were the ' 'slowest to return suggestions.', negatable: false) ..addFlag(CompletionMetricsQualityOptions.PRINT_WORST_RESULTS, - defaultsTo: false, help: 'Print information about the completion requests that had the ' 'worst mrr scores.', negatable: false) @@ -791,8 +784,7 @@ class CompletionQualityMetricsComputer extends CompletionMetricsComputer { Future computeMetrics() async { // To compare two or more changes to completions, add a `CompletionMetrics` // object with enable and disable functions to the list of `targetMetrics`. - targetMetrics.add(CompletionMetrics('shipping', - enableFunction: null, disableFunction: null)); + targetMetrics.add(CompletionMetrics('shipping')); // To compare two or more relevance tables, uncomment the line below and // add the `RelevanceTables` to the list. The default relevance tables diff --git a/pkg/analysis_server/tool/code_completion/completion_metrics_client.dart b/pkg/analysis_server/tool/code_completion/completion_metrics_client.dart index db74e287af0..aea61663382 100644 --- a/pkg/analysis_server/tool/code_completion/completion_metrics_client.dart +++ b/pkg/analysis_server/tool/code_completion/completion_metrics_client.dart @@ -88,7 +88,6 @@ ArgParser _createArgParser() { ) ..addFlag( CompletionMetricsOptions.PRINT_SLOWEST_RESULTS, - defaultsTo: false, help: 'Print information about the completion requests that were the ' 'slowest to return suggestions.', negatable: false, diff --git a/pkg/analysis_server/tool/code_completion/flutter_metrics.dart b/pkg/analysis_server/tool/code_completion/flutter_metrics.dart index d2a341cf3cc..448004c20af 100644 --- a/pkg/analysis_server/tool/code_completion/flutter_metrics.dart +++ b/pkg/analysis_server/tool/code_completion/flutter_metrics.dart @@ -30,7 +30,7 @@ Future main(List args) async { await computer.compute(rootPath); stopwatch.stop(); var duration = Duration(milliseconds: stopwatch.elapsedMilliseconds); - out.writeln(''); + out.writeln(); out.writeln('Analysis performed in $duration'); computer.writeResults(out); await out.flush(); @@ -241,14 +241,14 @@ class FlutterMetricsComputer { /// Write the child data to the [sink]. void _writeChildData(StringSink sink) { - sink.writeln(''); + sink.writeln(); sink.writeln('The number of times a widget had a given child.'); _writeStructureData(sink, data.childData); } /// Write the parent data to the [sink]. void _writeParentData(StringSink sink) { - sink.writeln(''); + sink.writeln(); sink.writeln('The number of times a widget had a given parent.'); _writeStructureData(sink, data.parentData); } @@ -275,7 +275,7 @@ class FlutterMetricsComputer { /// Write the widget count data to the [sink]. void _writeWidgetCounts(StringSink sink) { - sink.writeln(''); + sink.writeln(); sink.writeln('Widget classes by frequency of instantiation'); var total = data.totalWidgetCount; diff --git a/pkg/analysis_server/tool/generate_testing_package.dart b/pkg/analysis_server/tool/generate_testing_package.dart index afb773298f9..51919d8fb11 100644 --- a/pkg/analysis_server/tool/generate_testing_package.dart +++ b/pkg/analysis_server/tool/generate_testing_package.dart @@ -39,10 +39,8 @@ void main(List args) async { defaultsTo: '1', help: 'the number of parameters per method', ) - ..addFlag('use-barrel-file', - defaultsTo: false, help: 'Whether to add a barrel import') + ..addFlag('use-barrel-file', help: 'Whether to add a barrel import') ..addFlag('use-json-serializable', - defaultsTo: false, help: 'Whether to declare @JsonSerializable classes'); var argResults = argParser.parse(args); var libraryCount = int.parse(argResults['library-count'] as String); @@ -102,12 +100,12 @@ void main(List args) async { content.writeln(import(testPackageLibUri('lib$importIndex.dart'))); } } - content.writeln(''); + content.writeln(); } if (useJsonSerializable) { content.writeln("part '$libraryName.g.dart';"); - content.writeln(''); + content.writeln(); } // Add top-level variables above tier 0. @@ -121,7 +119,7 @@ void main(List args) async { .writeln('var x$topLevelVariableIndex = C$classReferenceIndex();'); topLevelVariableIndex++; } - content.writeln(''); + content.writeln(); } for (var cIndex = 1; cIndex <= classCount; cIndex++) { diff --git a/pkg/analysis_server/tool/spec/codegen_dart_protocol.dart b/pkg/analysis_server/tool/spec/codegen_dart_protocol.dart index 1212c8a0f02..bdd3bc91d66 100644 --- a/pkg/analysis_server/tool/spec/codegen_dart_protocol.dart +++ b/pkg/analysis_server/tool/spec/codegen_dart_protocol.dart @@ -909,8 +909,11 @@ class CodegenProtocolVisitor extends DartCodegenVisitor with CodeGenerator { indent(() { var methodString = literalString((impliedType.apiNode as Request).longMethod); - var jsonPart = impliedType.type != null ? 'toJson()' : 'null'; - writeln('return Request(id, $methodString, $jsonPart);'); + if (impliedType.type != null) { + writeln('return Request(id, $methodString, toJson());'); + } else { + writeln('return Request(id, $methodString);'); + } }); writeln('}'); return true; @@ -929,11 +932,18 @@ class CodegenProtocolVisitor extends DartCodegenVisitor with CodeGenerator { writeln('Response toResponse(String id) {'); } indent(() { - var jsonPart = impliedType.type != null ? 'toJson()' : 'null'; - if (responseRequiresRequestTime) { - writeln('return Response(id, requestTime, result: $jsonPart);'); + if (impliedType.type != null) { + if (responseRequiresRequestTime) { + writeln('return Response(id, requestTime, result: toJson());'); + } else { + writeln('return Response(id, result: toJson());'); + } } else { - writeln('return Response(id, result: $jsonPart);'); + if (responseRequiresRequestTime) { + writeln('return Response(id, requestTime);'); + } else { + writeln('return Response(id);'); + } } }); writeln('}'); diff --git a/pkg/analysis_server_client/lib/src/protocol/protocol_generated.dart b/pkg/analysis_server_client/lib/src/protocol/protocol_generated.dart index badfb1b3d5d..1970aaca2f5 100644 --- a/pkg/analysis_server_client/lib/src/protocol/protocol_generated.dart +++ b/pkg/analysis_server_client/lib/src/protocol/protocol_generated.dart @@ -912,7 +912,7 @@ class AnalysisGetLibraryDependenciesParams implements RequestParams { @override Request toRequest(String id) { - return Request(id, 'analysis.getLibraryDependencies', null); + return Request(id, 'analysis.getLibraryDependencies'); } @override @@ -2403,7 +2403,7 @@ class AnalysisReanalyzeParams implements RequestParams { @override Request toRequest(String id) { - return Request(id, 'analysis.reanalyze', null); + return Request(id, 'analysis.reanalyze'); } @override @@ -2422,7 +2422,7 @@ class AnalysisReanalyzeResult implements ResponseResult { @override Response toResponse(String id) { - return Response(id, result: null); + return Response(id); } @override @@ -2649,7 +2649,7 @@ class AnalysisSetAnalysisRootsResult implements ResponseResult { @override Response toResponse(String id) { - return Response(id, result: null); + return Response(id); } @override @@ -2737,7 +2737,7 @@ class AnalysisSetGeneralSubscriptionsResult implements ResponseResult { @override Response toResponse(String id) { - return Response(id, result: null); + return Response(id); } @override @@ -2819,7 +2819,7 @@ class AnalysisSetPriorityFilesResult implements ResponseResult { @override Response toResponse(String id) { - return Response(id, result: null); + return Response(id); } @override @@ -2912,7 +2912,7 @@ class AnalysisSetSubscriptionsResult implements ResponseResult { @override Response toResponse(String id) { - return Response(id, result: null); + return Response(id); } @override @@ -3191,7 +3191,7 @@ class AnalysisUpdateOptionsResult implements ResponseResult { @override Response toResponse(String id) { - return Response(id, result: null); + return Response(id); } @override @@ -3271,7 +3271,7 @@ class AnalyticsEnableResult implements ResponseResult { @override Response toResponse(String id) { - return Response(id, result: null); + return Response(id); } @override @@ -3290,7 +3290,7 @@ class AnalyticsIsEnabledParams implements RequestParams { @override Request toRequest(String id) { - return Request(id, 'analytics.isEnabled', null); + return Request(id, 'analytics.isEnabled'); } @override @@ -3433,7 +3433,7 @@ class AnalyticsSendEventResult implements ResponseResult { @override Response toResponse(String id) { - return Response(id, result: null); + return Response(id); } @override @@ -3527,7 +3527,7 @@ class AnalyticsSendTimingResult implements ResponseResult { @override Response toResponse(String id) { - return Response(id, result: null); + return Response(id); } @override @@ -4523,7 +4523,7 @@ class CompletionRegisterLibraryPathsResult implements ResponseResult { @override Response toResponse(String id) { - return Response(id, result: null); + return Response(id); } @override @@ -4704,7 +4704,7 @@ class DiagnosticGetDiagnosticsParams implements RequestParams { @override Request toRequest(String id) { - return Request(id, 'diagnostic.getDiagnostics', null); + return Request(id, 'diagnostic.getDiagnostics'); } @override @@ -4793,7 +4793,7 @@ class DiagnosticGetServerPortParams implements RequestParams { @override Request toRequest(String id) { - return Request(id, 'diagnostic.getServerPort', null); + return Request(id, 'diagnostic.getServerPort'); } @override @@ -6867,7 +6867,7 @@ class EditListPostfixCompletionTemplatesParams implements RequestParams { @override Request toRequest(String id) { - return Request(id, 'edit.listPostfixCompletionTemplates', null); + return Request(id, 'edit.listPostfixCompletionTemplates'); } @override @@ -7738,7 +7738,7 @@ class ExecutionDeleteContextResult implements ResponseResult { @override Response toResponse(String id) { - return Response(id, result: null); + return Response(id); } @override @@ -8418,7 +8418,7 @@ class ExecutionSetSubscriptionsResult implements ResponseResult { @override Response toResponse(String id) { - return Response(id, result: null); + return Response(id); } @override @@ -10078,7 +10078,7 @@ class FlutterSetSubscriptionsResult implements ResponseResult { @override Response toResponse(String id) { - return Response(id, result: null); + return Response(id); } @override @@ -14773,7 +14773,7 @@ class ServerCancelRequestResult implements ResponseResult { @override Response toResponse(String id) { - return Response(id, result: null); + return Response(id); } @override @@ -14959,7 +14959,7 @@ class ServerGetVersionParams implements RequestParams { @override Request toRequest(String id) { - return Request(id, 'server.getVersion', null); + return Request(id, 'server.getVersion'); } @override @@ -15332,7 +15332,7 @@ class ServerOpenUrlRequestResult implements ResponseResult { @override Response toResponse(String id) { - return Response(id, result: null); + return Response(id); } @override @@ -15504,7 +15504,7 @@ class ServerSetClientCapabilitiesResult implements ResponseResult { @override Response toResponse(String id) { - return Response(id, result: null); + return Response(id); } @override @@ -15591,7 +15591,7 @@ class ServerSetSubscriptionsResult implements ResponseResult { @override Response toResponse(String id) { - return Response(id, result: null); + return Response(id); } @override @@ -15775,7 +15775,7 @@ class ServerShutdownParams implements RequestParams { @override Request toRequest(String id) { - return Request(id, 'server.shutdown', null); + return Request(id, 'server.shutdown'); } @override @@ -15794,7 +15794,7 @@ class ServerShutdownResult implements ResponseResult { @override Response toResponse(String id) { - return Response(id, result: null); + return Response(id); } @override diff --git a/pkg/analyzer_plugin/lib/protocol/protocol_generated.dart b/pkg/analyzer_plugin/lib/protocol/protocol_generated.dart index 4a4773e490e..0321b03f60c 100644 --- a/pkg/analyzer_plugin/lib/protocol/protocol_generated.dart +++ b/pkg/analyzer_plugin/lib/protocol/protocol_generated.dart @@ -524,7 +524,7 @@ class AnalysisHandleWatchEventsResult implements ResponseResult { @override Response toResponse(String id, int requestTime) { - return Response(id, requestTime, result: null); + return Response(id, requestTime); } @override @@ -1038,7 +1038,7 @@ class AnalysisSetContextRootsResult implements ResponseResult { @override Response toResponse(String id, int requestTime) { - return Response(id, requestTime, result: null); + return Response(id, requestTime); } @override @@ -1120,7 +1120,7 @@ class AnalysisSetPriorityFilesResult implements ResponseResult { @override Response toResponse(String id, int requestTime) { - return Response(id, requestTime, result: null); + return Response(id, requestTime); } @override @@ -1213,7 +1213,7 @@ class AnalysisSetSubscriptionsResult implements ResponseResult { @override Response toResponse(String id, int requestTime) { - return Response(id, requestTime, result: null); + return Response(id, requestTime); } @override @@ -1306,7 +1306,7 @@ class AnalysisUpdateContentResult implements ResponseResult { @override Response toResponse(String id, int requestTime) { - return Response(id, requestTime, result: null); + return Response(id, requestTime); } @override @@ -3349,7 +3349,7 @@ class PluginShutdownParams implements RequestParams { @override Request toRequest(String id) { - return Request(id, 'plugin.shutdown', null); + return Request(id, 'plugin.shutdown'); } @override @@ -3368,7 +3368,7 @@ class PluginShutdownResult implements ResponseResult { @override Response toResponse(String id, int requestTime) { - return Response(id, requestTime, result: null); + return Response(id, requestTime); } @override diff --git a/pkg/analyzer_plugin/tool/spec/codegen_dart_protocol.dart b/pkg/analyzer_plugin/tool/spec/codegen_dart_protocol.dart index 68c735c45fc..f5f72f8cad4 100644 --- a/pkg/analyzer_plugin/tool/spec/codegen_dart_protocol.dart +++ b/pkg/analyzer_plugin/tool/spec/codegen_dart_protocol.dart @@ -915,8 +915,11 @@ class CodegenProtocolVisitor extends DartCodegenVisitor with CodeGenerator { indent(() { var methodString = literalString((impliedType.apiNode as Request).longMethod); - var jsonPart = impliedType.type != null ? 'toJson()' : 'null'; - writeln('return Request(id, $methodString, $jsonPart);'); + if (impliedType.type != null) { + writeln('return Request(id, $methodString, toJson());'); + } else { + writeln('return Request(id, $methodString);'); + } }); writeln('}'); return true; @@ -935,11 +938,18 @@ class CodegenProtocolVisitor extends DartCodegenVisitor with CodeGenerator { writeln('Response toResponse(String id) {'); } indent(() { - var jsonPart = impliedType.type != null ? 'toJson()' : 'null'; - if (responseRequiresRequestTime) { - writeln('return Response(id, requestTime, result: $jsonPart);'); + if (impliedType.type != null) { + if (responseRequiresRequestTime) { + writeln('return Response(id, requestTime, result: toJson());'); + } else { + writeln('return Response(id, result: toJson());'); + } } else { - writeln('return Response(id, result: $jsonPart);'); + if (responseRequiresRequestTime) { + writeln('return Response(id, requestTime);'); + } else { + writeln('return Response(id);'); + } } }); writeln('}');