DAS: rename constants to use lowerCamelCase
Change-Id: If3f23ffc275171c67d0dc9cab3ee4abb7c5bc117
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/461181
Reviewed-by: Keerti Parthasarathy <keertip@google.com>
Commit-Queue: Samuel Rawlins <srawlins@google.com>
diff --git a/pkg/analysis_server/integration_test/support/integration_tests.dart b/pkg/analysis_server/integration_test/support/integration_tests.dart
index d661fe7..ec06565 100644
--- a/pkg/analysis_server/integration_test/support/integration_tests.dart
+++ b/pkg/analysis_server/integration_test/support/integration_tests.dart
@@ -110,7 +110,7 @@
with MockPackagesMixin, ConfigurationFilesMixin {
/// Amount of time to give the server to respond to a shutdown request before
/// forcibly terminating it.
- static const Duration SHUTDOWN_TIMEOUT = Duration(seconds: 60);
+ static const Duration shutdownTimeout = Duration(seconds: 60);
/// Connection to the analysis server.
@override
@@ -287,7 +287,7 @@
// doesn't exit, then forcibly terminate it.
sendServerShutdown();
return server.exitCode.timeout(
- SHUTDOWN_TIMEOUT,
+ shutdownTimeout,
onTimeout: () {
// The integer value of the exit code isn't used, but we have to return
// an integer to keep the typing correct.
diff --git a/pkg/analysis_server/lib/src/analysis_server.dart b/pkg/analysis_server/lib/src/analysis_server.dart
index f7f404e..1735c2a 100644
--- a/pkg/analysis_server/lib/src/analysis_server.dart
+++ b/pkg/analysis_server/lib/src/analysis_server.dart
@@ -572,12 +572,12 @@
bool registerExperimentalHandlers = false,
}) async {
switch (dtd?.state) {
- case DtdConnectionState.Connecting || DtdConnectionState.Connected:
+ case DtdConnectionState.connecting || DtdConnectionState.connected:
return lsp.error(
lsp.ServerErrorCodes.stateError,
'Server is already connected to DTD',
);
- case DtdConnectionState.Disconnected || DtdConnectionState.Error || null:
+ case DtdConnectionState.disconnected || DtdConnectionState.error || null:
var connectResult = await DtdServices.connect(
this,
dtdUri,
diff --git a/pkg/analysis_server/lib/src/plugin/plugin_isolate.dart b/pkg/analysis_server/lib/src/plugin/plugin_isolate.dart
index 4b555d9..375faac 100644
--- a/pkg/analysis_server/lib/src/plugin/plugin_isolate.dart
+++ b/pkg/analysis_server/lib/src/plugin/plugin_isolate.dart
@@ -239,11 +239,11 @@
class PluginSession {
/// The maximum number of milliseconds that server should wait for a response
/// from a plugin before deciding that the plugin is hung.
- static const Duration MAXIMUM_RESPONSE_TIME = Duration(minutes: 2);
+ static const Duration _maximumResponseTime = Duration(minutes: 2);
/// The length of time to wait after sending a 'plugin.shutdown' request
/// before a failure to terminate will cause the isolate to be killed.
- static const Duration WAIT_FOR_SHUTDOWN_DURATION = Duration(seconds: 10);
+ static const Duration _waitForShutdownDuration = Duration(seconds: 10);
/// The information about the plugin being executed.
final PluginIsolate _isolate;
@@ -349,7 +349,7 @@
// identify non-responsive plugins and kill them.
var cutOffTime =
DateTime.now().millisecondsSinceEpoch -
- MAXIMUM_RESPONSE_TIME.inMilliseconds;
+ _maximumResponseTime.inMilliseconds;
for (var requestData in pendingRequests.values) {
if (requestData.requestTime < cutOffTime) {
return true;
@@ -476,7 +476,7 @@
throw StateError('Cannot stop a plugin that is not running.');
}
sendRequest(PluginShutdownParams());
- Future.delayed(WAIT_FOR_SHUTDOWN_DURATION, () {
+ Future.delayed(_waitForShutdownDuration, () {
if (channel != null) {
channel?.kill();
channel = null;
diff --git a/pkg/analysis_server/lib/src/server/http_server.dart b/pkg/analysis_server/lib/src/server/http_server.dart
index cc68c34..7d0bd8c 100644
--- a/pkg/analysis_server/lib/src/server/http_server.dart
+++ b/pkg/analysis_server/lib/src/server/http_server.dart
@@ -27,7 +27,7 @@
/// - serves diagnostic information as html pages
class HttpAnalysisServer {
/// Number of lines of print output to capture.
- static const int MAX_PRINT_BUFFER_LENGTH = 1000;
+ static const int _maxPrintBufferLength = 1000;
/// An object that can handle either a WebSocket connection or a connection
/// to the client over stdio.
@@ -62,11 +62,8 @@
/// Record that the given line was printed out by the analysis server.
void recordPrint(String line) {
_printBuffer.add(line);
- if (_printBuffer.length > MAX_PRINT_BUFFER_LENGTH) {
- _printBuffer.removeRange(
- 0,
- _printBuffer.length - MAX_PRINT_BUFFER_LENGTH,
- );
+ if (_printBuffer.length > _maxPrintBufferLength) {
+ _printBuffer.removeRange(0, _printBuffer.length - _maxPrintBufferLength);
}
}
diff --git a/pkg/analysis_server/lib/src/services/completion/dart/utilities.dart b/pkg/analysis_server/lib/src/services/completion/dart/utilities.dart
index 206085a..7e7e665 100644
--- a/pkg/analysis_server/lib/src/services/completion/dart/utilities.dart
+++ b/pkg/analysis_server/lib/src/services/completion/dart/utilities.dart
@@ -20,7 +20,7 @@
show Element, ElementKind;
/// The name of the type `dynamic`;
-const DYNAMIC = 'dynamic';
+const _dynamicName = 'dynamic';
/// Sort by relevance first, highest to lowest, and then by the completion
/// alphabetically.
@@ -249,7 +249,7 @@
DartType type;
var element = identifier.element;
if (element == null) {
- return DYNAMIC;
+ return _dynamicName;
} else if (element is FunctionTypedElement) {
if (element is PropertyAccessorElement && element is SetterElement) {
return null;
@@ -273,7 +273,7 @@
if (declaredType is NamedType) {
return declaredType.qualifiedName;
}
- return DYNAMIC;
+ return _dynamicName;
}
return type.getDisplayString();
}
diff --git a/pkg/analysis_server/lib/src/services/correction/fix/pubspec/fix_kind.dart b/pkg/analysis_server/lib/src/services/correction/fix/pubspec/fix_kind.dart
index 105b025..989045d 100644
--- a/pkg/analysis_server/lib/src/services/correction/fix/pubspec/fix_kind.dart
+++ b/pkg/analysis_server/lib/src/services/correction/fix/pubspec/fix_kind.dart
@@ -8,16 +8,16 @@
abstract final class PubspecFixKind {
static const addName = FixKind(
'pubspec.fix.add.name',
- PubspecFixKindPriority.DEFAULT,
+ PubspecFixKindPriority._default,
"Add 'name' key",
);
static const addDependency = FixKind(
'pubspec.fix.add.dependency',
- PubspecFixKindPriority.DEFAULT,
+ PubspecFixKindPriority._default,
'Update pubspec with the missing dependencies',
);
}
abstract final class PubspecFixKindPriority {
- static const int DEFAULT = 50;
+ static const int _default = 50;
}
diff --git a/pkg/analysis_server/lib/src/services/dart_tooling_daemon/dtd_services.dart b/pkg/analysis_server/lib/src/services/dart_tooling_daemon/dtd_services.dart
index 673be2f..adc535d 100644
--- a/pkg/analysis_server/lib/src/services/dart_tooling_daemon/dtd_services.dart
+++ b/pkg/analysis_server/lib/src/services/dart_tooling_daemon/dtd_services.dart
@@ -21,16 +21,16 @@
/// The state of the connection to DTD.
enum DtdConnectionState {
/// A connection is being made or initialization is in progress.
- Connecting,
+ connecting,
/// The connection is available to use.
- Connected,
+ connected,
/// The connection is closing or closed.
- Disconnected,
+ disconnected,
/// A fatal error occurred setting up the connection to DTD.
- Error,
+ error,
}
/// A connection to DTD that exposes some analysis services (such as a subset
@@ -49,7 +49,7 @@
/// A raw connection to the Dart Tooling Daemon.
DartToolingDaemon? _dtd;
- DtdConnectionState _state = DtdConnectionState.Connecting;
+ DtdConnectionState _state = DtdConnectionState.connecting;
/// Whether to register experimental LSP handlers over DTD.
final bool registerExperimentalHandlers;
@@ -110,7 +110,7 @@
}
/// Closes the connection to DTD and cleans up.
- void _close([DtdConnectionState state = DtdConnectionState.Disconnected]) {
+ void _close([DtdConnectionState state = DtdConnectionState.disconnected]) {
_state = state;
// This code may have been closed because the connection closed, or it might
@@ -206,7 +206,7 @@
['Failed to connect to/initialize DTD:', error, ?stack].join('\n'),
);
- _close(DtdConnectionState.Error);
+ _close(DtdConnectionState.error);
}
/// Registers any request handlers provided by the server handler [handler]
diff --git a/pkg/analysis_server/lib/src/services/refactoring/legacy/extract_local.dart b/pkg/analysis_server/lib/src/services/refactoring/legacy/extract_local.dart
index 41a4ccf..e53ac46 100644
--- a/pkg/analysis_server/lib/src/services/refactoring/legacy/extract_local.dart
+++ b/pkg/analysis_server/lib/src/services/refactoring/legacy/extract_local.dart
@@ -27,7 +27,7 @@
import 'package:analyzer/src/utilities/dot_shorthands.dart';
import 'package:analyzer_plugin/utilities/range_factory.dart';
-const String _TOKEN_SEPARATOR = '\uFFFF';
+const String _tokenSeparator = '\uFFFF';
/// [ExtractLocalRefactoring] implementation.
class ExtractLocalRefactoringImpl extends RefactoringImpl
@@ -440,8 +440,8 @@
// done
return tokenString;
})
- .join(_TOKEN_SEPARATOR);
- return result + _TOKEN_SEPARATOR;
+ .join(_tokenSeparator);
+ return result + _tokenSeparator;
}
/// Return the [AstNode] to defined the variable before.
diff --git a/pkg/analysis_server/lib/src/services/refactoring/legacy/naming_conventions.dart b/pkg/analysis_server/lib/src/services/refactoring/legacy/naming_conventions.dart
index d7910a9..b3228bd 100644
--- a/pkg/analysis_server/lib/src/services/refactoring/legacy/naming_conventions.dart
+++ b/pkg/analysis_server/lib/src/services/refactoring/legacy/naming_conventions.dart
@@ -179,8 +179,7 @@
// invalid characters
for (var i = 0; i < length; i++) {
var currentChar = identifier.codeUnitAt(i);
- if (!currentChar.isLetterOrDigitOrUnderscore &&
- currentChar != CHAR_DOLLAR) {
+ if (!currentChar.isLetterOrDigitOrUnderscore && currentChar != charDollar) {
var charStr = String.fromCharCode(currentChar);
var message = "$desc must not contain '$charStr'.";
return RefactoringStatus.fatal(message);
@@ -189,8 +188,8 @@
// first character
var currentChar = identifier.codeUnitAt(0);
if (!currentChar.isLetter &&
- currentChar != CHAR_UNDERSCORE &&
- currentChar != CHAR_DOLLAR) {
+ currentChar != charUnderscore &&
+ currentChar != charDollar) {
var message = '$desc must begin with $beginDesc.';
return RefactoringStatus.fatal(message);
}
@@ -216,11 +215,11 @@
return status;
}
// is private, OK
- if (identifier.codeUnitAt(0) == CHAR_UNDERSCORE) {
+ if (identifier.codeUnitAt(0) == charUnderscore) {
return RefactoringStatus();
}
// leading $, OK
- if (identifier.codeUnitAt(0) == CHAR_DOLLAR) {
+ if (identifier.codeUnitAt(0) == charDollar) {
return RefactoringStatus();
}
// does not start with lower case
@@ -245,11 +244,11 @@
return status;
}
// is private, OK
- if (identifier.codeUnitAt(0) == CHAR_UNDERSCORE) {
+ if (identifier.codeUnitAt(0) == charUnderscore) {
return RefactoringStatus();
}
// leading $, OK
- if (identifier.codeUnitAt(0) == CHAR_DOLLAR) {
+ if (identifier.codeUnitAt(0) == charDollar) {
return RefactoringStatus();
}
// does not start with upper case
diff --git a/pkg/analysis_server/lib/src/services/refactoring/legacy/refactoring_manager.dart b/pkg/analysis_server/lib/src/services/refactoring/legacy/refactoring_manager.dart
index 843c59c..79167af 100644
--- a/pkg/analysis_server/lib/src/services/refactoring/legacy/refactoring_manager.dart
+++ b/pkg/analysis_server/lib/src/services/refactoring/legacy/refactoring_manager.dart
@@ -40,7 +40,7 @@
/// Once new set of parameters is received, the previous [Refactoring] instance
/// is invalidated and a new one is created and initialized.
class RefactoringManager {
- static const List<RefactoringProblem> EMPTY_PROBLEM_LIST =
+ static const List<RefactoringProblem> _emptyProblemList =
<RefactoringProblem>[];
final LegacyAnalysisServer server;
@@ -104,9 +104,9 @@
// prepare for processing the request
this.request = request;
var result = this.result = EditGetRefactoringResult(
- EMPTY_PROBLEM_LIST,
- EMPTY_PROBLEM_LIST,
- EMPTY_PROBLEM_LIST,
+ _emptyProblemList,
+ _emptyProblemList,
+ _emptyProblemList,
);
// process the request
diff --git a/pkg/analysis_server/lib/src/utilities/strings.dart b/pkg/analysis_server/lib/src/utilities/strings.dart
index 25968df..4bc4d23 100644
--- a/pkg/analysis_server/lib/src/utilities/strings.dart
+++ b/pkg/analysis_server/lib/src/utilities/strings.dart
@@ -7,10 +7,10 @@
import 'package:analyzer/src/utilities/extensions/string.dart';
/// "$"
-const int CHAR_DOLLAR = 0x24;
+const int charDollar = 0x24;
/// "_"
-const int CHAR_UNDERSCORE = 0x5F;
+const int charUnderscore = 0x5F;
String? capitalize(String? str) {
if (str == null || str.isEmpty) {
diff --git a/pkg/analysis_server/test/completion_test_support.dart b/pkg/analysis_server/test/completion_test_support.dart
index 0db77aa..7f25ece 100644
--- a/pkg/analysis_server/test/completion_test_support.dart
+++ b/pkg/analysis_server/test/completion_test_support.dart
@@ -11,7 +11,7 @@
/// A base class for classes containing completion tests.
abstract class CompletionTestCase extends AbstractCompletionDomainTest {
- static const String CURSOR_MARKER = '!';
+ static const String _cursorMarker = '!';
List<String> get suggestedCompletions => suggestions
.map((CompletionSuggestion suggestion) => suggestion.completion)
@@ -23,14 +23,14 @@
bool? isDeprecated,
Matcher? libraryUri,
}) {
- var expectedOffset = completion.indexOf(CURSOR_MARKER);
+ var expectedOffset = completion.indexOf(_cursorMarker);
if (expectedOffset >= 0) {
- if (completion.contains(CURSOR_MARKER, expectedOffset + 1)) {
+ if (completion.contains(_cursorMarker, expectedOffset + 1)) {
fail(
"Invalid completion, contains multiple cursor positions: '$completion'",
);
}
- completion = completion.replaceFirst(CURSOR_MARKER, '');
+ completion = completion.replaceFirst(_cursorMarker, '');
} else {
expectedOffset = completion.length;
}
diff --git a/pkg/analysis_server/test/timing/timing_framework.dart b/pkg/analysis_server/test/timing/timing_framework.dart
index ec0e229..23cfe95 100644
--- a/pkg/analysis_server/test/timing/timing_framework.dart
+++ b/pkg/analysis_server/test/timing/timing_framework.dart
@@ -98,20 +98,14 @@
/// the time required to perform some sequence of server operations.
abstract class TimingTest extends IntegrationTest {
/// The number of times the test will be performed in order to warm up the VM.
- static final int DEFAULT_WARMUP_COUNT = 10;
+ static const int _defaultWarmupCount = 10;
/// The number of times the test will be performed in order to compute a time.
- static final int DEFAULT_TIMING_COUNT = 10;
-
- /// The file suffix used to identify Dart files.
- static final String DART_SUFFIX = '.dart';
-
- /// The file suffix used to identify HTML files.
- static final String HTML_SUFFIX = '.html';
+ static const int _defaultTimingCount = 10;
/// The amount of time to give the server to respond to a shutdown request
/// before forcibly terminating it.
- static const Duration SHUTDOWN_TIMEOUT = Duration(seconds: 5);
+ static const Duration _shutdownTimeout = Duration(seconds: 5);
/// The connection to the analysis server.
@override
@@ -127,11 +121,11 @@
/// Return the number of iterations that should be performed in order to
/// compute a time.
- int get timingCount => DEFAULT_TIMING_COUNT;
+ int get timingCount => _defaultTimingCount;
/// Return the number of iterations that should be performed in order to warm
/// up the VM.
- int get warmupCount => DEFAULT_WARMUP_COUNT;
+ int get warmupCount => _defaultWarmupCount;
/// Perform any operations that need to be performed once before any
/// iterations.
@@ -240,7 +234,7 @@
// doesn't exit, then forcibly terminate it.
sendServerShutdown();
return server.exitCode.timeout(
- SHUTDOWN_TIMEOUT,
+ _shutdownTimeout,
onTimeout: () {
return server.kill('server failed to exit');
},
diff --git a/pkg/analysis_server/tool/benchmark_tools/big_chain_benchmark/benchmark_utils.dart b/pkg/analysis_server/tool/benchmark_tools/big_chain_benchmark/benchmark_utils.dart
index dabe1ec..023be2e 100644
--- a/pkg/analysis_server/tool/benchmark_tools/big_chain_benchmark/benchmark_utils.dart
+++ b/pkg/analysis_server/tool/benchmark_tools/big_chain_benchmark/benchmark_utils.dart
@@ -50,23 +50,23 @@
String import = "import '$nextFile' as nextFile;";
String export = "export '$nextFile';";
switch (copyType) {
- case CodeType.ImportCycle:
+ case CodeType.importCycle:
export = '';
- case CodeType.ImportChain:
+ case CodeType.importChain:
export = '';
if (i == numFiles) {
import = '';
}
- case CodeType.ImportExportChain:
+ case CodeType.importExportChain:
if (i == numFiles) {
import = '';
export = '';
}
- case CodeType.ImportCycleExportChain:
+ case CodeType.importCycleExportChain:
if (i == numFiles) {
export = '';
}
- case CodeType.ImportExportCycle:
+ case CodeType.importExportCycle:
// As default values.
}
@@ -241,11 +241,11 @@
}
enum CodeType {
- ImportCycle,
- ImportChain,
- ImportExportCycle,
- ImportExportChain,
- ImportCycleExportChain,
+ importCycle,
+ importChain,
+ importExportCycle,
+ importExportChain,
+ importCycleExportChain,
}
class FileContentPair {
diff --git a/pkg/analysis_server/tool/benchmark_tools/big_chain_benchmark/legacy_get_fixes_on_error.dart b/pkg/analysis_server/tool/benchmark_tools/big_chain_benchmark/legacy_get_fixes_on_error.dart
index 5fc04e4..a2b91d0 100644
--- a/pkg/analysis_server/tool/benchmark_tools/big_chain_benchmark/legacy_get_fixes_on_error.dart
+++ b/pkg/analysis_server/tool/benchmark_tools/big_chain_benchmark/legacy_get_fixes_on_error.dart
@@ -35,7 +35,7 @@
) : super(useLspProtocol: false);
@override
- LaunchFrom get launchFrom => LaunchFrom.Dart;
+ LaunchFrom get launchFrom => LaunchFrom.dart;
@override
Future<void> afterInitialization() async {
diff --git a/pkg/analysis_server/tool/benchmark_tools/big_chain_benchmark/legacy_many_files_in_flutter_set_subscriptions.dart b/pkg/analysis_server/tool/benchmark_tools/big_chain_benchmark/legacy_many_files_in_flutter_set_subscriptions.dart
index c4657d12..2f7cfad 100644
--- a/pkg/analysis_server/tool/benchmark_tools/big_chain_benchmark/legacy_many_files_in_flutter_set_subscriptions.dart
+++ b/pkg/analysis_server/tool/benchmark_tools/big_chain_benchmark/legacy_many_files_in_flutter_set_subscriptions.dart
@@ -50,7 +50,7 @@
) : super(useLspProtocol: false);
@override
- LaunchFrom get launchFrom => LaunchFrom.Dart;
+ LaunchFrom get launchFrom => LaunchFrom.dart;
@override
Future<void> afterInitialization() async {
diff --git a/pkg/analysis_server/tool/benchmark_tools/big_chain_benchmark/legacy_many_get_fixes_and_get_assists_requests.dart b/pkg/analysis_server/tool/benchmark_tools/big_chain_benchmark/legacy_many_get_fixes_and_get_assists_requests.dart
index a8b7911..075901a 100644
--- a/pkg/analysis_server/tool/benchmark_tools/big_chain_benchmark/legacy_many_get_fixes_and_get_assists_requests.dart
+++ b/pkg/analysis_server/tool/benchmark_tools/big_chain_benchmark/legacy_many_get_fixes_and_get_assists_requests.dart
@@ -45,7 +45,7 @@
) : super(useLspProtocol: false);
@override
- LaunchFrom get launchFrom => LaunchFrom.Dart;
+ LaunchFrom get launchFrom => LaunchFrom.dart;
@override
Future<void> afterInitialization() async {
diff --git a/pkg/analysis_server/tool/benchmark_tools/big_chain_benchmark/legacy_many_hover_requests.dart b/pkg/analysis_server/tool/benchmark_tools/big_chain_benchmark/legacy_many_hover_requests.dart
index 1f45cc2..f419031 100644
--- a/pkg/analysis_server/tool/benchmark_tools/big_chain_benchmark/legacy_many_hover_requests.dart
+++ b/pkg/analysis_server/tool/benchmark_tools/big_chain_benchmark/legacy_many_hover_requests.dart
@@ -40,7 +40,7 @@
) : super(useLspProtocol: false);
@override
- LaunchFrom get launchFrom => LaunchFrom.Dart;
+ LaunchFrom get launchFrom => LaunchFrom.dart;
@override
Future<void> afterInitialization() async {
diff --git a/pkg/analysis_server/tool/benchmark_tools/big_chain_benchmark/legacy_typing_temporary_missing_end_brace.dart b/pkg/analysis_server/tool/benchmark_tools/big_chain_benchmark/legacy_typing_temporary_missing_end_brace.dart
index a6fc45c..84ba9ea 100644
--- a/pkg/analysis_server/tool/benchmark_tools/big_chain_benchmark/legacy_typing_temporary_missing_end_brace.dart
+++ b/pkg/analysis_server/tool/benchmark_tools/big_chain_benchmark/legacy_typing_temporary_missing_end_brace.dart
@@ -44,7 +44,7 @@
) : super(useLspProtocol: false);
@override
- LaunchFrom get launchFrom => LaunchFrom.Dart;
+ LaunchFrom get launchFrom => LaunchFrom.dart;
@override
Future<void> afterInitialization() async {
diff --git a/pkg/analysis_server/tool/benchmark_tools/big_chain_benchmark/legacy_with_plugin_that_times_out.dart b/pkg/analysis_server/tool/benchmark_tools/big_chain_benchmark/legacy_with_plugin_that_times_out.dart
index 8e8ce2c..7ed771b 100644
--- a/pkg/analysis_server/tool/benchmark_tools/big_chain_benchmark/legacy_with_plugin_that_times_out.dart
+++ b/pkg/analysis_server/tool/benchmark_tools/big_chain_benchmark/legacy_with_plugin_that_times_out.dart
@@ -39,7 +39,7 @@
) : super(useLspProtocol: false);
@override
- LaunchFrom get launchFrom => LaunchFrom.Dart;
+ LaunchFrom get launchFrom => LaunchFrom.dart;
@override
Future<void> afterInitialization() async {
diff --git a/pkg/analysis_server/tool/benchmark_tools/big_chain_benchmark/lsp_completion_after_change.dart b/pkg/analysis_server/tool/benchmark_tools/big_chain_benchmark/lsp_completion_after_change.dart
index 6a2a0e8..ea99f6d 100644
--- a/pkg/analysis_server/tool/benchmark_tools/big_chain_benchmark/lsp_completion_after_change.dart
+++ b/pkg/analysis_server/tool/benchmark_tools/big_chain_benchmark/lsp_completion_after_change.dart
@@ -36,7 +36,7 @@
) : super(useLspProtocol: true);
@override
- LaunchFrom get launchFrom => LaunchFrom.Dart;
+ LaunchFrom get launchFrom => LaunchFrom.dart;
@override
Future<void> afterInitialization() async {
diff --git a/pkg/analysis_server/tool/benchmark_tools/big_chain_benchmark/lsp_typing_temporarily_missing_end_brace_in_string_interpolation.dart b/pkg/analysis_server/tool/benchmark_tools/big_chain_benchmark/lsp_typing_temporarily_missing_end_brace_in_string_interpolation.dart
index 6878984..6266a46 100644
--- a/pkg/analysis_server/tool/benchmark_tools/big_chain_benchmark/lsp_typing_temporarily_missing_end_brace_in_string_interpolation.dart
+++ b/pkg/analysis_server/tool/benchmark_tools/big_chain_benchmark/lsp_typing_temporarily_missing_end_brace_in_string_interpolation.dart
@@ -49,7 +49,7 @@
) : super(useLspProtocol: true);
@override
- LaunchFrom get launchFrom => LaunchFrom.Dart;
+ LaunchFrom get launchFrom => LaunchFrom.dart;
@override
Future<void> afterInitialization() async {
diff --git a/pkg/analysis_server/tool/benchmark_tools/big_chain_benchmark/lsp_with_plugin_that_times_out.dart b/pkg/analysis_server/tool/benchmark_tools/big_chain_benchmark/lsp_with_plugin_that_times_out.dart
index b37ff3a..d990a0d 100644
--- a/pkg/analysis_server/tool/benchmark_tools/big_chain_benchmark/lsp_with_plugin_that_times_out.dart
+++ b/pkg/analysis_server/tool/benchmark_tools/big_chain_benchmark/lsp_with_plugin_that_times_out.dart
@@ -39,7 +39,7 @@
) : super(useLspProtocol: true);
@override
- LaunchFrom get launchFrom => LaunchFrom.Dart;
+ LaunchFrom get launchFrom => LaunchFrom.dart;
@override
Future<void> afterInitialization() async {
diff --git a/pkg/analysis_server/tool/benchmark_tools/language_server_benchmark.dart b/pkg/analysis_server/tool/benchmark_tools/language_server_benchmark.dart
index ca9104e..620d858 100644
--- a/pkg/analysis_server/tool/benchmark_tools/language_server_benchmark.dart
+++ b/pkg/analysis_server/tool/benchmark_tools/language_server_benchmark.dart
@@ -48,7 +48,7 @@
List<Uri> get additionalWorkspaceUris => const [];
Uri? get cacheFolder => null;
- LaunchFrom get launchFrom => LaunchFrom.Source;
+ LaunchFrom get launchFrom => LaunchFrom.source;
Uri get rootUri;
Future<void> afterInitialization();
@@ -264,7 +264,7 @@
}
switch (launchFrom) {
- case LaunchFrom.Source:
+ case LaunchFrom.source:
File serverFile = File.fromUri(
repoDir.resolve('pkg/analysis_server/bin/server.dart'),
);
@@ -282,7 +282,7 @@
'--port=9102',
...cacheFolderArgs,
]);
- case LaunchFrom.Dart:
+ case LaunchFrom.dart:
// TODO(jensj): Option of wrapping in `perf record -g` call.
p = await Process.start(executableToUse, [
'language-server',
@@ -290,8 +290,8 @@
'--port=9102',
...cacheFolderArgs,
]);
- case LaunchFrom.AotWithPerf:
- case LaunchFrom.Aot:
+ case LaunchFrom.aotWithPerf:
+ case LaunchFrom.aot:
File serverFile = File.fromUri(
repoDir.resolve('pkg/analysis_server/bin/server.aot'),
);
@@ -314,7 +314,7 @@
...cacheFolderArgs,
]);
- if (launchFrom == LaunchFrom.AotWithPerf) {
+ if (launchFrom == LaunchFrom.aotWithPerf) {
await Process.start('perf', [
'record',
'-p',
@@ -504,7 +504,7 @@
DurationInfo(this.name, this.duration);
}
-enum LaunchFrom { Source, Dart, Aot, AotWithPerf }
+enum LaunchFrom { source, dart, aot, aotWithPerf }
class MemoryInfo {
final String name;
diff --git a/pkg/analysis_server/tool/benchmark_tools/single_benchmarks/legacy_type_in_big_file_ask_for_completion.dart b/pkg/analysis_server/tool/benchmark_tools/single_benchmarks/legacy_type_in_big_file_ask_for_completion.dart
index a98591b..4be553b 100644
--- a/pkg/analysis_server/tool/benchmark_tools/single_benchmarks/legacy_type_in_big_file_ask_for_completion.dart
+++ b/pkg/analysis_server/tool/benchmark_tools/single_benchmarks/legacy_type_in_big_file_ask_for_completion.dart
@@ -85,7 +85,7 @@
) : super(useLspProtocol: false);
@override
- LaunchFrom get launchFrom => LaunchFrom.Dart;
+ LaunchFrom get launchFrom => LaunchFrom.dart;
@override
Future<void> afterInitialization() async {
diff --git a/pkg/analysis_server/tool/benchmark_tools/single_benchmarks/lsp_assist_other_file_could_add_late.dart b/pkg/analysis_server/tool/benchmark_tools/single_benchmarks/lsp_assist_other_file_could_add_late.dart
index 7ae6cdd..89cb4e5 100644
--- a/pkg/analysis_server/tool/benchmark_tools/single_benchmarks/lsp_assist_other_file_could_add_late.dart
+++ b/pkg/analysis_server/tool/benchmark_tools/single_benchmarks/lsp_assist_other_file_could_add_late.dart
@@ -89,7 +89,7 @@
: super(useLspProtocol: true);
@override
- LaunchFrom get launchFrom => LaunchFrom.Dart;
+ LaunchFrom get launchFrom => LaunchFrom.dart;
@override
Future<void> afterInitialization() async {
diff --git a/pkg/analysis_server/tool/benchmark_tools/single_benchmarks/lsp_change_requests_processing.dart b/pkg/analysis_server/tool/benchmark_tools/single_benchmarks/lsp_change_requests_processing.dart
index b8b3719..da011e9 100644
--- a/pkg/analysis_server/tool/benchmark_tools/single_benchmarks/lsp_change_requests_processing.dart
+++ b/pkg/analysis_server/tool/benchmark_tools/single_benchmarks/lsp_change_requests_processing.dart
@@ -84,7 +84,7 @@
) : super(useLspProtocol: true);
@override
- LaunchFrom get launchFrom => LaunchFrom.Dart;
+ LaunchFrom get launchFrom => LaunchFrom.dart;
@override
Future<void> afterInitialization() async {
diff --git a/pkg/analysis_server/tool/benchmark_tools/single_benchmarks/lsp_many_assist_calls.dart b/pkg/analysis_server/tool/benchmark_tools/single_benchmarks/lsp_many_assist_calls.dart
index 712e4c4..b4948e4 100644
--- a/pkg/analysis_server/tool/benchmark_tools/single_benchmarks/lsp_many_assist_calls.dart
+++ b/pkg/analysis_server/tool/benchmark_tools/single_benchmarks/lsp_many_assist_calls.dart
@@ -15,18 +15,18 @@
await runHelper(
args,
LspManyAssistCalls.new,
- createData,
+ _createData,
sizeOptions: [2000, 4000, 8000],
- extraIterations: getExtraIterations,
+ extraIterations: _getExtraIterations,
runAsLsp: true,
);
}
-RunDetails createData(
+RunDetails _createData(
Uri packageDirUri,
Uri outerDirForAdditionalData,
int size,
- LineEndings? lineEnding,
+ _LineEndings? lineEnding,
List<String> args, {
// unused
required dynamic extraInformation,
@@ -46,7 +46,7 @@
content.add(' }');
content.add('}');
}
- var lineEndingString = lineEnding == LineEndings.Windows ? '\r\n' : '\n';
+ var lineEndingString = lineEnding == _LineEndings.windows ? '\r\n' : '\n';
var contentString = content.join(lineEndingString);
File.fromUri(uri).writeAsStringSync(contentString);
return RunDetails(
@@ -55,14 +55,14 @@
);
}
-List<LineEndings> getExtraIterations(List<String> args) {
- var lineEndings = LineEndings.values;
+List<_LineEndings> _getExtraIterations(List<String> args) {
+ var lineEndings = _LineEndings.values;
for (String arg in args) {
if (arg.startsWith('--types=')) {
lineEndings = [];
for (var type in arg.substring('--types='.length).split(',')) {
type = type.toLowerCase();
- for (var value in LineEndings.values) {
+ for (var value in _LineEndings.values) {
if (value.name.toLowerCase().contains(type)) {
lineEndings.add(value);
}
@@ -80,8 +80,6 @@
FileContentPair(this.uri, this.content);
}
-enum LineEndings { Windows, Unix }
-
class LspManyAssistCalls extends DartLanguageServerBenchmark {
@override
final Uri rootUri;
@@ -98,7 +96,7 @@
) : super(useLspProtocol: true);
@override
- LaunchFrom get launchFrom => LaunchFrom.Dart;
+ LaunchFrom get launchFrom => LaunchFrom.dart;
@override
Future<void> afterInitialization() async {
@@ -159,3 +157,5 @@
RunDetails({required this.mainFile, required this.lineEnding});
}
+
+enum _LineEndings { windows, unix }
diff --git a/pkg/analysis_server/tool/benchmark_tools/single_benchmarks/lsp_many_prefer_single_quotes_violations_benchmark.dart b/pkg/analysis_server/tool/benchmark_tools/single_benchmarks/lsp_many_prefer_single_quotes_violations_benchmark.dart
index 673b877..4871fdc 100644
--- a/pkg/analysis_server/tool/benchmark_tools/single_benchmarks/lsp_many_prefer_single_quotes_violations_benchmark.dart
+++ b/pkg/analysis_server/tool/benchmark_tools/single_benchmarks/lsp_many_prefer_single_quotes_violations_benchmark.dart
@@ -89,7 +89,7 @@
) : super(useLspProtocol: true);
@override
- LaunchFrom get launchFrom => LaunchFrom.Dart;
+ LaunchFrom get launchFrom => LaunchFrom.dart;
@override
Future<void> afterInitialization() async {
diff --git a/pkg/analysis_server/tool/benchmark_tools/single_benchmarks/lsp_semantic_token_full_in_big_file.dart b/pkg/analysis_server/tool/benchmark_tools/single_benchmarks/lsp_semantic_token_full_in_big_file.dart
index 9083ce4..b011dce 100644
--- a/pkg/analysis_server/tool/benchmark_tools/single_benchmarks/lsp_semantic_token_full_in_big_file.dart
+++ b/pkg/analysis_server/tool/benchmark_tools/single_benchmarks/lsp_semantic_token_full_in_big_file.dart
@@ -77,7 +77,7 @@
) : super(useLspProtocol: true);
@override
- LaunchFrom get launchFrom => LaunchFrom.Dart;
+ LaunchFrom get launchFrom => LaunchFrom.dart;
@override
Future<void> afterInitialization() async {
diff --git a/pkg/analysis_server/tool/benchmark_tools/single_benchmarks/lsp_type_in_big_file.dart b/pkg/analysis_server/tool/benchmark_tools/single_benchmarks/lsp_type_in_big_file.dart
index 4c1ae94..5b73357 100644
--- a/pkg/analysis_server/tool/benchmark_tools/single_benchmarks/lsp_type_in_big_file.dart
+++ b/pkg/analysis_server/tool/benchmark_tools/single_benchmarks/lsp_type_in_big_file.dart
@@ -80,7 +80,7 @@
) : super(useLspProtocol: true);
@override
- LaunchFrom get launchFrom => LaunchFrom.Dart;
+ LaunchFrom get launchFrom => LaunchFrom.dart;
@override
Future<void> afterInitialization() async {
diff --git a/pkg/analysis_server/tool/benchmark_tools/single_benchmarks/lsp_type_in_big_file_ask_for_completion.dart b/pkg/analysis_server/tool/benchmark_tools/single_benchmarks/lsp_type_in_big_file_ask_for_completion.dart
index 80250a8..0c28c15 100644
--- a/pkg/analysis_server/tool/benchmark_tools/single_benchmarks/lsp_type_in_big_file_ask_for_completion.dart
+++ b/pkg/analysis_server/tool/benchmark_tools/single_benchmarks/lsp_type_in_big_file_ask_for_completion.dart
@@ -79,7 +79,7 @@
) : super(useLspProtocol: true);
@override
- LaunchFrom get launchFrom => LaunchFrom.Dart;
+ LaunchFrom get launchFrom => LaunchFrom.dart;
@override
Future<void> afterInitialization() async {
