diff --git a/pkg/analysis_server/benchmark/integration/input_converter.dart b/pkg/analysis_server/benchmark/integration/input_converter.dart index bbd3e8573b4..091c7296b88 100644 --- a/pkg/analysis_server/benchmark/integration/input_converter.dart +++ b/pkg/analysis_server/benchmark/integration/input_converter.dart @@ -63,7 +63,7 @@ abstract class CommonInputConverter extends Converter { /// Return an operation for the notification or `null` if none. Operation? convertNotification(Map json) { var event = json['event'] as String; - if (event == SERVER_NOTIFICATION_STATUS) { + if (event == serverNotificationStatus) { // {"event":"server.status","params":{"analysis":{"isAnalyzing":false}}} var params = asMap2(json['params']); if (params != null) { @@ -73,7 +73,7 @@ abstract class CommonInputConverter extends Converter { } } } - if (event == SERVER_NOTIFICATION_CONNECTED) { + if (event == serverNotificationConnected) { // {"event":"server.connected","params":{"version":"1.7.0"}} return StartServerOperation(); } @@ -90,7 +90,7 @@ abstract class CommonInputConverter extends Converter { var method = json['method'] as String; // Sanity check operations that modify source // to ensure that the operation is on source in temp space - if (method == ANALYSIS_REQUEST_UPDATE_CONTENT) { + if (method == analysisRequestUpdateContent) { // Track overlays in parallel with the analysis server // so that when an overlay is removed, the file can be updated on disk var request = Request.fromJson(json)!; @@ -125,24 +125,24 @@ abstract class CommonInputConverter extends Converter { } // TODO(danrubel): replace this with code // that just forwards the translated request - if (method == ANALYSIS_REQUEST_GET_HOVER || - method == ANALYSIS_REQUEST_SET_ANALYSIS_ROOTS || - method == ANALYSIS_REQUEST_SET_PRIORITY_FILES || - method == ANALYSIS_REQUEST_SET_SUBSCRIPTIONS || - method == ANALYSIS_REQUEST_UPDATE_OPTIONS || - method == EDIT_REQUEST_GET_ASSISTS || - method == EDIT_REQUEST_GET_AVAILABLE_REFACTORINGS || - method == EDIT_REQUEST_GET_FIXES || - method == EDIT_REQUEST_GET_REFACTORING || - method == EDIT_REQUEST_SORT_MEMBERS || - method == EXECUTION_REQUEST_CREATE_CONTEXT || - method == EXECUTION_REQUEST_DELETE_CONTEXT || - method == EXECUTION_REQUEST_MAP_URI || - method == EXECUTION_REQUEST_SET_SUBSCRIPTIONS || - method == SEARCH_REQUEST_FIND_ELEMENT_REFERENCES || - method == SEARCH_REQUEST_FIND_MEMBER_DECLARATIONS || - method == SERVER_REQUEST_GET_VERSION || - method == SERVER_REQUEST_SET_SUBSCRIPTIONS) { + if (method == analysisRequestGetHover || + method == analysisRequestSetAnalysisRoots || + method == analysisRequestSetPriorityFiles || + method == analysisRequestSetSubscriptions || + method == analysisRequestUpdateOptions || + method == editRequestGetAssists || + method == editRequestGetAvailableRefactorings || + method == editRequestGetFixes || + method == editRequestGetRefactoring || + method == editRequestSortMembers || + method == executionRequestCreateContext || + method == executionRequestDeleteContext || + method == executionRequestMapUri || + method == executionRequestSetSubscriptions || + method == searchRequestFindElementReferences || + method == searchRequestFindMemberDeclarations || + method == serverRequestGetVersion || + method == serverRequestSetSubscriptions) { return RequestOperation(this, json); } throw 'unknown request: $method\n $json'; diff --git a/pkg/analysis_server/integration_test/lsp/abstract_lsp_over_legacy.dart b/pkg/analysis_server/integration_test/lsp/abstract_lsp_over_legacy.dart index 6801bfd61cd..1c4386ccff0 100644 --- a/pkg/analysis_server/integration_test/lsp/abstract_lsp_over_legacy.dart +++ b/pkg/analysis_server/integration_test/lsp/abstract_lsp_over_legacy.dart @@ -48,7 +48,7 @@ abstract class AbstractLspOverLegacyTest @override Stream get requestsFromServer => serverToClientRequests - .where((request) => request.method == LSP_REQUEST_HANDLE) + .where((request) => request.method == lspRequestHandle) .map((request) { var params = LspHandleParams.fromRequest( request, diff --git a/pkg/analysis_server/integration_test/support/integration_tests.dart b/pkg/analysis_server/integration_test/support/integration_tests.dart index 7c6c1b5609c..d661fe7fd1b 100644 --- a/pkg/analysis_server/integration_test/support/integration_tests.dart +++ b/pkg/analysis_server/integration_test/support/integration_tests.dart @@ -7,7 +7,6 @@ import 'dart:collection'; import 'dart:convert'; import 'dart:io'; -import 'package:analysis_server/protocol/protocol_constants.dart'; import 'package:analysis_server/src/protocol_server.dart'; import 'package:analysis_server/src/services/pub/pub_command.dart'; import 'package:analyzer/file_system/physical_file_system.dart'; diff --git a/pkg/analysis_server/lib/protocol/protocol_constants.dart b/pkg/analysis_server/lib/protocol/protocol_constants.dart index 075a8956a86..bdb2eb2ac41 100644 --- a/pkg/analysis_server/lib/protocol/protocol_constants.dart +++ b/pkg/analysis_server/lib/protocol/protocol_constants.dart @@ -8,346 +8,332 @@ const String PROTOCOL_VERSION = '1.40.0'; -const String ANALYSIS_NOTIFICATION_ANALYZED_FILES = 'analysis.analyzedFiles'; -const String ANALYSIS_NOTIFICATION_ANALYZED_FILES_DIRECTORIES = 'directories'; -const String ANALYSIS_NOTIFICATION_CLOSING_LABELS = 'analysis.closingLabels'; -const String ANALYSIS_NOTIFICATION_CLOSING_LABELS_FILE = 'file'; -const String ANALYSIS_NOTIFICATION_CLOSING_LABELS_LABELS = 'labels'; -const String ANALYSIS_NOTIFICATION_ERRORS = 'analysis.errors'; -const String ANALYSIS_NOTIFICATION_ERRORS_ERRORS = 'errors'; -const String ANALYSIS_NOTIFICATION_ERRORS_FILE = 'file'; -const String ANALYSIS_NOTIFICATION_FLUSH_RESULTS = 'analysis.flushResults'; -const String ANALYSIS_NOTIFICATION_FLUSH_RESULTS_FILES = 'files'; -const String ANALYSIS_NOTIFICATION_FOLDING = 'analysis.folding'; -const String ANALYSIS_NOTIFICATION_FOLDING_FILE = 'file'; -const String ANALYSIS_NOTIFICATION_FOLDING_REGIONS = 'regions'; -const String ANALYSIS_NOTIFICATION_HIGHLIGHTS = 'analysis.highlights'; -const String ANALYSIS_NOTIFICATION_HIGHLIGHTS_FILE = 'file'; -const String ANALYSIS_NOTIFICATION_HIGHLIGHTS_REGIONS = 'regions'; -const String ANALYSIS_NOTIFICATION_IMPLEMENTED = 'analysis.implemented'; -const String ANALYSIS_NOTIFICATION_IMPLEMENTED_CLASSES = 'classes'; -const String ANALYSIS_NOTIFICATION_IMPLEMENTED_FILE = 'file'; -const String ANALYSIS_NOTIFICATION_IMPLEMENTED_MEMBERS = 'members'; -const String ANALYSIS_NOTIFICATION_INVALIDATE = 'analysis.invalidate'; -const String ANALYSIS_NOTIFICATION_INVALIDATE_DELTA = 'delta'; -const String ANALYSIS_NOTIFICATION_INVALIDATE_FILE = 'file'; -const String ANALYSIS_NOTIFICATION_INVALIDATE_LENGTH = 'length'; -const String ANALYSIS_NOTIFICATION_INVALIDATE_OFFSET = 'offset'; -const String ANALYSIS_NOTIFICATION_NAVIGATION = 'analysis.navigation'; -const String ANALYSIS_NOTIFICATION_NAVIGATION_FILE = 'file'; -const String ANALYSIS_NOTIFICATION_NAVIGATION_FILES = 'files'; -const String ANALYSIS_NOTIFICATION_NAVIGATION_REGIONS = 'regions'; -const String ANALYSIS_NOTIFICATION_NAVIGATION_TARGETS = 'targets'; -const String ANALYSIS_NOTIFICATION_OCCURRENCES = 'analysis.occurrences'; -const String ANALYSIS_NOTIFICATION_OCCURRENCES_FILE = 'file'; -const String ANALYSIS_NOTIFICATION_OCCURRENCES_OCCURRENCES = 'occurrences'; -const String ANALYSIS_NOTIFICATION_OUTLINE = 'analysis.outline'; -const String ANALYSIS_NOTIFICATION_OUTLINE_FILE = 'file'; -const String ANALYSIS_NOTIFICATION_OUTLINE_KIND = 'kind'; -const String ANALYSIS_NOTIFICATION_OUTLINE_LIBRARY_NAME = 'libraryName'; -const String ANALYSIS_NOTIFICATION_OUTLINE_OUTLINE = 'outline'; -const String ANALYSIS_NOTIFICATION_OVERRIDES = 'analysis.overrides'; -const String ANALYSIS_NOTIFICATION_OVERRIDES_FILE = 'file'; -const String ANALYSIS_NOTIFICATION_OVERRIDES_OVERRIDES = 'overrides'; -const String ANALYSIS_REQUEST_GET_ERRORS = 'analysis.getErrors'; -const String ANALYSIS_REQUEST_GET_ERRORS_FILE = 'file'; -const String ANALYSIS_REQUEST_GET_HOVER = 'analysis.getHover'; -const String ANALYSIS_REQUEST_GET_HOVER_FILE = 'file'; -const String ANALYSIS_REQUEST_GET_HOVER_OFFSET = 'offset'; -const String ANALYSIS_REQUEST_GET_IMPORTED_ELEMENTS = +const String analysisNotificationAnalyzedFiles = 'analysis.analyzedFiles'; +const String analysisNotificationAnalyzedFilesDirectories = 'directories'; +const String analysisNotificationClosingLabels = 'analysis.closingLabels'; +const String analysisNotificationClosingLabelsFile = 'file'; +const String analysisNotificationClosingLabelsLabels = 'labels'; +const String analysisNotificationErrors = 'analysis.errors'; +const String analysisNotificationErrorsErrors = 'errors'; +const String analysisNotificationErrorsFile = 'file'; +const String analysisNotificationFlushResults = 'analysis.flushResults'; +const String analysisNotificationFlushResultsFiles = 'files'; +const String analysisNotificationFolding = 'analysis.folding'; +const String analysisNotificationFoldingFile = 'file'; +const String analysisNotificationFoldingRegions = 'regions'; +const String analysisNotificationHighlights = 'analysis.highlights'; +const String analysisNotificationHighlightsFile = 'file'; +const String analysisNotificationHighlightsRegions = 'regions'; +const String analysisNotificationImplemented = 'analysis.implemented'; +const String analysisNotificationImplementedClasses = 'classes'; +const String analysisNotificationImplementedFile = 'file'; +const String analysisNotificationImplementedMembers = 'members'; +const String analysisNotificationInvalidate = 'analysis.invalidate'; +const String analysisNotificationInvalidateDelta = 'delta'; +const String analysisNotificationInvalidateFile = 'file'; +const String analysisNotificationInvalidateLength = 'length'; +const String analysisNotificationInvalidateOffset = 'offset'; +const String analysisNotificationNavigation = 'analysis.navigation'; +const String analysisNotificationNavigationFile = 'file'; +const String analysisNotificationNavigationFiles = 'files'; +const String analysisNotificationNavigationRegions = 'regions'; +const String analysisNotificationNavigationTargets = 'targets'; +const String analysisNotificationOccurrences = 'analysis.occurrences'; +const String analysisNotificationOccurrencesFile = 'file'; +const String analysisNotificationOccurrencesOccurrences = 'occurrences'; +const String analysisNotificationOutline = 'analysis.outline'; +const String analysisNotificationOutlineFile = 'file'; +const String analysisNotificationOutlineKind = 'kind'; +const String analysisNotificationOutlineLibraryName = 'libraryName'; +const String analysisNotificationOutlineOutline = 'outline'; +const String analysisNotificationOverrides = 'analysis.overrides'; +const String analysisNotificationOverridesFile = 'file'; +const String analysisNotificationOverridesOverrides = 'overrides'; +const String analysisRequestGetErrors = 'analysis.getErrors'; +const String analysisRequestGetErrorsFile = 'file'; +const String analysisRequestGetHover = 'analysis.getHover'; +const String analysisRequestGetHoverFile = 'file'; +const String analysisRequestGetHoverOffset = 'offset'; +const String analysisRequestGetImportedElements = 'analysis.getImportedElements'; -const String ANALYSIS_REQUEST_GET_IMPORTED_ELEMENTS_FILE = 'file'; -const String ANALYSIS_REQUEST_GET_IMPORTED_ELEMENTS_LENGTH = 'length'; -const String ANALYSIS_REQUEST_GET_IMPORTED_ELEMENTS_OFFSET = 'offset'; -const String ANALYSIS_REQUEST_GET_LIBRARY_DEPENDENCIES = +const String analysisRequestGetImportedElementsFile = 'file'; +const String analysisRequestGetImportedElementsLength = 'length'; +const String analysisRequestGetImportedElementsOffset = 'offset'; +const String analysisRequestGetLibraryDependencies = 'analysis.getLibraryDependencies'; -const String ANALYSIS_REQUEST_GET_NAVIGATION = 'analysis.getNavigation'; -const String ANALYSIS_REQUEST_GET_NAVIGATION_FILE = 'file'; -const String ANALYSIS_REQUEST_GET_NAVIGATION_LENGTH = 'length'; -const String ANALYSIS_REQUEST_GET_NAVIGATION_OFFSET = 'offset'; -const String ANALYSIS_REQUEST_GET_REACHABLE_SOURCES = +const String analysisRequestGetNavigation = 'analysis.getNavigation'; +const String analysisRequestGetNavigationFile = 'file'; +const String analysisRequestGetNavigationLength = 'length'; +const String analysisRequestGetNavigationOffset = 'offset'; +const String analysisRequestGetReachableSources = 'analysis.getReachableSources'; -const String ANALYSIS_REQUEST_GET_REACHABLE_SOURCES_FILE = 'file'; -const String ANALYSIS_REQUEST_GET_SIGNATURE = 'analysis.getSignature'; -const String ANALYSIS_REQUEST_GET_SIGNATURE_FILE = 'file'; -const String ANALYSIS_REQUEST_GET_SIGNATURE_OFFSET = 'offset'; -const String ANALYSIS_REQUEST_REANALYZE = 'analysis.reanalyze'; -const String ANALYSIS_REQUEST_SET_ANALYSIS_ROOTS = 'analysis.setAnalysisRoots'; -const String ANALYSIS_REQUEST_SET_ANALYSIS_ROOTS_EXCLUDED = 'excluded'; -const String ANALYSIS_REQUEST_SET_ANALYSIS_ROOTS_INCLUDED = 'included'; -const String ANALYSIS_REQUEST_SET_ANALYSIS_ROOTS_PACKAGE_ROOTS = 'packageRoots'; -const String ANALYSIS_REQUEST_SET_GENERAL_SUBSCRIPTIONS = +const String analysisRequestGetReachableSourcesFile = 'file'; +const String analysisRequestGetSignature = 'analysis.getSignature'; +const String analysisRequestGetSignatureFile = 'file'; +const String analysisRequestGetSignatureOffset = 'offset'; +const String analysisRequestReanalyze = 'analysis.reanalyze'; +const String analysisRequestSetAnalysisRoots = 'analysis.setAnalysisRoots'; +const String analysisRequestSetAnalysisRootsExcluded = 'excluded'; +const String analysisRequestSetAnalysisRootsIncluded = 'included'; +const String analysisRequestSetAnalysisRootsPackageRoots = 'packageRoots'; +const String analysisRequestSetGeneralSubscriptions = 'analysis.setGeneralSubscriptions'; -const String ANALYSIS_REQUEST_SET_GENERAL_SUBSCRIPTIONS_SUBSCRIPTIONS = +const String analysisRequestSetGeneralSubscriptionsSubscriptions = 'subscriptions'; -const String ANALYSIS_REQUEST_SET_PRIORITY_FILES = 'analysis.setPriorityFiles'; -const String ANALYSIS_REQUEST_SET_PRIORITY_FILES_FILES = 'files'; -const String ANALYSIS_REQUEST_SET_SUBSCRIPTIONS = 'analysis.setSubscriptions'; -const String ANALYSIS_REQUEST_SET_SUBSCRIPTIONS_SUBSCRIPTIONS = 'subscriptions'; -const String ANALYSIS_REQUEST_UPDATE_CONTENT = 'analysis.updateContent'; -const String ANALYSIS_REQUEST_UPDATE_CONTENT_FILES = 'files'; -const String ANALYSIS_REQUEST_UPDATE_OPTIONS = 'analysis.updateOptions'; -const String ANALYSIS_REQUEST_UPDATE_OPTIONS_OPTIONS = 'options'; -const String ANALYSIS_RESPONSE_GET_ERRORS_ERRORS = 'errors'; -const String ANALYSIS_RESPONSE_GET_HOVER_HOVERS = 'hovers'; -const String ANALYSIS_RESPONSE_GET_IMPORTED_ELEMENTS_ELEMENTS = 'elements'; -const String ANALYSIS_RESPONSE_GET_LIBRARY_DEPENDENCIES_LIBRARIES = 'libraries'; -const String ANALYSIS_RESPONSE_GET_LIBRARY_DEPENDENCIES_PACKAGE_MAP = - 'packageMap'; -const String ANALYSIS_RESPONSE_GET_NAVIGATION_FILES = 'files'; -const String ANALYSIS_RESPONSE_GET_NAVIGATION_REGIONS = 'regions'; -const String ANALYSIS_RESPONSE_GET_NAVIGATION_TARGETS = 'targets'; -const String ANALYSIS_RESPONSE_GET_REACHABLE_SOURCES_SOURCES = 'sources'; -const String ANALYSIS_RESPONSE_GET_SIGNATURE_DARTDOC = 'dartdoc'; -const String ANALYSIS_RESPONSE_GET_SIGNATURE_NAME = 'name'; -const String ANALYSIS_RESPONSE_GET_SIGNATURE_PARAMETERS = 'parameters'; -const String ANALYTICS_REQUEST_ENABLE = 'analytics.enable'; -const String ANALYTICS_REQUEST_ENABLE_VALUE = 'value'; -const String ANALYTICS_REQUEST_IS_ENABLED = 'analytics.isEnabled'; -const String ANALYTICS_REQUEST_SEND_EVENT = 'analytics.sendEvent'; -const String ANALYTICS_REQUEST_SEND_EVENT_ACTION = 'action'; -const String ANALYTICS_REQUEST_SEND_TIMING = 'analytics.sendTiming'; -const String ANALYTICS_REQUEST_SEND_TIMING_EVENT = 'event'; -const String ANALYTICS_REQUEST_SEND_TIMING_MILLIS = 'millis'; -const String ANALYTICS_RESPONSE_IS_ENABLED_ENABLED = 'enabled'; -const String COMPLETION_NOTIFICATION_EXISTING_IMPORTS = +const String analysisRequestSetPriorityFiles = 'analysis.setPriorityFiles'; +const String analysisRequestSetPriorityFilesFiles = 'files'; +const String analysisRequestSetSubscriptions = 'analysis.setSubscriptions'; +const String analysisRequestSetSubscriptionsSubscriptions = 'subscriptions'; +const String analysisRequestUpdateContent = 'analysis.updateContent'; +const String analysisRequestUpdateContentFiles = 'files'; +const String analysisRequestUpdateOptions = 'analysis.updateOptions'; +const String analysisRequestUpdateOptionsOptions = 'options'; +const String analysisResponseGetErrorsErrors = 'errors'; +const String analysisResponseGetHoverHovers = 'hovers'; +const String analysisResponseGetImportedElementsElements = 'elements'; +const String analysisResponseGetLibraryDependenciesLibraries = 'libraries'; +const String analysisResponseGetLibraryDependenciesPackageMap = 'packageMap'; +const String analysisResponseGetNavigationFiles = 'files'; +const String analysisResponseGetNavigationRegions = 'regions'; +const String analysisResponseGetNavigationTargets = 'targets'; +const String analysisResponseGetReachableSourcesSources = 'sources'; +const String analysisResponseGetSignatureDartdoc = 'dartdoc'; +const String analysisResponseGetSignatureName = 'name'; +const String analysisResponseGetSignatureParameters = 'parameters'; +const String analyticsRequestEnable = 'analytics.enable'; +const String analyticsRequestEnableValue = 'value'; +const String analyticsRequestIsEnabled = 'analytics.isEnabled'; +const String analyticsRequestSendEvent = 'analytics.sendEvent'; +const String analyticsRequestSendEventAction = 'action'; +const String analyticsRequestSendTiming = 'analytics.sendTiming'; +const String analyticsRequestSendTimingEvent = 'event'; +const String analyticsRequestSendTimingMillis = 'millis'; +const String analyticsResponseIsEnabledEnabled = 'enabled'; +const String completionNotificationExistingImports = 'completion.existingImports'; -const String COMPLETION_NOTIFICATION_EXISTING_IMPORTS_FILE = 'file'; -const String COMPLETION_NOTIFICATION_EXISTING_IMPORTS_IMPORTS = 'imports'; -const String COMPLETION_REQUEST_GET_SUGGESTIONS2 = 'completion.getSuggestions2'; -const String COMPLETION_REQUEST_GET_SUGGESTIONS2_COMPLETION_CASE_MATCHING_MODE = - 'completionCaseMatchingMode'; -const String COMPLETION_REQUEST_GET_SUGGESTIONS2_COMPLETION_MODE = - 'completionMode'; -const String COMPLETION_REQUEST_GET_SUGGESTIONS2_FILE = 'file'; -const String COMPLETION_REQUEST_GET_SUGGESTIONS2_INVOCATION_COUNT = - 'invocationCount'; -const String COMPLETION_REQUEST_GET_SUGGESTIONS2_MAX_RESULTS = 'maxResults'; -const String COMPLETION_REQUEST_GET_SUGGESTIONS2_OFFSET = 'offset'; -const String COMPLETION_REQUEST_GET_SUGGESTIONS2_TIMEOUT = 'timeout'; -const String COMPLETION_REQUEST_GET_SUGGESTION_DETAILS2 = +const String completionNotificationExistingImportsFile = 'file'; +const String completionNotificationExistingImportsImports = 'imports'; +const String completionRequestGetSuggestionDetails2 = 'completion.getSuggestionDetails2'; -const String COMPLETION_REQUEST_GET_SUGGESTION_DETAILS2_COMPLETION = - 'completion'; -const String COMPLETION_REQUEST_GET_SUGGESTION_DETAILS2_FILE = 'file'; -const String COMPLETION_REQUEST_GET_SUGGESTION_DETAILS2_LIBRARY_URI = - 'libraryUri'; -const String COMPLETION_REQUEST_GET_SUGGESTION_DETAILS2_OFFSET = 'offset'; -const String COMPLETION_REQUEST_REGISTER_LIBRARY_PATHS = +const String completionRequestGetSuggestionDetails2Completion = 'completion'; +const String completionRequestGetSuggestionDetails2File = 'file'; +const String completionRequestGetSuggestionDetails2LibraryUri = 'libraryUri'; +const String completionRequestGetSuggestionDetails2Offset = 'offset'; +const String completionRequestGetSuggestions2 = 'completion.getSuggestions2'; +const String completionRequestGetSuggestions2CompletionCaseMatchingMode = + 'completionCaseMatchingMode'; +const String completionRequestGetSuggestions2CompletionMode = 'completionMode'; +const String completionRequestGetSuggestions2File = 'file'; +const String completionRequestGetSuggestions2InvocationCount = + 'invocationCount'; +const String completionRequestGetSuggestions2MaxResults = 'maxResults'; +const String completionRequestGetSuggestions2Offset = 'offset'; +const String completionRequestGetSuggestions2Timeout = 'timeout'; +const String completionRequestRegisterLibraryPaths = 'completion.registerLibraryPaths'; -const String COMPLETION_REQUEST_REGISTER_LIBRARY_PATHS_PATHS = 'paths'; -const String COMPLETION_RESPONSE_GET_SUGGESTIONS2_IS_INCOMPLETE = - 'isIncomplete'; -const String COMPLETION_RESPONSE_GET_SUGGESTIONS2_REPLACEMENT_LENGTH = +const String completionRequestRegisterLibraryPathsPaths = 'paths'; +const String completionResponseGetSuggestionDetails2Change = 'change'; +const String completionResponseGetSuggestionDetails2Completion = 'completion'; +const String completionResponseGetSuggestions2IsIncomplete = 'isIncomplete'; +const String completionResponseGetSuggestions2ReplacementLength = 'replacementLength'; -const String COMPLETION_RESPONSE_GET_SUGGESTIONS2_REPLACEMENT_OFFSET = +const String completionResponseGetSuggestions2ReplacementOffset = 'replacementOffset'; -const String COMPLETION_RESPONSE_GET_SUGGESTIONS2_SUGGESTIONS = 'suggestions'; -const String COMPLETION_RESPONSE_GET_SUGGESTION_DETAILS2_CHANGE = 'change'; -const String COMPLETION_RESPONSE_GET_SUGGESTION_DETAILS2_COMPLETION = - 'completion'; -const String DIAGNOSTIC_REQUEST_GET_DIAGNOSTICS = 'diagnostic.getDiagnostics'; -const String DIAGNOSTIC_REQUEST_GET_SERVER_PORT = 'diagnostic.getServerPort'; -const String DIAGNOSTIC_RESPONSE_GET_DIAGNOSTICS_CONTEXTS = 'contexts'; -const String DIAGNOSTIC_RESPONSE_GET_SERVER_PORT_PORT = 'port'; -const String EDIT_REQUEST_BULK_FIXES = 'edit.bulkFixes'; -const String EDIT_REQUEST_BULK_FIXES_CODES = 'codes'; -const String EDIT_REQUEST_BULK_FIXES_INCLUDED = 'included'; -const String EDIT_REQUEST_BULK_FIXES_IN_TEST_MODE = 'inTestMode'; -const String EDIT_REQUEST_BULK_FIXES_UPDATE_PUBSPEC = 'updatePubspec'; -const String EDIT_REQUEST_FORMAT = 'edit.format'; -const String EDIT_REQUEST_FORMAT_FILE = 'file'; -const String EDIT_REQUEST_FORMAT_IF_ENABLED = 'edit.formatIfEnabled'; -const String EDIT_REQUEST_FORMAT_IF_ENABLED_DIRECTORIES = 'directories'; -const String EDIT_REQUEST_FORMAT_LINE_LENGTH = 'lineLength'; -const String EDIT_REQUEST_FORMAT_SELECTION_LENGTH = 'selectionLength'; -const String EDIT_REQUEST_FORMAT_SELECTION_OFFSET = 'selectionOffset'; -const String EDIT_REQUEST_GET_ASSISTS = 'edit.getAssists'; -const String EDIT_REQUEST_GET_ASSISTS_FILE = 'file'; -const String EDIT_REQUEST_GET_ASSISTS_LENGTH = 'length'; -const String EDIT_REQUEST_GET_ASSISTS_OFFSET = 'offset'; -const String EDIT_REQUEST_GET_AVAILABLE_REFACTORINGS = +const String completionResponseGetSuggestions2Suggestions = 'suggestions'; +const String diagnosticRequestGetDiagnostics = 'diagnostic.getDiagnostics'; +const String diagnosticRequestGetServerPort = 'diagnostic.getServerPort'; +const String diagnosticResponseGetDiagnosticsContexts = 'contexts'; +const String diagnosticResponseGetServerPortPort = 'port'; +const String editRequestBulkFixes = 'edit.bulkFixes'; +const String editRequestBulkFixesCodes = 'codes'; +const String editRequestBulkFixesInTestMode = 'inTestMode'; +const String editRequestBulkFixesIncluded = 'included'; +const String editRequestBulkFixesUpdatePubspec = 'updatePubspec'; +const String editRequestFormat = 'edit.format'; +const String editRequestFormatFile = 'file'; +const String editRequestFormatIfEnabled = 'edit.formatIfEnabled'; +const String editRequestFormatIfEnabledDirectories = 'directories'; +const String editRequestFormatLineLength = 'lineLength'; +const String editRequestFormatSelectionLength = 'selectionLength'; +const String editRequestFormatSelectionOffset = 'selectionOffset'; +const String editRequestGetAssists = 'edit.getAssists'; +const String editRequestGetAssistsFile = 'file'; +const String editRequestGetAssistsLength = 'length'; +const String editRequestGetAssistsOffset = 'offset'; +const String editRequestGetAvailableRefactorings = 'edit.getAvailableRefactorings'; -const String EDIT_REQUEST_GET_AVAILABLE_REFACTORINGS_FILE = 'file'; -const String EDIT_REQUEST_GET_AVAILABLE_REFACTORINGS_LENGTH = 'length'; -const String EDIT_REQUEST_GET_AVAILABLE_REFACTORINGS_OFFSET = 'offset'; -const String EDIT_REQUEST_GET_FIXES = 'edit.getFixes'; -const String EDIT_REQUEST_GET_FIXES_FILE = 'file'; -const String EDIT_REQUEST_GET_FIXES_OFFSET = 'offset'; -const String EDIT_REQUEST_GET_POSTFIX_COMPLETION = 'edit.getPostfixCompletion'; -const String EDIT_REQUEST_GET_POSTFIX_COMPLETION_FILE = 'file'; -const String EDIT_REQUEST_GET_POSTFIX_COMPLETION_KEY = 'key'; -const String EDIT_REQUEST_GET_POSTFIX_COMPLETION_OFFSET = 'offset'; -const String EDIT_REQUEST_GET_REFACTORING = 'edit.getRefactoring'; -const String EDIT_REQUEST_GET_REFACTORING_FILE = 'file'; -const String EDIT_REQUEST_GET_REFACTORING_KIND = 'kind'; -const String EDIT_REQUEST_GET_REFACTORING_LENGTH = 'length'; -const String EDIT_REQUEST_GET_REFACTORING_OFFSET = 'offset'; -const String EDIT_REQUEST_GET_REFACTORING_OPTIONS = 'options'; -const String EDIT_REQUEST_GET_REFACTORING_VALIDATE_ONLY = 'validateOnly'; -const String EDIT_REQUEST_GET_STATEMENT_COMPLETION = - 'edit.getStatementCompletion'; -const String EDIT_REQUEST_GET_STATEMENT_COMPLETION_FILE = 'file'; -const String EDIT_REQUEST_GET_STATEMENT_COMPLETION_OFFSET = 'offset'; -const String EDIT_REQUEST_IMPORT_ELEMENTS = 'edit.importElements'; -const String EDIT_REQUEST_IMPORT_ELEMENTS_ELEMENTS = 'elements'; -const String EDIT_REQUEST_IMPORT_ELEMENTS_FILE = 'file'; -const String EDIT_REQUEST_IMPORT_ELEMENTS_OFFSET = 'offset'; -const String EDIT_REQUEST_IS_POSTFIX_COMPLETION_APPLICABLE = +const String editRequestGetAvailableRefactoringsFile = 'file'; +const String editRequestGetAvailableRefactoringsLength = 'length'; +const String editRequestGetAvailableRefactoringsOffset = 'offset'; +const String editRequestGetFixes = 'edit.getFixes'; +const String editRequestGetFixesFile = 'file'; +const String editRequestGetFixesOffset = 'offset'; +const String editRequestGetPostfixCompletion = 'edit.getPostfixCompletion'; +const String editRequestGetPostfixCompletionFile = 'file'; +const String editRequestGetPostfixCompletionKey = 'key'; +const String editRequestGetPostfixCompletionOffset = 'offset'; +const String editRequestGetRefactoring = 'edit.getRefactoring'; +const String editRequestGetRefactoringFile = 'file'; +const String editRequestGetRefactoringKind = 'kind'; +const String editRequestGetRefactoringLength = 'length'; +const String editRequestGetRefactoringOffset = 'offset'; +const String editRequestGetRefactoringOptions = 'options'; +const String editRequestGetRefactoringValidateOnly = 'validateOnly'; +const String editRequestGetStatementCompletion = 'edit.getStatementCompletion'; +const String editRequestGetStatementCompletionFile = 'file'; +const String editRequestGetStatementCompletionOffset = 'offset'; +const String editRequestImportElements = 'edit.importElements'; +const String editRequestImportElementsElements = 'elements'; +const String editRequestImportElementsFile = 'file'; +const String editRequestImportElementsOffset = 'offset'; +const String editRequestIsPostfixCompletionApplicable = 'edit.isPostfixCompletionApplicable'; -const String EDIT_REQUEST_IS_POSTFIX_COMPLETION_APPLICABLE_FILE = 'file'; -const String EDIT_REQUEST_IS_POSTFIX_COMPLETION_APPLICABLE_KEY = 'key'; -const String EDIT_REQUEST_IS_POSTFIX_COMPLETION_APPLICABLE_OFFSET = 'offset'; -const String EDIT_REQUEST_LIST_POSTFIX_COMPLETION_TEMPLATES = +const String editRequestIsPostfixCompletionApplicableFile = 'file'; +const String editRequestIsPostfixCompletionApplicableKey = 'key'; +const String editRequestIsPostfixCompletionApplicableOffset = 'offset'; +const String editRequestListPostfixCompletionTemplates = 'edit.listPostfixCompletionTemplates'; -const String EDIT_REQUEST_ORGANIZE_DIRECTIVES = 'edit.organizeDirectives'; -const String EDIT_REQUEST_ORGANIZE_DIRECTIVES_FILE = 'file'; -const String EDIT_REQUEST_SORT_MEMBERS = 'edit.sortMembers'; -const String EDIT_REQUEST_SORT_MEMBERS_FILE = 'file'; -const String EDIT_RESPONSE_BULK_FIXES_DETAILS = 'details'; -const String EDIT_RESPONSE_BULK_FIXES_EDITS = 'edits'; -const String EDIT_RESPONSE_BULK_FIXES_MESSAGE = 'message'; -const String EDIT_RESPONSE_FORMAT_EDITS = 'edits'; -const String EDIT_RESPONSE_FORMAT_IF_ENABLED_EDITS = 'edits'; -const String EDIT_RESPONSE_FORMAT_SELECTION_LENGTH = 'selectionLength'; -const String EDIT_RESPONSE_FORMAT_SELECTION_OFFSET = 'selectionOffset'; -const String EDIT_RESPONSE_GET_ASSISTS_ASSISTS = 'assists'; -const String EDIT_RESPONSE_GET_AVAILABLE_REFACTORINGS_KINDS = 'kinds'; -const String EDIT_RESPONSE_GET_FIXES_FIXES = 'fixes'; -const String EDIT_RESPONSE_GET_POSTFIX_COMPLETION_CHANGE = 'change'; -const String EDIT_RESPONSE_GET_REFACTORING_CHANGE = 'change'; -const String EDIT_RESPONSE_GET_REFACTORING_FEEDBACK = 'feedback'; -const String EDIT_RESPONSE_GET_REFACTORING_FINAL_PROBLEMS = 'finalProblems'; -const String EDIT_RESPONSE_GET_REFACTORING_INITIAL_PROBLEMS = 'initialProblems'; -const String EDIT_RESPONSE_GET_REFACTORING_OPTIONS_PROBLEMS = 'optionsProblems'; -const String EDIT_RESPONSE_GET_REFACTORING_POTENTIAL_EDITS = 'potentialEdits'; -const String EDIT_RESPONSE_GET_STATEMENT_COMPLETION_CHANGE = 'change'; -const String EDIT_RESPONSE_GET_STATEMENT_COMPLETION_WHITESPACE_ONLY = +const String editRequestOrganizeDirectives = 'edit.organizeDirectives'; +const String editRequestOrganizeDirectivesFile = 'file'; +const String editRequestSortMembers = 'edit.sortMembers'; +const String editRequestSortMembersFile = 'file'; +const String editResponseBulkFixesDetails = 'details'; +const String editResponseBulkFixesEdits = 'edits'; +const String editResponseBulkFixesMessage = 'message'; +const String editResponseFormatEdits = 'edits'; +const String editResponseFormatIfEnabledEdits = 'edits'; +const String editResponseFormatSelectionLength = 'selectionLength'; +const String editResponseFormatSelectionOffset = 'selectionOffset'; +const String editResponseGetAssistsAssists = 'assists'; +const String editResponseGetAvailableRefactoringsKinds = 'kinds'; +const String editResponseGetFixesFixes = 'fixes'; +const String editResponseGetPostfixCompletionChange = 'change'; +const String editResponseGetRefactoringChange = 'change'; +const String editResponseGetRefactoringFeedback = 'feedback'; +const String editResponseGetRefactoringFinalProblems = 'finalProblems'; +const String editResponseGetRefactoringInitialProblems = 'initialProblems'; +const String editResponseGetRefactoringOptionsProblems = 'optionsProblems'; +const String editResponseGetRefactoringPotentialEdits = 'potentialEdits'; +const String editResponseGetStatementCompletionChange = 'change'; +const String editResponseGetStatementCompletionWhitespaceOnly = 'whitespaceOnly'; -const String EDIT_RESPONSE_IMPORT_ELEMENTS_EDIT = 'edit'; -const String EDIT_RESPONSE_IS_POSTFIX_COMPLETION_APPLICABLE_VALUE = 'value'; -const String EDIT_RESPONSE_LIST_POSTFIX_COMPLETION_TEMPLATES_TEMPLATES = - 'templates'; -const String EDIT_RESPONSE_ORGANIZE_DIRECTIVES_EDIT = 'edit'; -const String EDIT_RESPONSE_SORT_MEMBERS_EDIT = 'edit'; -const String EXECUTION_NOTIFICATION_LAUNCH_DATA = 'execution.launchData'; -const String EXECUTION_NOTIFICATION_LAUNCH_DATA_FILE = 'file'; -const String EXECUTION_NOTIFICATION_LAUNCH_DATA_KIND = 'kind'; -const String EXECUTION_NOTIFICATION_LAUNCH_DATA_REFERENCED_FILES = - 'referencedFiles'; -const String EXECUTION_REQUEST_CREATE_CONTEXT = 'execution.createContext'; -const String EXECUTION_REQUEST_CREATE_CONTEXT_CONTEXT_ROOT = 'contextRoot'; -const String EXECUTION_REQUEST_DELETE_CONTEXT = 'execution.deleteContext'; -const String EXECUTION_REQUEST_DELETE_CONTEXT_ID = 'id'; -const String EXECUTION_REQUEST_GET_SUGGESTIONS = 'execution.getSuggestions'; -const String EXECUTION_REQUEST_GET_SUGGESTIONS_CODE = 'code'; -const String EXECUTION_REQUEST_GET_SUGGESTIONS_CONTEXT_FILE = 'contextFile'; -const String EXECUTION_REQUEST_GET_SUGGESTIONS_CONTEXT_OFFSET = 'contextOffset'; -const String EXECUTION_REQUEST_GET_SUGGESTIONS_EXPRESSIONS = 'expressions'; -const String EXECUTION_REQUEST_GET_SUGGESTIONS_OFFSET = 'offset'; -const String EXECUTION_REQUEST_GET_SUGGESTIONS_VARIABLES = 'variables'; -const String EXECUTION_REQUEST_MAP_URI = 'execution.mapUri'; -const String EXECUTION_REQUEST_MAP_URI_FILE = 'file'; -const String EXECUTION_REQUEST_MAP_URI_ID = 'id'; -const String EXECUTION_REQUEST_MAP_URI_URI = 'uri'; -const String EXECUTION_REQUEST_SET_SUBSCRIPTIONS = 'execution.setSubscriptions'; -const String EXECUTION_REQUEST_SET_SUBSCRIPTIONS_SUBSCRIPTIONS = - 'subscriptions'; -const String EXECUTION_RESPONSE_CREATE_CONTEXT_ID = 'id'; -const String EXECUTION_RESPONSE_GET_SUGGESTIONS_EXPRESSIONS = 'expressions'; -const String EXECUTION_RESPONSE_GET_SUGGESTIONS_SUGGESTIONS = 'suggestions'; -const String EXECUTION_RESPONSE_MAP_URI_FILE = 'file'; -const String EXECUTION_RESPONSE_MAP_URI_URI = 'uri'; -const String FLUTTER_NOTIFICATION_OUTLINE = 'flutter.outline'; -const String FLUTTER_NOTIFICATION_OUTLINE_FILE = 'file'; -const String FLUTTER_NOTIFICATION_OUTLINE_OUTLINE = 'outline'; -const String FLUTTER_REQUEST_GET_WIDGET_DESCRIPTION = +const String editResponseImportElementsEdit = 'edit'; +const String editResponseIsPostfixCompletionApplicableValue = 'value'; +const String editResponseListPostfixCompletionTemplatesTemplates = 'templates'; +const String editResponseOrganizeDirectivesEdit = 'edit'; +const String editResponseSortMembersEdit = 'edit'; +const String executionNotificationLaunchData = 'execution.launchData'; +const String executionNotificationLaunchDataFile = 'file'; +const String executionNotificationLaunchDataKind = 'kind'; +const String executionNotificationLaunchDataReferencedFiles = 'referencedFiles'; +const String executionRequestCreateContext = 'execution.createContext'; +const String executionRequestCreateContextContextRoot = 'contextRoot'; +const String executionRequestDeleteContext = 'execution.deleteContext'; +const String executionRequestDeleteContextId = 'id'; +const String executionRequestGetSuggestions = 'execution.getSuggestions'; +const String executionRequestGetSuggestionsCode = 'code'; +const String executionRequestGetSuggestionsContextFile = 'contextFile'; +const String executionRequestGetSuggestionsContextOffset = 'contextOffset'; +const String executionRequestGetSuggestionsExpressions = 'expressions'; +const String executionRequestGetSuggestionsOffset = 'offset'; +const String executionRequestGetSuggestionsVariables = 'variables'; +const String executionRequestMapUri = 'execution.mapUri'; +const String executionRequestMapUriFile = 'file'; +const String executionRequestMapUriId = 'id'; +const String executionRequestMapUriUri = 'uri'; +const String executionRequestSetSubscriptions = 'execution.setSubscriptions'; +const String executionRequestSetSubscriptionsSubscriptions = 'subscriptions'; +const String executionResponseCreateContextId = 'id'; +const String executionResponseGetSuggestionsExpressions = 'expressions'; +const String executionResponseGetSuggestionsSuggestions = 'suggestions'; +const String executionResponseMapUriFile = 'file'; +const String executionResponseMapUriUri = 'uri'; +const String flutterNotificationOutline = 'flutter.outline'; +const String flutterNotificationOutlineFile = 'file'; +const String flutterNotificationOutlineOutline = 'outline'; +const String flutterRequestGetWidgetDescription = 'flutter.getWidgetDescription'; -const String FLUTTER_REQUEST_GET_WIDGET_DESCRIPTION_FILE = 'file'; -const String FLUTTER_REQUEST_GET_WIDGET_DESCRIPTION_OFFSET = 'offset'; -const String FLUTTER_REQUEST_SET_SUBSCRIPTIONS = 'flutter.setSubscriptions'; -const String FLUTTER_REQUEST_SET_SUBSCRIPTIONS_SUBSCRIPTIONS = 'subscriptions'; -const String FLUTTER_REQUEST_SET_WIDGET_PROPERTY_VALUE = +const String flutterRequestGetWidgetDescriptionFile = 'file'; +const String flutterRequestGetWidgetDescriptionOffset = 'offset'; +const String flutterRequestSetSubscriptions = 'flutter.setSubscriptions'; +const String flutterRequestSetSubscriptionsSubscriptions = 'subscriptions'; +const String flutterRequestSetWidgetPropertyValue = 'flutter.setWidgetPropertyValue'; -const String FLUTTER_REQUEST_SET_WIDGET_PROPERTY_VALUE_ID = 'id'; -const String FLUTTER_REQUEST_SET_WIDGET_PROPERTY_VALUE_VALUE = 'value'; -const String FLUTTER_RESPONSE_GET_WIDGET_DESCRIPTION_PROPERTIES = 'properties'; -const String FLUTTER_RESPONSE_SET_WIDGET_PROPERTY_VALUE_CHANGE = 'change'; -const String LSP_NOTIFICATION_NOTIFICATION = 'lsp.notification'; -const String LSP_NOTIFICATION_NOTIFICATION_LSP_NOTIFICATION = 'lspNotification'; -const String LSP_REQUEST_HANDLE = 'lsp.handle'; -const String LSP_REQUEST_HANDLE_LSP_MESSAGE = 'lspMessage'; -const String LSP_RESPONSE_HANDLE_LSP_RESPONSE = 'lspResponse'; -const String SEARCH_NOTIFICATION_RESULTS = 'search.results'; -const String SEARCH_NOTIFICATION_RESULTS_ID = 'id'; -const String SEARCH_NOTIFICATION_RESULTS_IS_LAST = 'isLast'; -const String SEARCH_NOTIFICATION_RESULTS_RESULTS = 'results'; -const String SEARCH_REQUEST_FIND_ELEMENT_REFERENCES = +const String flutterRequestSetWidgetPropertyValueId = 'id'; +const String flutterRequestSetWidgetPropertyValueValue = 'value'; +const String flutterResponseGetWidgetDescriptionProperties = 'properties'; +const String flutterResponseSetWidgetPropertyValueChange = 'change'; +const String lspNotificationNotification = 'lsp.notification'; +const String lspNotificationNotificationLspNotification = 'lspNotification'; +const String lspRequestHandle = 'lsp.handle'; +const String lspRequestHandleLspMessage = 'lspMessage'; +const String lspResponseHandleLspResponse = 'lspResponse'; +const String searchNotificationResults = 'search.results'; +const String searchNotificationResultsId = 'id'; +const String searchNotificationResultsIsLast = 'isLast'; +const String searchNotificationResultsResults = 'results'; +const String searchRequestFindElementReferences = 'search.findElementReferences'; -const String SEARCH_REQUEST_FIND_ELEMENT_REFERENCES_FILE = 'file'; -const String SEARCH_REQUEST_FIND_ELEMENT_REFERENCES_INCLUDE_POTENTIAL = +const String searchRequestFindElementReferencesFile = 'file'; +const String searchRequestFindElementReferencesIncludePotential = 'includePotential'; -const String SEARCH_REQUEST_FIND_ELEMENT_REFERENCES_OFFSET = 'offset'; -const String SEARCH_REQUEST_FIND_MEMBER_DECLARATIONS = +const String searchRequestFindElementReferencesOffset = 'offset'; +const String searchRequestFindMemberDeclarations = 'search.findMemberDeclarations'; -const String SEARCH_REQUEST_FIND_MEMBER_DECLARATIONS_NAME = 'name'; -const String SEARCH_REQUEST_FIND_MEMBER_REFERENCES = - 'search.findMemberReferences'; -const String SEARCH_REQUEST_FIND_MEMBER_REFERENCES_NAME = 'name'; -const String SEARCH_REQUEST_FIND_TOP_LEVEL_DECLARATIONS = +const String searchRequestFindMemberDeclarationsName = 'name'; +const String searchRequestFindMemberReferences = 'search.findMemberReferences'; +const String searchRequestFindMemberReferencesName = 'name'; +const String searchRequestFindTopLevelDeclarations = 'search.findTopLevelDeclarations'; -const String SEARCH_REQUEST_FIND_TOP_LEVEL_DECLARATIONS_PATTERN = 'pattern'; -const String SEARCH_REQUEST_GET_ELEMENT_DECLARATIONS = +const String searchRequestFindTopLevelDeclarationsPattern = 'pattern'; +const String searchRequestGetElementDeclarations = 'search.getElementDeclarations'; -const String SEARCH_REQUEST_GET_ELEMENT_DECLARATIONS_FILE = 'file'; -const String SEARCH_REQUEST_GET_ELEMENT_DECLARATIONS_MAX_RESULTS = 'maxResults'; -const String SEARCH_REQUEST_GET_ELEMENT_DECLARATIONS_PATTERN = 'pattern'; -const String SEARCH_REQUEST_GET_TYPE_HIERARCHY = 'search.getTypeHierarchy'; -const String SEARCH_REQUEST_GET_TYPE_HIERARCHY_FILE = 'file'; -const String SEARCH_REQUEST_GET_TYPE_HIERARCHY_OFFSET = 'offset'; -const String SEARCH_REQUEST_GET_TYPE_HIERARCHY_SUPER_ONLY = 'superOnly'; -const String SEARCH_RESPONSE_FIND_ELEMENT_REFERENCES_ELEMENT = 'element'; -const String SEARCH_RESPONSE_FIND_ELEMENT_REFERENCES_ID = 'id'; -const String SEARCH_RESPONSE_FIND_MEMBER_DECLARATIONS_ID = 'id'; -const String SEARCH_RESPONSE_FIND_MEMBER_REFERENCES_ID = 'id'; -const String SEARCH_RESPONSE_FIND_TOP_LEVEL_DECLARATIONS_ID = 'id'; -const String SEARCH_RESPONSE_GET_ELEMENT_DECLARATIONS_DECLARATIONS = - 'declarations'; -const String SEARCH_RESPONSE_GET_ELEMENT_DECLARATIONS_FILES = 'files'; -const String SEARCH_RESPONSE_GET_TYPE_HIERARCHY_HIERARCHY_ITEMS = - 'hierarchyItems'; -const String SERVER_NOTIFICATION_CONNECTED = 'server.connected'; -const String SERVER_NOTIFICATION_CONNECTED_PID = 'pid'; -const String SERVER_NOTIFICATION_CONNECTED_VERSION = 'version'; -const String SERVER_NOTIFICATION_ERROR = 'server.error'; -const String SERVER_NOTIFICATION_ERROR_IS_FATAL = 'isFatal'; -const String SERVER_NOTIFICATION_ERROR_MESSAGE = 'message'; -const String SERVER_NOTIFICATION_ERROR_STACK_TRACE = 'stackTrace'; -const String SERVER_NOTIFICATION_LOG = 'server.log'; -const String SERVER_NOTIFICATION_LOG_ENTRY = 'entry'; -const String SERVER_NOTIFICATION_PLUGIN_ERROR = 'server.pluginError'; -const String SERVER_NOTIFICATION_PLUGIN_ERROR_MESSAGE = 'message'; -const String SERVER_NOTIFICATION_STATUS = 'server.status'; -const String SERVER_NOTIFICATION_STATUS_ANALYSIS = 'analysis'; -const String SERVER_NOTIFICATION_STATUS_PUB = 'pub'; -const String SERVER_REQUEST_CANCEL_REQUEST = 'server.cancelRequest'; -const String SERVER_REQUEST_CANCEL_REQUEST_ID = 'id'; -const String SERVER_REQUEST_GET_VERSION = 'server.getVersion'; -const String SERVER_REQUEST_OPEN_URL_REQUEST = 'server.openUrlRequest'; -const String SERVER_REQUEST_OPEN_URL_REQUEST_URL = 'url'; -const String SERVER_REQUEST_SET_CLIENT_CAPABILITIES = +const String searchRequestGetElementDeclarationsFile = 'file'; +const String searchRequestGetElementDeclarationsMaxResults = 'maxResults'; +const String searchRequestGetElementDeclarationsPattern = 'pattern'; +const String searchRequestGetTypeHierarchy = 'search.getTypeHierarchy'; +const String searchRequestGetTypeHierarchyFile = 'file'; +const String searchRequestGetTypeHierarchyOffset = 'offset'; +const String searchRequestGetTypeHierarchySuperOnly = 'superOnly'; +const String searchResponseFindElementReferencesElement = 'element'; +const String searchResponseFindElementReferencesId = 'id'; +const String searchResponseFindMemberDeclarationsId = 'id'; +const String searchResponseFindMemberReferencesId = 'id'; +const String searchResponseFindTopLevelDeclarationsId = 'id'; +const String searchResponseGetElementDeclarationsDeclarations = 'declarations'; +const String searchResponseGetElementDeclarationsFiles = 'files'; +const String searchResponseGetTypeHierarchyHierarchyItems = 'hierarchyItems'; +const String serverNotificationConnected = 'server.connected'; +const String serverNotificationConnectedPid = 'pid'; +const String serverNotificationConnectedVersion = 'version'; +const String serverNotificationError = 'server.error'; +const String serverNotificationErrorIsFatal = 'isFatal'; +const String serverNotificationErrorMessage = 'message'; +const String serverNotificationErrorStackTrace = 'stackTrace'; +const String serverNotificationLog = 'server.log'; +const String serverNotificationLogEntry = 'entry'; +const String serverNotificationPluginError = 'server.pluginError'; +const String serverNotificationPluginErrorMessage = 'message'; +const String serverNotificationStatus = 'server.status'; +const String serverNotificationStatusAnalysis = 'analysis'; +const String serverNotificationStatusPub = 'pub'; +const String serverRequestCancelRequest = 'server.cancelRequest'; +const String serverRequestCancelRequestId = 'id'; +const String serverRequestGetVersion = 'server.getVersion'; +const String serverRequestOpenUrlRequest = 'server.openUrlRequest'; +const String serverRequestOpenUrlRequestUrl = 'url'; +const String serverRequestSetClientCapabilities = 'server.setClientCapabilities'; -const String SERVER_REQUEST_SET_CLIENT_CAPABILITIES_LSP_CAPABILITIES = +const String serverRequestSetClientCapabilitiesLspCapabilities = 'lspCapabilities'; -const String SERVER_REQUEST_SET_CLIENT_CAPABILITIES_REQUESTS = 'requests'; -const String SERVER_REQUEST_SET_CLIENT_CAPABILITIES_SUPPORTS_URIS = - 'supportsUris'; -const String SERVER_REQUEST_SET_SUBSCRIPTIONS = 'server.setSubscriptions'; -const String SERVER_REQUEST_SET_SUBSCRIPTIONS_SUBSCRIPTIONS = 'subscriptions'; -const String SERVER_REQUEST_SHOW_MESSAGE_REQUEST = 'server.showMessageRequest'; -const String SERVER_REQUEST_SHOW_MESSAGE_REQUEST_ACTIONS = 'actions'; -const String SERVER_REQUEST_SHOW_MESSAGE_REQUEST_MESSAGE = 'message'; -const String SERVER_REQUEST_SHOW_MESSAGE_REQUEST_TYPE = 'type'; -const String SERVER_REQUEST_SHUTDOWN = 'server.shutdown'; -const String SERVER_RESPONSE_GET_VERSION_VERSION = 'version'; -const String SERVER_RESPONSE_SHOW_MESSAGE_REQUEST_ACTION = 'action'; +const String serverRequestSetClientCapabilitiesRequests = 'requests'; +const String serverRequestSetClientCapabilitiesSupportsUris = 'supportsUris'; +const String serverRequestSetSubscriptions = 'server.setSubscriptions'; +const String serverRequestSetSubscriptionsSubscriptions = 'subscriptions'; +const String serverRequestShowMessageRequest = 'server.showMessageRequest'; +const String serverRequestShowMessageRequestActions = 'actions'; +const String serverRequestShowMessageRequestMessage = 'message'; +const String serverRequestShowMessageRequestType = 'type'; +const String serverRequestShutdown = 'server.shutdown'; +const String serverResponseGetVersionVersion = 'version'; +const String serverResponseShowMessageRequestAction = 'action'; diff --git a/pkg/analysis_server/lib/src/analytics/analytics_manager.dart b/pkg/analysis_server/lib/src/analytics/analytics_manager.dart index 72d69683a71..ae4cdff2300 100644 --- a/pkg/analysis_server/lib/src/analytics/analytics_manager.dart +++ b/pkg/analysis_server/lib/src/analytics/analytics_manager.dart @@ -45,13 +45,13 @@ class AnalyticsManager { static const openWorkspacePathsKey = 'openWorkspacePaths'; - static const refactoringKindEnumKey = EDIT_REQUEST_GET_REFACTORING_KIND; + static const refactoringKindEnumKey = editRequestGetRefactoringKind; - static const includedKey = ANALYSIS_REQUEST_SET_ANALYSIS_ROOTS_INCLUDED; + static const includedKey = analysisRequestSetAnalysisRootsIncluded; - static const excludedKey = ANALYSIS_REQUEST_SET_ANALYSIS_ROOTS_EXCLUDED; + static const excludedKey = analysisRequestSetAnalysisRootsExcluded; - static const filesKey = ANALYSIS_REQUEST_SET_PRIORITY_FILES_FILES; + static const filesKey = analysisRequestSetPriorityFilesFiles; /// The object used to send analytics. final Analytics analytics; @@ -321,7 +321,7 @@ class AnalyticsManager { /// Record data from the given [params]. void startedGetRefactoring(EditGetRefactoringParams params) { - var requestData = getRequestData(EDIT_REQUEST_GET_REFACTORING); + var requestData = getRequestData(editRequestGetRefactoring); requestData.addEnumValue(refactoringKindEnumKey, params.kind.name); } @@ -351,16 +351,16 @@ class AnalyticsManager { /// Record data from the given [params]. void startedSetAnalysisRoots(AnalysisSetAnalysisRootsParams params) { - var requestData = getRequestData(ANALYSIS_REQUEST_SET_ANALYSIS_ROOTS); + var requestData = getRequestData(analysisRequestSetAnalysisRoots); requestData.addValue(includedKey, params.included.length); requestData.addValue(excludedKey, params.excluded.length); } /// Record data from the given [params]. void startedSetPriorityFiles(AnalysisSetPriorityFilesParams params) { - var requestData = getRequestData(ANALYSIS_REQUEST_SET_PRIORITY_FILES); + var requestData = getRequestData(analysisRequestSetPriorityFiles); requestData.addValue( - ANALYSIS_REQUEST_SET_PRIORITY_FILES_FILES, + analysisRequestSetPriorityFilesFiles, params.files.length, ); } diff --git a/pkg/analysis_server/lib/src/legacy_analysis_server.dart b/pkg/analysis_server/lib/src/legacy_analysis_server.dart index 6299bb5c3a6..7b171a433db 100644 --- a/pkg/analysis_server/lib/src/legacy_analysis_server.dart +++ b/pkg/analysis_server/lib/src/legacy_analysis_server.dart @@ -191,86 +191,80 @@ class LegacyAnalysisServer extends AnalysisServer { /// Requests that don't match anything in this map will be passed to /// [LspOverLegacyHandler] for possible handling before returning an error. static final Map requestHandlerGenerators = { - ANALYSIS_REQUEST_GET_ERRORS: AnalysisGetErrorsHandler.new, - ANALYSIS_REQUEST_GET_HOVER: AnalysisGetHoverHandler.new, - ANALYSIS_REQUEST_GET_IMPORTED_ELEMENTS: - AnalysisGetImportedElementsHandler.new, - ANALYSIS_REQUEST_GET_LIBRARY_DEPENDENCIES: UnsupportedRequestHandler.new, - ANALYSIS_REQUEST_GET_NAVIGATION: AnalysisGetNavigationHandler.new, - ANALYSIS_REQUEST_GET_REACHABLE_SOURCES: UnsupportedRequestHandler.new, - ANALYSIS_REQUEST_GET_SIGNATURE: AnalysisGetSignatureHandler.new, - ANALYSIS_REQUEST_REANALYZE: AnalysisReanalyzeHandler.new, - ANALYSIS_REQUEST_SET_ANALYSIS_ROOTS: AnalysisSetAnalysisRootsHandler.new, - ANALYSIS_REQUEST_SET_GENERAL_SUBSCRIPTIONS: + analysisRequestGetErrors: AnalysisGetErrorsHandler.new, + analysisRequestGetHover: AnalysisGetHoverHandler.new, + analysisRequestGetImportedElements: AnalysisGetImportedElementsHandler.new, + analysisRequestGetLibraryDependencies: UnsupportedRequestHandler.new, + analysisRequestGetNavigation: AnalysisGetNavigationHandler.new, + analysisRequestGetReachableSources: UnsupportedRequestHandler.new, + analysisRequestGetSignature: AnalysisGetSignatureHandler.new, + analysisRequestReanalyze: AnalysisReanalyzeHandler.new, + analysisRequestSetAnalysisRoots: AnalysisSetAnalysisRootsHandler.new, + analysisRequestSetGeneralSubscriptions: AnalysisSetGeneralSubscriptionsHandler.new, - ANALYSIS_REQUEST_SET_PRIORITY_FILES: AnalysisSetPriorityFilesHandler.new, - ANALYSIS_REQUEST_SET_SUBSCRIPTIONS: AnalysisSetSubscriptionsHandler.new, - ANALYSIS_REQUEST_UPDATE_CONTENT: AnalysisUpdateContentHandler.new, - ANALYSIS_REQUEST_UPDATE_OPTIONS: AnalysisUpdateOptionsHandler.new, + analysisRequestSetPriorityFiles: AnalysisSetPriorityFilesHandler.new, + analysisRequestSetSubscriptions: AnalysisSetSubscriptionsHandler.new, + analysisRequestUpdateContent: AnalysisUpdateContentHandler.new, + analysisRequestUpdateOptions: AnalysisUpdateOptionsHandler.new, - ANALYTICS_REQUEST_IS_ENABLED: AnalyticsIsEnabledHandler.new, - ANALYTICS_REQUEST_ENABLE: AnalyticsEnableHandler.new, - ANALYTICS_REQUEST_SEND_EVENT: AnalyticsSendEventHandler.new, - ANALYTICS_REQUEST_SEND_TIMING: AnalyticsSendTimingHandler.new, + analyticsRequestIsEnabled: AnalyticsIsEnabledHandler.new, + analyticsRequestEnable: AnalyticsEnableHandler.new, + analyticsRequestSendEvent: AnalyticsSendEventHandler.new, + analyticsRequestSendTiming: AnalyticsSendTimingHandler.new, - COMPLETION_REQUEST_GET_SUGGESTION_DETAILS2: + completionRequestGetSuggestionDetails2: CompletionGetSuggestionDetails2Handler.new, - COMPLETION_REQUEST_GET_SUGGESTIONS2: CompletionGetSuggestions2Handler.new, + completionRequestGetSuggestions2: CompletionGetSuggestions2Handler.new, - DIAGNOSTIC_REQUEST_GET_DIAGNOSTICS: DiagnosticGetDiagnosticsHandler.new, - DIAGNOSTIC_REQUEST_GET_SERVER_PORT: DiagnosticGetServerPortHandler.new, + diagnosticRequestGetDiagnostics: DiagnosticGetDiagnosticsHandler.new, + diagnosticRequestGetServerPort: DiagnosticGetServerPortHandler.new, - EDIT_REQUEST_FORMAT: EditFormatHandler.new, - EDIT_REQUEST_FORMAT_IF_ENABLED: EditFormatIfEnabledHandler.new, - EDIT_REQUEST_GET_ASSISTS: EditGetAssistsHandler.new, - EDIT_REQUEST_GET_AVAILABLE_REFACTORINGS: + editRequestFormat: EditFormatHandler.new, + editRequestFormatIfEnabled: EditFormatIfEnabledHandler.new, + editRequestGetAssists: EditGetAssistsHandler.new, + editRequestGetAvailableRefactorings: EditGetAvailableRefactoringsHandler.new, - EDIT_REQUEST_BULK_FIXES: EditBulkFixes.new, - EDIT_REQUEST_GET_FIXES: EditGetFixesHandler.new, - EDIT_REQUEST_GET_REFACTORING: EditGetRefactoringHandler.new, - EDIT_REQUEST_IMPORT_ELEMENTS: EditImportElementsHandler.new, - EDIT_REQUEST_ORGANIZE_DIRECTIVES: EditOrganizeDirectivesHandler.new, - EDIT_REQUEST_SORT_MEMBERS: EditSortMembersHandler.new, - EDIT_REQUEST_GET_STATEMENT_COMPLETION: - EditGetStatementCompletionHandler.new, - EDIT_REQUEST_IS_POSTFIX_COMPLETION_APPLICABLE: + editRequestBulkFixes: EditBulkFixes.new, + editRequestGetFixes: EditGetFixesHandler.new, + editRequestGetRefactoring: EditGetRefactoringHandler.new, + editRequestImportElements: EditImportElementsHandler.new, + editRequestOrganizeDirectives: EditOrganizeDirectivesHandler.new, + editRequestSortMembers: EditSortMembersHandler.new, + editRequestGetStatementCompletion: EditGetStatementCompletionHandler.new, + editRequestIsPostfixCompletionApplicable: EditIsPostfixCompletionApplicableHandler.new, - EDIT_REQUEST_GET_POSTFIX_COMPLETION: EditGetPostfixCompletionHandler.new, - EDIT_REQUEST_LIST_POSTFIX_COMPLETION_TEMPLATES: + editRequestGetPostfixCompletion: EditGetPostfixCompletionHandler.new, + editRequestListPostfixCompletionTemplates: EditListPostfixCompletionTemplatesHandler.new, - EXECUTION_REQUEST_CREATE_CONTEXT: ExecutionCreateContextHandler.new, - EXECUTION_REQUEST_DELETE_CONTEXT: ExecutionDeleteContextHandler.new, - EXECUTION_REQUEST_GET_SUGGESTIONS: ExecutionGetSuggestionsHandler.new, - EXECUTION_REQUEST_MAP_URI: ExecutionMapUriHandler.new, - EXECUTION_REQUEST_SET_SUBSCRIPTIONS: ExecutionSetSubscriptionsHandler.new, + executionRequestCreateContext: ExecutionCreateContextHandler.new, + executionRequestDeleteContext: ExecutionDeleteContextHandler.new, + executionRequestGetSuggestions: ExecutionGetSuggestionsHandler.new, + executionRequestMapUri: ExecutionMapUriHandler.new, + executionRequestSetSubscriptions: ExecutionSetSubscriptionsHandler.new, - FLUTTER_REQUEST_GET_WIDGET_DESCRIPTION: - FlutterGetWidgetDescriptionHandler.new, - FLUTTER_REQUEST_SET_WIDGET_PROPERTY_VALUE: + flutterRequestGetWidgetDescription: FlutterGetWidgetDescriptionHandler.new, + flutterRequestSetWidgetPropertyValue: FlutterSetWidgetPropertyValueHandler.new, - FLUTTER_REQUEST_SET_SUBSCRIPTIONS: FlutterSetSubscriptionsHandler.new, + flutterRequestSetSubscriptions: FlutterSetSubscriptionsHandler.new, - SEARCH_REQUEST_FIND_ELEMENT_REFERENCES: - SearchFindElementReferencesHandler.new, - SEARCH_REQUEST_FIND_MEMBER_DECLARATIONS: + searchRequestFindElementReferences: SearchFindElementReferencesHandler.new, + searchRequestFindMemberDeclarations: SearchFindMemberDeclarationsHandler.new, - SEARCH_REQUEST_FIND_MEMBER_REFERENCES: - SearchFindMemberReferencesHandler.new, - SEARCH_REQUEST_FIND_TOP_LEVEL_DECLARATIONS: + searchRequestFindMemberReferences: SearchFindMemberReferencesHandler.new, + searchRequestFindTopLevelDeclarations: SearchFindTopLevelDeclarationsHandler.new, - SEARCH_REQUEST_GET_ELEMENT_DECLARATIONS: + searchRequestGetElementDeclarations: SearchGetElementDeclarationsHandler.new, - SEARCH_REQUEST_GET_TYPE_HIERARCHY: SearchGetTypeHierarchyHandler.new, + searchRequestGetTypeHierarchy: SearchGetTypeHierarchyHandler.new, - SERVER_REQUEST_CANCEL_REQUEST: ServerCancelRequestHandler.new, - SERVER_REQUEST_GET_VERSION: ServerGetVersionHandler.new, - SERVER_REQUEST_SET_CLIENT_CAPABILITIES: - ServerSetClientCapabilitiesHandler.new, - SERVER_REQUEST_SET_SUBSCRIPTIONS: ServerSetSubscriptionsHandler.new, - SERVER_REQUEST_SHUTDOWN: ServerShutdownHandler.new, + serverRequestCancelRequest: ServerCancelRequestHandler.new, + serverRequestGetVersion: ServerGetVersionHandler.new, + serverRequestSetClientCapabilities: ServerSetClientCapabilitiesHandler.new, + serverRequestSetSubscriptions: ServerSetSubscriptionsHandler.new, + serverRequestShutdown: ServerShutdownHandler.new, - LSP_REQUEST_HANDLE: LspOverLegacyHandler.new, + lspRequestHandle: LspOverLegacyHandler.new, }; /// The channel from which requests are received and to which responses should @@ -771,7 +765,7 @@ class LegacyAnalysisServer extends AnalysisServer { var response = await sendRequest( Request( id.toString(), - LSP_REQUEST_HANDLE, + lspRequestHandle, LspHandleParams(lspMessage).toJson(clientUriConverter: uriConverter), ), ); diff --git a/pkg/analysis_server/lib/src/scheduler/message_scheduler.dart b/pkg/analysis_server/lib/src/scheduler/message_scheduler.dart index d3cac44905f..cb0281d9d29 100644 --- a/pkg/analysis_server/lib/src/scheduler/message_scheduler.dart +++ b/pkg/analysis_server/lib/src/scheduler/message_scheduler.dart @@ -93,7 +93,7 @@ final class MessageScheduler { if (message is LegacyMessage) { var request = message.request; var method = request.method; - if (method == legacy.SERVER_REQUEST_CANCEL_REQUEST) { + if (method == legacy.serverRequestCancelRequest) { var id = legacy.ServerCancelRequestParams.fromRequest( request, clientUriConverter: server.uriConverter, @@ -103,11 +103,11 @@ final class MessageScheduler { // The message needs to be added to the queue of pending messages, but // it seems like it shouldn't be necessary and that we ought to return // at this point. However, doing so causes some tests to timeout. - } else if (method == legacy.ANALYSIS_REQUEST_UPDATE_CONTENT) { + } else if (method == legacy.analysisRequestUpdateContent) { for (var activeMessage in _activeMessages) { if (activeMessage is LegacyMessage) { var activeRequest = activeMessage.request; - if (activeRequest.method == legacy.LSP_REQUEST_HANDLE) { + if (activeRequest.method == legacy.lspRequestHandle) { var method = _getLspOverLegacyParams(activeRequest)?['method']; if (method == lsp.Method.workspace_willRenameFiles.toString()) { activeMessage.cancellationToken?.cancel( diff --git a/pkg/analysis_server/lib/src/server/debounce_requests.dart b/pkg/analysis_server/lib/src/server/debounce_requests.dart index 0884da82575..7af04c1ed10 100644 --- a/pkg/analysis_server/lib/src/server/debounce_requests.dart +++ b/pkg/analysis_server/lib/src/server/debounce_requests.dart @@ -70,10 +70,10 @@ class _DebounceRequests { var abortFixesRequests = false; for (var requestOrResponse in requests.reversed) { if (requestOrResponse is Request) { - if (requestOrResponse.method == ANALYSIS_REQUEST_UPDATE_CONTENT) { + if (requestOrResponse.method == analysisRequestUpdateContent) { abortCompletionRequests = true; } else if (requestOrResponse.method == - COMPLETION_REQUEST_GET_SUGGESTIONS2) { + completionRequestGetSuggestions2) { if (abortCompletionRequests) { discardedRequests.add(requestOrResponse); var params = CompletionGetSuggestions2Params.fromRequest( @@ -95,7 +95,7 @@ class _DebounceRequests { } else { abortCompletionRequests = true; } - } else if (requestOrResponse.method == ANALYSIS_REQUEST_GET_HOVER) { + } else if (requestOrResponse.method == analysisRequestGetHover) { if (abortHoverRequests) { discardedRequests.add(requestOrResponse); channel.sendResponse( @@ -110,7 +110,7 @@ class _DebounceRequests { } else { abortHoverRequests = true; } - } else if (requestOrResponse.method == EDIT_REQUEST_GET_ASSISTS) { + } else if (requestOrResponse.method == editRequestGetAssists) { if (abortAssistsRequests) { discardedRequests.add(requestOrResponse); channel.sendResponse( @@ -125,7 +125,7 @@ class _DebounceRequests { } else { abortAssistsRequests = true; } - } else if (requestOrResponse.method == EDIT_REQUEST_GET_FIXES) { + } else if (requestOrResponse.method == editRequestGetFixes) { if (abortFixesRequests) { discardedRequests.add(requestOrResponse); channel.sendResponse( diff --git a/pkg/analysis_server/test/analysis/notification_analysis_options_test.dart b/pkg/analysis_server/test/analysis/notification_analysis_options_test.dart index 0e6cec8e923..4dff7831fdb 100644 --- a/pkg/analysis_server/test/analysis/notification_analysis_options_test.dart +++ b/pkg/analysis_server/test/analysis/notification_analysis_options_test.dart @@ -40,7 +40,7 @@ void f() { @override void processNotification(Notification notification) { - if (notification.event == ANALYSIS_NOTIFICATION_ERRORS) { + if (notification.event == analysisNotificationErrors) { var decoded = AnalysisErrorsParams.fromNotification( notification, clientUriConverter: server.uriConverter, diff --git a/pkg/analysis_server/test/analysis/notification_analyzed_files_test.dart b/pkg/analysis_server/test/analysis/notification_analyzed_files_test.dart index f4e2e769e39..95ac545c332 100644 --- a/pkg/analysis_server/test/analysis/notification_analyzed_files_test.dart +++ b/pkg/analysis_server/test/analysis/notification_analyzed_files_test.dart @@ -40,7 +40,7 @@ class AnalysisNotificationAnalyzedFilesTest @override void processNotification(Notification notification) { - if (notification.event == ANALYSIS_NOTIFICATION_ANALYZED_FILES) { + if (notification.event == analysisNotificationAnalyzedFiles) { var params = AnalysisAnalyzedFilesParams.fromNotification( notification, clientUriConverter: server.uriConverter, diff --git a/pkg/analysis_server/test/analysis/notification_closing_labels_test.dart b/pkg/analysis_server/test/analysis/notification_closing_labels_test.dart index f25aa2585fb..70165e1eb3d 100644 --- a/pkg/analysis_server/test/analysis/notification_closing_labels_test.dart +++ b/pkg/analysis_server/test/analysis/notification_closing_labels_test.dart @@ -44,7 +44,7 @@ Widget build(BuildContext context) { @override void processNotification(Notification notification) { - if (notification.event == ANALYSIS_NOTIFICATION_CLOSING_LABELS) { + if (notification.event == analysisNotificationClosingLabels) { var params = AnalysisClosingLabelsParams.fromNotification( notification, clientUriConverter: server.uriConverter, @@ -53,7 +53,7 @@ Widget build(BuildContext context) { lastLabels = params.labels; _labelsReceived.complete(); } - } else if (notification.event == SERVER_NOTIFICATION_ERROR) { + } else if (notification.event == serverNotificationError) { var params = ServerErrorParams.fromNotification( notification, clientUriConverter: server.uriConverter, diff --git a/pkg/analysis_server/test/analysis/notification_errors_test.dart b/pkg/analysis_server/test/analysis/notification_errors_test.dart index 9e6fe56a5dc..ec76d412e80 100644 --- a/pkg/analysis_server/test/analysis/notification_errors_test.dart +++ b/pkg/analysis_server/test/analysis/notification_errors_test.dart @@ -27,13 +27,13 @@ class NotificationErrorsTest extends PubPackageAnalysisServerTest { @override void processNotification(Notification notification) { - if (notification.event == ANALYSIS_NOTIFICATION_ERRORS) { + if (notification.event == analysisNotificationErrors) { var decoded = AnalysisErrorsParams.fromNotification( notification, clientUriConverter: server.uriConverter, ); filesErrors[getFile(decoded.file)] = decoded.errors; - } else if (notification.event == ANALYSIS_NOTIFICATION_FLUSH_RESULTS) { + } else if (notification.event == analysisNotificationFlushResults) { var decoded = AnalysisFlushResultsParams.fromNotification( notification, clientUriConverter: server.uriConverter, diff --git a/pkg/analysis_server/test/analysis/notification_folding_test.dart b/pkg/analysis_server/test/analysis/notification_folding_test.dart index 63984e8c39c..29af3b63c14 100644 --- a/pkg/analysis_server/test/analysis/notification_folding_test.dart +++ b/pkg/analysis_server/test/analysis/notification_folding_test.dart @@ -43,7 +43,7 @@ main async() {} @override void processNotification(Notification notification) { - if (notification.event == ANALYSIS_NOTIFICATION_FOLDING) { + if (notification.event == analysisNotificationFolding) { var params = AnalysisFoldingParams.fromNotification( notification, clientUriConverter: server.uriConverter, @@ -52,7 +52,7 @@ main async() {} lastRegions = params.regions; _regionsReceived.complete(); } - } else if (notification.event == SERVER_NOTIFICATION_ERROR) { + } else if (notification.event == serverNotificationError) { var params = ServerErrorParams.fromNotification( notification, clientUriConverter: server.uriConverter, diff --git a/pkg/analysis_server/test/analysis/notification_highlights2_test.dart b/pkg/analysis_server/test/analysis/notification_highlights2_test.dart index a1e07279ac8..698c77bf5c8 100644 --- a/pkg/analysis_server/test/analysis/notification_highlights2_test.dart +++ b/pkg/analysis_server/test/analysis/notification_highlights2_test.dart @@ -2761,12 +2761,12 @@ class HighlightsTestSupport extends PubPackageAnalysisServerTest { @override void processNotification(Notification notification) { - if (notification.event == SERVER_NOTIFICATION_ERROR) { + if (notification.event == serverNotificationError) { print('SERVER_NOTIFICATION_ERROR: ${notification.toJson()}'); _resultsAvailable.complete(); fail('SERVER_NOTIFICATION_ERROR'); } - if (notification.event == ANALYSIS_NOTIFICATION_HIGHLIGHTS) { + if (notification.event == analysisNotificationHighlights) { var params = AnalysisHighlightsParams.fromNotification( notification, clientUriConverter: server.uriConverter, diff --git a/pkg/analysis_server/test/analysis/notification_implemented_test.dart b/pkg/analysis_server/test/analysis/notification_implemented_test.dart index bbdec2b541b..7461b060cba 100644 --- a/pkg/analysis_server/test/analysis/notification_implemented_test.dart +++ b/pkg/analysis_server/test/analysis/notification_implemented_test.dart @@ -98,7 +98,7 @@ class AnalysisNotificationImplementedTest extends PubPackageAnalysisServerTest { @override void processNotification(Notification notification) { - if (notification.event == ANALYSIS_NOTIFICATION_IMPLEMENTED) { + if (notification.event == analysisNotificationImplemented) { var params = AnalysisImplementedParams.fromNotification( notification, clientUriConverter: server.uriConverter, diff --git a/pkg/analysis_server/test/analysis/notification_navigation_test.dart b/pkg/analysis_server/test/analysis/notification_navigation_test.dart index fbfff5e3124..4649470a71c 100644 --- a/pkg/analysis_server/test/analysis/notification_navigation_test.dart +++ b/pkg/analysis_server/test/analysis/notification_navigation_test.dart @@ -203,7 +203,7 @@ class AnalysisNotificationNavigationTest extends AbstractNavigationTest { @override void processNotification(Notification notification) { - if (notification.event == ANALYSIS_NOTIFICATION_NAVIGATION) { + if (notification.event == analysisNotificationNavigation) { var params = AnalysisNavigationParams.fromNotification( notification, clientUriConverter: server.uriConverter, diff --git a/pkg/analysis_server/test/analysis/notification_occurrences_test.dart b/pkg/analysis_server/test/analysis/notification_occurrences_test.dart index f3ecef8c842..17b47154f7d 100644 --- a/pkg/analysis_server/test/analysis/notification_occurrences_test.dart +++ b/pkg/analysis_server/test/analysis/notification_occurrences_test.dart @@ -99,7 +99,7 @@ class AnalysisNotificationOccurrencesTest extends PubPackageAnalysisServerTest { @override void processNotification(Notification notification) { - if (notification.event == ANALYSIS_NOTIFICATION_OCCURRENCES) { + if (notification.event == analysisNotificationOccurrences) { var params = AnalysisOccurrencesParams.fromNotification( notification, clientUriConverter: server.uriConverter, diff --git a/pkg/analysis_server/test/analysis/notification_outline_test.dart b/pkg/analysis_server/test/analysis/notification_outline_test.dart index 0d5a7b3e5ea..572d55a1570 100644 --- a/pkg/analysis_server/test/analysis/notification_outline_test.dart +++ b/pkg/analysis_server/test/analysis/notification_outline_test.dart @@ -35,7 +35,7 @@ class AnalysisNotificationOutlineTest extends PubPackageAnalysisServerTest { @override void processNotification(Notification notification) { - if (notification.event == ANALYSIS_NOTIFICATION_OUTLINE) { + if (notification.event == analysisNotificationOutline) { var params = AnalysisOutlineParams.fromNotification( notification, clientUriConverter: server.uriConverter, @@ -47,7 +47,7 @@ class AnalysisNotificationOutlineTest extends PubPackageAnalysisServerTest { _outlineReceived.complete(); } } - if (notification.event == ANALYSIS_NOTIFICATION_HIGHLIGHTS) { + if (notification.event == analysisNotificationHighlights) { var params = AnalysisHighlightsParams.fromNotification( notification, clientUriConverter: server.uriConverter, diff --git a/pkg/analysis_server/test/analysis/notification_overrides_test.dart b/pkg/analysis_server/test/analysis/notification_overrides_test.dart index e6b1b54006a..b62bb531253 100644 --- a/pkg/analysis_server/test/analysis/notification_overrides_test.dart +++ b/pkg/analysis_server/test/analysis/notification_overrides_test.dart @@ -127,7 +127,7 @@ class AnalysisNotificationOverridesTest extends PubPackageAnalysisServerTest { @override void processNotification(Notification notification) { - if (notification.event == ANALYSIS_NOTIFICATION_OVERRIDES) { + if (notification.event == analysisNotificationOverrides) { var params = AnalysisOverridesParams.fromNotification( notification, clientUriConverter: server.uriConverter, diff --git a/pkg/analysis_server/test/analysis/reanalyze_test.dart b/pkg/analysis_server/test/analysis/reanalyze_test.dart index bd9f0ca977c..ab266bf6d71 100644 --- a/pkg/analysis_server/test/analysis/reanalyze_test.dart +++ b/pkg/analysis_server/test/analysis/reanalyze_test.dart @@ -24,7 +24,7 @@ class ReanalyzeTest extends PubPackageAnalysisServerTest { @override void processNotification(Notification notification) { - if (notification.event == ANALYSIS_NOTIFICATION_ERRORS) { + if (notification.event == analysisNotificationErrors) { var decoded = AnalysisErrorsParams.fromNotification( notification, clientUriConverter: server.uriConverter, diff --git a/pkg/analysis_server/test/analysis/update_content_test.dart b/pkg/analysis_server/test/analysis/update_content_test.dart index 9fcd1c165af..2cee47a6118 100644 --- a/pkg/analysis_server/test/analysis/update_content_test.dart +++ b/pkg/analysis_server/test/analysis/update_content_test.dart @@ -28,7 +28,7 @@ class UpdateContentTest extends PubPackageAnalysisServerTest { @override void processNotification(Notification notification) { - if (notification.event == ANALYSIS_NOTIFICATION_ERRORS) { + if (notification.event == analysisNotificationErrors) { var decoded = AnalysisErrorsParams.fromNotification( notification, clientUriConverter: server.uriConverter, @@ -36,10 +36,10 @@ class UpdateContentTest extends PubPackageAnalysisServerTest { String format(AnalysisError e) => '${e.location.startLine}: ${e.message}'; filesErrors[getFile(decoded.file)] = decoded.errors.map(format).toList(); } - if (notification.event == ANALYSIS_NOTIFICATION_NAVIGATION) { + if (notification.event == analysisNotificationNavigation) { navigationCount++; } - if (notification.event == SERVER_NOTIFICATION_ERROR) { + if (notification.event == serverNotificationError) { serverErrorCount++; } } diff --git a/pkg/analysis_server/test/analysis_server_test.dart b/pkg/analysis_server/test/analysis_server_test.dart index dae95811da0..f3275481a35 100644 --- a/pkg/analysis_server/test/analysis_server_test.dart +++ b/pkg/analysis_server/test/analysis_server_test.dart @@ -182,10 +182,10 @@ class X extends A with M {} errorNotifier.logException(Exception('dummy exception')); var errors = channel.notificationsReceived.where( - (notification) => notification.event == SERVER_NOTIFICATION_ERROR, + (notification) => notification.event == serverNotificationError, ); expect( - errors.single.params![SERVER_NOTIFICATION_ERROR_MESSAGE], + errors.single.params![serverNotificationErrorMessage], contains('dummy exception'), ); } @@ -198,10 +198,10 @@ class X extends A with M {} ); var errors = channel.notificationsReceived.where( - (notification) => notification.event == SERVER_NOTIFICATION_ERROR, + (notification) => notification.event == serverNotificationError, ); expect( - errors.single.params![SERVER_NOTIFICATION_ERROR_MESSAGE], + errors.single.params![serverNotificationErrorMessage], contains('dummy exception'), ); } @@ -223,7 +223,7 @@ class A {} // At least one notification indicating analysis is in progress. expect( notifications.any((Notification notification) { - if (notification.event == SERVER_NOTIFICATION_STATUS) { + if (notification.event == serverNotificationStatus) { var params = ServerStatusParams.fromNotification( notification, clientUriConverter: server.uriConverter, @@ -262,7 +262,7 @@ class A {} // At least one notification indicating analysis is in progress. expect( notifications.any((Notification notification) { - if (notification.event == SERVER_NOTIFICATION_STATUS) { + if (notification.event == serverNotificationStatus) { var params = ServerStatusParams.fromNotification( notification, clientUriConverter: server.uriConverter, @@ -304,7 +304,7 @@ analyzer: await pumpEventQueue(times: 5000); expect( channel.notificationsReceived.any((notification) { - return notification.event == ANALYSIS_NOTIFICATION_NAVIGATION; + return notification.event == analysisNotificationNavigation; }), isTrue, ); @@ -328,14 +328,14 @@ analyzer: await pumpEventQueue(times: 5000); expect( channel.notificationsReceived.any((notification) { - return notification.event == ANALYSIS_NOTIFICATION_NAVIGATION; + return notification.event == analysisNotificationNavigation; }), isTrue, ); } Future test_shutdown() { - var request = Request('my28', SERVER_REQUEST_SHUTDOWN); + var request = Request('my28', serverRequestShutdown); return channel.simulateRequestFromClient(request).then((Response response) { expect(response.id, equals('my28')); expect(response.error, isNull); diff --git a/pkg/analysis_server/test/client/impl/completion_driver.dart b/pkg/analysis_server/test/client/impl/completion_driver.dart index 49f821271bf..37c5d8481c8 100644 --- a/pkg/analysis_server/test/client/impl/completion_driver.dart +++ b/pkg/analysis_server/test/client/impl/completion_driver.dart @@ -74,23 +74,23 @@ class CompletionDriver with ExpectMixin { @mustCallSuper Future processNotification(Notification notification) async { - if (notification.event == COMPLETION_NOTIFICATION_EXISTING_IMPORTS) { + if (notification.event == completionNotificationExistingImports) { var params = CompletionExistingImportsParams.fromNotification( notification, clientUriConverter: null, ); fileToExistingImports[params.file] = params.imports; - } else if (notification.event == ANALYSIS_NOTIFICATION_ERRORS) { + } else if (notification.event == analysisNotificationErrors) { var decoded = AnalysisErrorsParams.fromNotification( notification, clientUriConverter: null, ); filesErrors[decoded.file] = decoded.errors; - } else if (notification.event == ANALYSIS_NOTIFICATION_FLUSH_RESULTS) { + } else if (notification.event == analysisNotificationFlushResults) { // Ignored. - } else if (notification.event == SERVER_NOTIFICATION_ERROR) { + } else if (notification.event == serverNotificationError) { throw Exception('server error: ${notification.toJson()}'); - } else if (notification.event == SERVER_NOTIFICATION_CONNECTED) { + } else if (notification.event == serverNotificationConnected) { // Ignored. } else { print('Unhandled notification: ${notification.event}'); diff --git a/pkg/analysis_server/test/domain_analysis_test.dart b/pkg/analysis_server/test/domain_analysis_test.dart index 5351045be15..3ab129e9834 100644 --- a/pkg/analysis_server/test/domain_analysis_test.dart +++ b/pkg/analysis_server/test/domain_analysis_test.dart @@ -2467,7 +2467,7 @@ class SetSubscriptionsTest extends PubPackageAnalysisServerTest { @override void processNotification(Notification notification) { super.processNotification(notification); - if (notification.event == ANALYSIS_NOTIFICATION_HIGHLIGHTS) { + if (notification.event == analysisNotificationHighlights) { var params = AnalysisHighlightsParams.fromNotification( notification, clientUriConverter: server.uriConverter, @@ -2645,14 +2645,14 @@ class _AnalysisDomainTest extends PubPackageAnalysisServerTest { @override void processNotification(Notification notification) { - if (notification.event == ANALYSIS_NOTIFICATION_FLUSH_RESULTS) { + if (notification.event == analysisNotificationFlushResults) { var decoded = AnalysisFlushResultsParams.fromNotification( notification, clientUriConverter: server.uriConverter, ); notifications.add((notification.event, decoded)); } - if (notification.event == ANALYSIS_NOTIFICATION_ERRORS) { + if (notification.event == analysisNotificationErrors) { var decoded = AnalysisErrorsParams.fromNotification( notification, clientUriConverter: server.uriConverter, diff --git a/pkg/analysis_server/test/domain_completion_util.dart b/pkg/analysis_server/test/domain_completion_util.dart index b3d3c63fb7c..1130d585a3f 100644 --- a/pkg/analysis_server/test/domain_completion_util.dart +++ b/pkg/analysis_server/test/domain_completion_util.dart @@ -122,7 +122,7 @@ class AbstractCompletionDomainTest extends PubPackageAnalysisServerTest { @override Future processNotification(Notification notification) async { - if (notification.event == SERVER_NOTIFICATION_ERROR) { + if (notification.event == serverNotificationError) { fail('server error: ${notification.toJson()}'); } } diff --git a/pkg/analysis_server/test/domain_server_test.dart b/pkg/analysis_server/test/domain_server_test.dart index 782dfbcb533..66aad5f6b39 100644 --- a/pkg/analysis_server/test/domain_server_test.dart +++ b/pkg/analysis_server/test/domain_server_test.dart @@ -352,7 +352,7 @@ class ServerDomainTest extends PubPackageAnalysisServerTest { } Future test_setSubscriptions_invalidServiceName() async { - var request = Request('0', SERVER_REQUEST_SET_SUBSCRIPTIONS, { + var request = Request('0', serverRequestSetSubscriptions, { subscriptionsKey: ['noSuchService'], }); var response = await handleRequest(request); diff --git a/pkg/analysis_server/test/lsp_over_legacy/abstract_lsp_over_legacy.dart b/pkg/analysis_server/test/lsp_over_legacy/abstract_lsp_over_legacy.dart index 652e9d9e16c..36451f8b9c5 100644 --- a/pkg/analysis_server/test/lsp_over_legacy/abstract_lsp_over_legacy.dart +++ b/pkg/analysis_server/test/lsp_over_legacy/abstract_lsp_over_legacy.dart @@ -33,21 +33,21 @@ class EventsCollector { EventsCollector(this.test) { test.notificationListener = (notification) { switch (notification.event) { - case ANALYSIS_NOTIFICATION_ERRORS: + case analysisNotificationErrors: events.add( AnalysisErrorsParams.fromNotification( notification, clientUriConverter: test.server.uriConverter, ), ); - case ANALYSIS_NOTIFICATION_FLUSH_RESULTS: + case analysisNotificationFlushResults: events.add( AnalysisFlushResultsParams.fromNotification( notification, clientUriConverter: test.server.uriConverter, ), ); - case LSP_NOTIFICATION_NOTIFICATION: + case lspNotificationNotification: var params = LspNotificationParams.fromNotification( notification, clientUriConverter: test.server.uriConverter, @@ -174,7 +174,7 @@ abstract class LspOverLegacyTest extends PubPackageAnalysisServerTest @override Stream get requestsFromServer => serverChannel .serverToClientRequests - .where((request) => request.method == LSP_REQUEST_HANDLE) + .where((request) => request.method == lspRequestHandle) .map((request) { var params = LspHandleParams.fromRequest( request, @@ -280,7 +280,7 @@ abstract class LspOverLegacyTest extends PubPackageAnalysisServerTest @override void processNotification(Notification notification) { super.processNotification(notification); - if (notification.event == LSP_NOTIFICATION_NOTIFICATION) { + if (notification.event == lspNotificationNotification) { var params = LspNotificationParams.fromNotification( notification, clientUriConverter: server.uriConverter, diff --git a/pkg/analysis_server/test/search/abstract_search_domain.dart b/pkg/analysis_server/test/search/abstract_search_domain.dart index 61ec4f5af2c..3d01f95e4cf 100644 --- a/pkg/analysis_server/test/search/abstract_search_domain.dart +++ b/pkg/analysis_server/test/search/abstract_search_domain.dart @@ -73,7 +73,7 @@ class AbstractSearchDomainTest extends PubPackageAnalysisServerTest { @override void processNotification(Notification notification) { super.processNotification(notification); - if (notification.event == SEARCH_NOTIFICATION_RESULTS) { + if (notification.event == searchNotificationResults) { var params = SearchResultsParams.fromNotification( notification, clientUriConverter: server.uriConverter, diff --git a/pkg/analysis_server/test/socket_server_test.dart b/pkg/analysis_server/test/socket_server_test.dart index a813c5b8c39..2c4ac45157e 100644 --- a/pkg/analysis_server/test/socket_server_test.dart +++ b/pkg/analysis_server/test/socket_server_test.dart @@ -37,7 +37,7 @@ class SocketServerTest { var server = _createSocketServer(channel1); expect( channel1.notificationsReceived[0].event, - SERVER_NOTIFICATION_CONNECTED, + serverNotificationConnected, ); server.createAnalysisServer(channel2); channel1.expectMsgCount(notificationCount: 1); @@ -64,10 +64,7 @@ class SocketServerTest { var channel = MockServerChannel(); _createSocketServer(channel); channel.expectMsgCount(notificationCount: 1); - expect( - channel.notificationsReceived[0].event, - SERVER_NOTIFICATION_CONNECTED, - ); + expect(channel.notificationsReceived[0].event, serverNotificationConnected); return channel .simulateRequestFromClient( ServerShutdownParams().toRequest('0', clientUriConverter: null), diff --git a/pkg/analysis_server/test/src/analytics/analytics_manager_test.dart b/pkg/analysis_server/test/src/analytics/analytics_manager_test.dart index 8670d1ce03c..eb99c80c6f9 100644 --- a/pkg/analysis_server/test/src/analytics/analytics_manager_test.dart +++ b/pkg/analysis_server/test/src/analytics/analytics_manager_test.dart @@ -255,7 +255,7 @@ class AnalyticsManagerTest with ResourceProviderMixin { var params = AnalysisSetAnalysisRootsParams(['a', 'b', 'c'], ['d', 'e']); var request = Request( '1', - ANALYSIS_REQUEST_SET_ANALYSIS_ROOTS, + analysisRequestSetAnalysisRoots, params.toJson(clientUriConverter: null), ); manager.startedRequest(request: request, startTime: _now()); @@ -267,11 +267,11 @@ class AnalyticsManagerTest with ResourceProviderMixin { _ExpectedEvent.request( eventData: { 'latency': _IsPercentiles(), - 'method': ANALYSIS_REQUEST_SET_ANALYSIS_ROOTS, + 'method': analysisRequestSetAnalysisRoots, 'duration': _IsPercentiles(), - ANALYSIS_REQUEST_SET_ANALYSIS_ROOTS_INCLUDED: + analysisRequestSetAnalysisRootsIncluded: '{"count":1,"percentiles":[3,3,3,3,3]}', - ANALYSIS_REQUEST_SET_ANALYSIS_ROOTS_EXCLUDED: + analysisRequestSetAnalysisRootsExcluded: '{"count":1,"percentiles":[2,2,2,2,2]}', }, ), @@ -283,7 +283,7 @@ class AnalyticsManagerTest with ResourceProviderMixin { var params = AnalysisSetPriorityFilesParams(['a']); var request = Request( '1', - ANALYSIS_REQUEST_SET_PRIORITY_FILES, + analysisRequestSetPriorityFiles, params.toJson(clientUriConverter: null), ); manager.startedRequest(request: request, startTime: _now()); @@ -295,9 +295,9 @@ class AnalyticsManagerTest with ResourceProviderMixin { _ExpectedEvent.request( eventData: { 'latency': _IsPercentiles(), - 'method': ANALYSIS_REQUEST_SET_PRIORITY_FILES, + 'method': analysisRequestSetPriorityFiles, 'duration': _IsPercentiles(), - ANALYSIS_REQUEST_SET_PRIORITY_FILES_FILES: + analysisRequestSetPriorityFilesFiles: '{"count":1,"percentiles":[1,1,1,1,1]}', }, ), @@ -316,7 +316,7 @@ class AnalyticsManagerTest with ResourceProviderMixin { ); var request = Request( '1', - EDIT_REQUEST_GET_REFACTORING, + editRequestGetRefactoring, params.toJson(clientUriConverter: null), ); manager.startedRequest(request: request, startTime: _now()); @@ -328,9 +328,9 @@ class AnalyticsManagerTest with ResourceProviderMixin { _ExpectedEvent.request( eventData: { 'latency': _IsPercentiles(), - 'method': EDIT_REQUEST_GET_REFACTORING, + 'method': editRequestGetRefactoring, 'duration': _IsPercentiles(), - EDIT_REQUEST_GET_REFACTORING_KIND: '{"RENAME":1}', + editRequestGetRefactoringKind: '{"RENAME":1}', }, ), ]); @@ -389,7 +389,7 @@ class AnalyticsManagerTest with ResourceProviderMixin { Future test_server_request_noAdditional() async { _defaultStartup(); manager.startedRequest( - request: Request('1', SERVER_REQUEST_SHUTDOWN), + request: Request('1', serverRequestShutdown), startTime: _now(), ); manager.sentResponse(response: Response('1')); @@ -399,7 +399,7 @@ class AnalyticsManagerTest with ResourceProviderMixin { _ExpectedEvent.request( eventData: { 'latency': _IsPercentiles(), - 'method': SERVER_REQUEST_SHUTDOWN, + 'method': serverRequestShutdown, 'duration': _IsPercentiles(), }, ), diff --git a/pkg/analysis_server/test/src/flutter/flutter_outline_notification_test.dart b/pkg/analysis_server/test/src/flutter/flutter_outline_notification_test.dart index 05b6be241b2..9f61edd54a4 100644 --- a/pkg/analysis_server/test/src/flutter/flutter_outline_notification_test.dart +++ b/pkg/analysis_server/test/src/flutter/flutter_outline_notification_test.dart @@ -40,7 +40,7 @@ class FlutterNotificationOutlineTest extends PubPackageAnalysisServerTest { @override void processNotification(Notification notification) { super.processNotification(notification); - if (notification.event == FLUTTER_NOTIFICATION_OUTLINE) { + if (notification.event == flutterNotificationOutline) { var params = FlutterOutlineParams.fromNotification( notification, clientUriConverter: server.uriConverter, diff --git a/pkg/analysis_server/tool/spec/codegen_protocol_constants.dart b/pkg/analysis_server/tool/spec/codegen_protocol_constants.dart index 20535f65f70..7224c0a5212 100644 --- a/pkg/analysis_server/tool/spec/codegen_protocol_constants.dart +++ b/pkg/analysis_server/tool/spec/codegen_protocol_constants.dart @@ -24,31 +24,32 @@ final GeneratedFile serverTarget = GeneratedFile( }, ); +final _upperCaseLettersPattern = RegExp('[A-Z]'); + /// Generate a name from the [domainName], [kind] and [name] components. String generateConstName(String domainName, String kind, String name) { - var components = []; - components.addAll(_split(domainName)); - components.add(kind); - components.addAll(_split(name)); - return _fromComponents(components); + return _fromComponents([..._split(domainName), kind, ..._split(name)]); } -/// Return a name generated by converting each of the given [components] to an +/// Returns a name generated by converting each of the given [components] to an /// uppercase equivalent, then joining them with underscores. -String _fromComponents(List components) => - components.map((String component) => component.toUpperCase()).join('_'); +String _fromComponents(List components) { + var joinedName = components + .map((s) => '${s[0].toUpperCase()}${s.substring(1)}') + .join(); + return '${joinedName[0].toLowerCase()}${joinedName.substring(1)}'; +} /// Returns the components of the given String that are indicated by an upper /// case letter. Iterable _split(String first) { - var regExp = RegExp('[A-Z]'); var components = []; var start = 1; - var index = first.indexOf(regExp, start); + var index = first.indexOf(_upperCaseLettersPattern, start); while (index >= 0) { components.add(first.substring(start - 1, index)); start = index + 1; - index = first.indexOf(regExp, start); + index = first.indexOf(_upperCaseLettersPattern, start); } components.add(first.substring(start - 1)); return components; @@ -151,10 +152,7 @@ class _ConstantVisitor extends HierarchicalApiVisitor { } for (var field in type.fields) { var name = field.name; - var components = []; - components.add(parentName); - components.addAll(_split(name)); - var fieldConstantName = _fromComponents(components); + var fieldConstantName = _fromComponents([parentName, ..._split(name)]); constants.add(_Constant(fieldConstantName, "'$name'")); } } diff --git a/pkg/analysis_server_client/example/example.dart b/pkg/analysis_server_client/example/example.dart index 9790d7818ce..f9f393ed594 100644 --- a/pkg/analysis_server_client/example/example.dart +++ b/pkg/analysis_server_client/example/example.dart @@ -29,9 +29,9 @@ void main(List args) async { } // Request analysis - await server.send(SERVER_REQUEST_SET_SUBSCRIPTIONS, + await server.send(serverRequestSetSubscriptions, ServerSetSubscriptionsParams([ServerService.STATUS]).toJson()); - await server.send(ANALYSIS_REQUEST_SET_ANALYSIS_ROOTS, + await server.send(analysisRequestSetAnalysisRoots, AnalysisSetAnalysisRootsParams([target], const []).toJson()); // Continue to watch for analysis until the user presses Ctrl-C diff --git a/pkg/analysis_server_client/lib/handler/notification_handler.dart b/pkg/analysis_server_client/lib/handler/notification_handler.dart index 1e2265e7bd2..21296ffe19b 100644 --- a/pkg/analysis_server_client/lib/handler/notification_handler.dart +++ b/pkg/analysis_server_client/lib/handler/notification_handler.dart @@ -19,89 +19,89 @@ mixin NotificationHandler { var params = notification.params; var decoder = ResponseDecoder(null); switch (notification.event) { - case ANALYSIS_NOTIFICATION_ANALYZED_FILES: + case analysisNotificationAnalyzedFiles: onAnalysisAnalyzedFiles( AnalysisAnalyzedFilesParams.fromJson(decoder, 'params', params)); break; - case ANALYSIS_NOTIFICATION_CLOSING_LABELS: + case analysisNotificationClosingLabels: onAnalysisClosingLabels( AnalysisClosingLabelsParams.fromJson(decoder, 'params', params)); break; - case ANALYSIS_NOTIFICATION_ERRORS: + case analysisNotificationErrors: onAnalysisErrors( AnalysisErrorsParams.fromJson(decoder, 'params', params)); break; - case ANALYSIS_NOTIFICATION_FLUSH_RESULTS: + case analysisNotificationFlushResults: onAnalysisFlushResults( AnalysisFlushResultsParams.fromJson(decoder, 'params', params)); break; - case ANALYSIS_NOTIFICATION_FOLDING: + case analysisNotificationFolding: onAnalysisFolding( AnalysisFoldingParams.fromJson(decoder, 'params', params)); break; - case ANALYSIS_NOTIFICATION_HIGHLIGHTS: + case analysisNotificationHighlights: onAnalysisHighlights( AnalysisHighlightsParams.fromJson(decoder, 'params', params)); break; - case ANALYSIS_NOTIFICATION_IMPLEMENTED: + case analysisNotificationImplemented: onAnalysisImplemented( AnalysisImplementedParams.fromJson(decoder, 'params', params)); break; - case ANALYSIS_NOTIFICATION_INVALIDATE: + case analysisNotificationInvalidate: onAnalysisInvalidate( AnalysisInvalidateParams.fromJson(decoder, 'params', params)); break; - case ANALYSIS_NOTIFICATION_NAVIGATION: + case analysisNotificationNavigation: onAnalysisNavigation( AnalysisNavigationParams.fromJson(decoder, 'params', params)); break; - case ANALYSIS_NOTIFICATION_OCCURRENCES: + case analysisNotificationOccurrences: onAnalysisOccurrences( AnalysisOccurrencesParams.fromJson(decoder, 'params', params)); break; - case ANALYSIS_NOTIFICATION_OUTLINE: + case analysisNotificationOutline: onAnalysisOutline( AnalysisOutlineParams.fromJson(decoder, 'params', params)); break; - case ANALYSIS_NOTIFICATION_OVERRIDES: + case analysisNotificationOverrides: onAnalysisOverrides( AnalysisOverridesParams.fromJson(decoder, 'params', params)); break; - case COMPLETION_NOTIFICATION_EXISTING_IMPORTS: + case completionNotificationExistingImports: onCompletionExistingImports(CompletionExistingImportsParams.fromJson( decoder, 'params', params)); break; - case EXECUTION_NOTIFICATION_LAUNCH_DATA: + case executionNotificationLaunchData: onExecutionLaunchData( ExecutionLaunchDataParams.fromJson(decoder, 'params', params)); break; - case FLUTTER_NOTIFICATION_OUTLINE: + case flutterNotificationOutline: onFlutterOutline( FlutterOutlineParams.fromJson(decoder, 'params', params)); break; - case LSP_NOTIFICATION_NOTIFICATION: + case lspNotificationNotification: onLspNotification( LspNotificationParams.fromJson(decoder, 'params', params)); break; - case SEARCH_NOTIFICATION_RESULTS: + case searchNotificationResults: onSearchResults( SearchResultsParams.fromJson(decoder, 'params', params)); break; - case SERVER_NOTIFICATION_CONNECTED: + case serverNotificationConnected: onServerConnected( ServerConnectedParams.fromJson(decoder, 'params', params)); break; - case SERVER_NOTIFICATION_ERROR: + case serverNotificationError: onServerError(ServerErrorParams.fromJson(decoder, 'params', params)); break; - case SERVER_NOTIFICATION_LOG: + case serverNotificationLog: onServerLog(ServerLogParams.fromJson(decoder, 'params', params)); break; - case SERVER_NOTIFICATION_PLUGIN_ERROR: + case serverNotificationPluginError: onServerPluginError( ServerPluginErrorParams.fromJson(decoder, 'params', params)); break; - case SERVER_NOTIFICATION_STATUS: + case serverNotificationStatus: onServerStatus(ServerStatusParams.fromJson(decoder, 'params', params)); break; default: diff --git a/pkg/analysis_server_client/lib/server.dart b/pkg/analysis_server_client/lib/server.dart index 90cb42d4062..2a78b0867b0 100644 --- a/pkg/analysis_server_client/lib/server.dart +++ b/pkg/analysis_server_client/lib/server.dart @@ -173,7 +173,7 @@ class Server extends ServerBase { return -1; } - final future = send(SERVER_REQUEST_SHUTDOWN, null); + final future = send(serverRequestShutdown, null); _process = null; await future // fall through to wait for exit diff --git a/pkg/analysis_server_client/lib/src/protocol/protocol_constants.dart b/pkg/analysis_server_client/lib/src/protocol/protocol_constants.dart index 075a8956a86..bdb2eb2ac41 100644 --- a/pkg/analysis_server_client/lib/src/protocol/protocol_constants.dart +++ b/pkg/analysis_server_client/lib/src/protocol/protocol_constants.dart @@ -8,346 +8,332 @@ const String PROTOCOL_VERSION = '1.40.0'; -const String ANALYSIS_NOTIFICATION_ANALYZED_FILES = 'analysis.analyzedFiles'; -const String ANALYSIS_NOTIFICATION_ANALYZED_FILES_DIRECTORIES = 'directories'; -const String ANALYSIS_NOTIFICATION_CLOSING_LABELS = 'analysis.closingLabels'; -const String ANALYSIS_NOTIFICATION_CLOSING_LABELS_FILE = 'file'; -const String ANALYSIS_NOTIFICATION_CLOSING_LABELS_LABELS = 'labels'; -const String ANALYSIS_NOTIFICATION_ERRORS = 'analysis.errors'; -const String ANALYSIS_NOTIFICATION_ERRORS_ERRORS = 'errors'; -const String ANALYSIS_NOTIFICATION_ERRORS_FILE = 'file'; -const String ANALYSIS_NOTIFICATION_FLUSH_RESULTS = 'analysis.flushResults'; -const String ANALYSIS_NOTIFICATION_FLUSH_RESULTS_FILES = 'files'; -const String ANALYSIS_NOTIFICATION_FOLDING = 'analysis.folding'; -const String ANALYSIS_NOTIFICATION_FOLDING_FILE = 'file'; -const String ANALYSIS_NOTIFICATION_FOLDING_REGIONS = 'regions'; -const String ANALYSIS_NOTIFICATION_HIGHLIGHTS = 'analysis.highlights'; -const String ANALYSIS_NOTIFICATION_HIGHLIGHTS_FILE = 'file'; -const String ANALYSIS_NOTIFICATION_HIGHLIGHTS_REGIONS = 'regions'; -const String ANALYSIS_NOTIFICATION_IMPLEMENTED = 'analysis.implemented'; -const String ANALYSIS_NOTIFICATION_IMPLEMENTED_CLASSES = 'classes'; -const String ANALYSIS_NOTIFICATION_IMPLEMENTED_FILE = 'file'; -const String ANALYSIS_NOTIFICATION_IMPLEMENTED_MEMBERS = 'members'; -const String ANALYSIS_NOTIFICATION_INVALIDATE = 'analysis.invalidate'; -const String ANALYSIS_NOTIFICATION_INVALIDATE_DELTA = 'delta'; -const String ANALYSIS_NOTIFICATION_INVALIDATE_FILE = 'file'; -const String ANALYSIS_NOTIFICATION_INVALIDATE_LENGTH = 'length'; -const String ANALYSIS_NOTIFICATION_INVALIDATE_OFFSET = 'offset'; -const String ANALYSIS_NOTIFICATION_NAVIGATION = 'analysis.navigation'; -const String ANALYSIS_NOTIFICATION_NAVIGATION_FILE = 'file'; -const String ANALYSIS_NOTIFICATION_NAVIGATION_FILES = 'files'; -const String ANALYSIS_NOTIFICATION_NAVIGATION_REGIONS = 'regions'; -const String ANALYSIS_NOTIFICATION_NAVIGATION_TARGETS = 'targets'; -const String ANALYSIS_NOTIFICATION_OCCURRENCES = 'analysis.occurrences'; -const String ANALYSIS_NOTIFICATION_OCCURRENCES_FILE = 'file'; -const String ANALYSIS_NOTIFICATION_OCCURRENCES_OCCURRENCES = 'occurrences'; -const String ANALYSIS_NOTIFICATION_OUTLINE = 'analysis.outline'; -const String ANALYSIS_NOTIFICATION_OUTLINE_FILE = 'file'; -const String ANALYSIS_NOTIFICATION_OUTLINE_KIND = 'kind'; -const String ANALYSIS_NOTIFICATION_OUTLINE_LIBRARY_NAME = 'libraryName'; -const String ANALYSIS_NOTIFICATION_OUTLINE_OUTLINE = 'outline'; -const String ANALYSIS_NOTIFICATION_OVERRIDES = 'analysis.overrides'; -const String ANALYSIS_NOTIFICATION_OVERRIDES_FILE = 'file'; -const String ANALYSIS_NOTIFICATION_OVERRIDES_OVERRIDES = 'overrides'; -const String ANALYSIS_REQUEST_GET_ERRORS = 'analysis.getErrors'; -const String ANALYSIS_REQUEST_GET_ERRORS_FILE = 'file'; -const String ANALYSIS_REQUEST_GET_HOVER = 'analysis.getHover'; -const String ANALYSIS_REQUEST_GET_HOVER_FILE = 'file'; -const String ANALYSIS_REQUEST_GET_HOVER_OFFSET = 'offset'; -const String ANALYSIS_REQUEST_GET_IMPORTED_ELEMENTS = +const String analysisNotificationAnalyzedFiles = 'analysis.analyzedFiles'; +const String analysisNotificationAnalyzedFilesDirectories = 'directories'; +const String analysisNotificationClosingLabels = 'analysis.closingLabels'; +const String analysisNotificationClosingLabelsFile = 'file'; +const String analysisNotificationClosingLabelsLabels = 'labels'; +const String analysisNotificationErrors = 'analysis.errors'; +const String analysisNotificationErrorsErrors = 'errors'; +const String analysisNotificationErrorsFile = 'file'; +const String analysisNotificationFlushResults = 'analysis.flushResults'; +const String analysisNotificationFlushResultsFiles = 'files'; +const String analysisNotificationFolding = 'analysis.folding'; +const String analysisNotificationFoldingFile = 'file'; +const String analysisNotificationFoldingRegions = 'regions'; +const String analysisNotificationHighlights = 'analysis.highlights'; +const String analysisNotificationHighlightsFile = 'file'; +const String analysisNotificationHighlightsRegions = 'regions'; +const String analysisNotificationImplemented = 'analysis.implemented'; +const String analysisNotificationImplementedClasses = 'classes'; +const String analysisNotificationImplementedFile = 'file'; +const String analysisNotificationImplementedMembers = 'members'; +const String analysisNotificationInvalidate = 'analysis.invalidate'; +const String analysisNotificationInvalidateDelta = 'delta'; +const String analysisNotificationInvalidateFile = 'file'; +const String analysisNotificationInvalidateLength = 'length'; +const String analysisNotificationInvalidateOffset = 'offset'; +const String analysisNotificationNavigation = 'analysis.navigation'; +const String analysisNotificationNavigationFile = 'file'; +const String analysisNotificationNavigationFiles = 'files'; +const String analysisNotificationNavigationRegions = 'regions'; +const String analysisNotificationNavigationTargets = 'targets'; +const String analysisNotificationOccurrences = 'analysis.occurrences'; +const String analysisNotificationOccurrencesFile = 'file'; +const String analysisNotificationOccurrencesOccurrences = 'occurrences'; +const String analysisNotificationOutline = 'analysis.outline'; +const String analysisNotificationOutlineFile = 'file'; +const String analysisNotificationOutlineKind = 'kind'; +const String analysisNotificationOutlineLibraryName = 'libraryName'; +const String analysisNotificationOutlineOutline = 'outline'; +const String analysisNotificationOverrides = 'analysis.overrides'; +const String analysisNotificationOverridesFile = 'file'; +const String analysisNotificationOverridesOverrides = 'overrides'; +const String analysisRequestGetErrors = 'analysis.getErrors'; +const String analysisRequestGetErrorsFile = 'file'; +const String analysisRequestGetHover = 'analysis.getHover'; +const String analysisRequestGetHoverFile = 'file'; +const String analysisRequestGetHoverOffset = 'offset'; +const String analysisRequestGetImportedElements = 'analysis.getImportedElements'; -const String ANALYSIS_REQUEST_GET_IMPORTED_ELEMENTS_FILE = 'file'; -const String ANALYSIS_REQUEST_GET_IMPORTED_ELEMENTS_LENGTH = 'length'; -const String ANALYSIS_REQUEST_GET_IMPORTED_ELEMENTS_OFFSET = 'offset'; -const String ANALYSIS_REQUEST_GET_LIBRARY_DEPENDENCIES = +const String analysisRequestGetImportedElementsFile = 'file'; +const String analysisRequestGetImportedElementsLength = 'length'; +const String analysisRequestGetImportedElementsOffset = 'offset'; +const String analysisRequestGetLibraryDependencies = 'analysis.getLibraryDependencies'; -const String ANALYSIS_REQUEST_GET_NAVIGATION = 'analysis.getNavigation'; -const String ANALYSIS_REQUEST_GET_NAVIGATION_FILE = 'file'; -const String ANALYSIS_REQUEST_GET_NAVIGATION_LENGTH = 'length'; -const String ANALYSIS_REQUEST_GET_NAVIGATION_OFFSET = 'offset'; -const String ANALYSIS_REQUEST_GET_REACHABLE_SOURCES = +const String analysisRequestGetNavigation = 'analysis.getNavigation'; +const String analysisRequestGetNavigationFile = 'file'; +const String analysisRequestGetNavigationLength = 'length'; +const String analysisRequestGetNavigationOffset = 'offset'; +const String analysisRequestGetReachableSources = 'analysis.getReachableSources'; -const String ANALYSIS_REQUEST_GET_REACHABLE_SOURCES_FILE = 'file'; -const String ANALYSIS_REQUEST_GET_SIGNATURE = 'analysis.getSignature'; -const String ANALYSIS_REQUEST_GET_SIGNATURE_FILE = 'file'; -const String ANALYSIS_REQUEST_GET_SIGNATURE_OFFSET = 'offset'; -const String ANALYSIS_REQUEST_REANALYZE = 'analysis.reanalyze'; -const String ANALYSIS_REQUEST_SET_ANALYSIS_ROOTS = 'analysis.setAnalysisRoots'; -const String ANALYSIS_REQUEST_SET_ANALYSIS_ROOTS_EXCLUDED = 'excluded'; -const String ANALYSIS_REQUEST_SET_ANALYSIS_ROOTS_INCLUDED = 'included'; -const String ANALYSIS_REQUEST_SET_ANALYSIS_ROOTS_PACKAGE_ROOTS = 'packageRoots'; -const String ANALYSIS_REQUEST_SET_GENERAL_SUBSCRIPTIONS = +const String analysisRequestGetReachableSourcesFile = 'file'; +const String analysisRequestGetSignature = 'analysis.getSignature'; +const String analysisRequestGetSignatureFile = 'file'; +const String analysisRequestGetSignatureOffset = 'offset'; +const String analysisRequestReanalyze = 'analysis.reanalyze'; +const String analysisRequestSetAnalysisRoots = 'analysis.setAnalysisRoots'; +const String analysisRequestSetAnalysisRootsExcluded = 'excluded'; +const String analysisRequestSetAnalysisRootsIncluded = 'included'; +const String analysisRequestSetAnalysisRootsPackageRoots = 'packageRoots'; +const String analysisRequestSetGeneralSubscriptions = 'analysis.setGeneralSubscriptions'; -const String ANALYSIS_REQUEST_SET_GENERAL_SUBSCRIPTIONS_SUBSCRIPTIONS = +const String analysisRequestSetGeneralSubscriptionsSubscriptions = 'subscriptions'; -const String ANALYSIS_REQUEST_SET_PRIORITY_FILES = 'analysis.setPriorityFiles'; -const String ANALYSIS_REQUEST_SET_PRIORITY_FILES_FILES = 'files'; -const String ANALYSIS_REQUEST_SET_SUBSCRIPTIONS = 'analysis.setSubscriptions'; -const String ANALYSIS_REQUEST_SET_SUBSCRIPTIONS_SUBSCRIPTIONS = 'subscriptions'; -const String ANALYSIS_REQUEST_UPDATE_CONTENT = 'analysis.updateContent'; -const String ANALYSIS_REQUEST_UPDATE_CONTENT_FILES = 'files'; -const String ANALYSIS_REQUEST_UPDATE_OPTIONS = 'analysis.updateOptions'; -const String ANALYSIS_REQUEST_UPDATE_OPTIONS_OPTIONS = 'options'; -const String ANALYSIS_RESPONSE_GET_ERRORS_ERRORS = 'errors'; -const String ANALYSIS_RESPONSE_GET_HOVER_HOVERS = 'hovers'; -const String ANALYSIS_RESPONSE_GET_IMPORTED_ELEMENTS_ELEMENTS = 'elements'; -const String ANALYSIS_RESPONSE_GET_LIBRARY_DEPENDENCIES_LIBRARIES = 'libraries'; -const String ANALYSIS_RESPONSE_GET_LIBRARY_DEPENDENCIES_PACKAGE_MAP = - 'packageMap'; -const String ANALYSIS_RESPONSE_GET_NAVIGATION_FILES = 'files'; -const String ANALYSIS_RESPONSE_GET_NAVIGATION_REGIONS = 'regions'; -const String ANALYSIS_RESPONSE_GET_NAVIGATION_TARGETS = 'targets'; -const String ANALYSIS_RESPONSE_GET_REACHABLE_SOURCES_SOURCES = 'sources'; -const String ANALYSIS_RESPONSE_GET_SIGNATURE_DARTDOC = 'dartdoc'; -const String ANALYSIS_RESPONSE_GET_SIGNATURE_NAME = 'name'; -const String ANALYSIS_RESPONSE_GET_SIGNATURE_PARAMETERS = 'parameters'; -const String ANALYTICS_REQUEST_ENABLE = 'analytics.enable'; -const String ANALYTICS_REQUEST_ENABLE_VALUE = 'value'; -const String ANALYTICS_REQUEST_IS_ENABLED = 'analytics.isEnabled'; -const String ANALYTICS_REQUEST_SEND_EVENT = 'analytics.sendEvent'; -const String ANALYTICS_REQUEST_SEND_EVENT_ACTION = 'action'; -const String ANALYTICS_REQUEST_SEND_TIMING = 'analytics.sendTiming'; -const String ANALYTICS_REQUEST_SEND_TIMING_EVENT = 'event'; -const String ANALYTICS_REQUEST_SEND_TIMING_MILLIS = 'millis'; -const String ANALYTICS_RESPONSE_IS_ENABLED_ENABLED = 'enabled'; -const String COMPLETION_NOTIFICATION_EXISTING_IMPORTS = +const String analysisRequestSetPriorityFiles = 'analysis.setPriorityFiles'; +const String analysisRequestSetPriorityFilesFiles = 'files'; +const String analysisRequestSetSubscriptions = 'analysis.setSubscriptions'; +const String analysisRequestSetSubscriptionsSubscriptions = 'subscriptions'; +const String analysisRequestUpdateContent = 'analysis.updateContent'; +const String analysisRequestUpdateContentFiles = 'files'; +const String analysisRequestUpdateOptions = 'analysis.updateOptions'; +const String analysisRequestUpdateOptionsOptions = 'options'; +const String analysisResponseGetErrorsErrors = 'errors'; +const String analysisResponseGetHoverHovers = 'hovers'; +const String analysisResponseGetImportedElementsElements = 'elements'; +const String analysisResponseGetLibraryDependenciesLibraries = 'libraries'; +const String analysisResponseGetLibraryDependenciesPackageMap = 'packageMap'; +const String analysisResponseGetNavigationFiles = 'files'; +const String analysisResponseGetNavigationRegions = 'regions'; +const String analysisResponseGetNavigationTargets = 'targets'; +const String analysisResponseGetReachableSourcesSources = 'sources'; +const String analysisResponseGetSignatureDartdoc = 'dartdoc'; +const String analysisResponseGetSignatureName = 'name'; +const String analysisResponseGetSignatureParameters = 'parameters'; +const String analyticsRequestEnable = 'analytics.enable'; +const String analyticsRequestEnableValue = 'value'; +const String analyticsRequestIsEnabled = 'analytics.isEnabled'; +const String analyticsRequestSendEvent = 'analytics.sendEvent'; +const String analyticsRequestSendEventAction = 'action'; +const String analyticsRequestSendTiming = 'analytics.sendTiming'; +const String analyticsRequestSendTimingEvent = 'event'; +const String analyticsRequestSendTimingMillis = 'millis'; +const String analyticsResponseIsEnabledEnabled = 'enabled'; +const String completionNotificationExistingImports = 'completion.existingImports'; -const String COMPLETION_NOTIFICATION_EXISTING_IMPORTS_FILE = 'file'; -const String COMPLETION_NOTIFICATION_EXISTING_IMPORTS_IMPORTS = 'imports'; -const String COMPLETION_REQUEST_GET_SUGGESTIONS2 = 'completion.getSuggestions2'; -const String COMPLETION_REQUEST_GET_SUGGESTIONS2_COMPLETION_CASE_MATCHING_MODE = - 'completionCaseMatchingMode'; -const String COMPLETION_REQUEST_GET_SUGGESTIONS2_COMPLETION_MODE = - 'completionMode'; -const String COMPLETION_REQUEST_GET_SUGGESTIONS2_FILE = 'file'; -const String COMPLETION_REQUEST_GET_SUGGESTIONS2_INVOCATION_COUNT = - 'invocationCount'; -const String COMPLETION_REQUEST_GET_SUGGESTIONS2_MAX_RESULTS = 'maxResults'; -const String COMPLETION_REQUEST_GET_SUGGESTIONS2_OFFSET = 'offset'; -const String COMPLETION_REQUEST_GET_SUGGESTIONS2_TIMEOUT = 'timeout'; -const String COMPLETION_REQUEST_GET_SUGGESTION_DETAILS2 = +const String completionNotificationExistingImportsFile = 'file'; +const String completionNotificationExistingImportsImports = 'imports'; +const String completionRequestGetSuggestionDetails2 = 'completion.getSuggestionDetails2'; -const String COMPLETION_REQUEST_GET_SUGGESTION_DETAILS2_COMPLETION = - 'completion'; -const String COMPLETION_REQUEST_GET_SUGGESTION_DETAILS2_FILE = 'file'; -const String COMPLETION_REQUEST_GET_SUGGESTION_DETAILS2_LIBRARY_URI = - 'libraryUri'; -const String COMPLETION_REQUEST_GET_SUGGESTION_DETAILS2_OFFSET = 'offset'; -const String COMPLETION_REQUEST_REGISTER_LIBRARY_PATHS = +const String completionRequestGetSuggestionDetails2Completion = 'completion'; +const String completionRequestGetSuggestionDetails2File = 'file'; +const String completionRequestGetSuggestionDetails2LibraryUri = 'libraryUri'; +const String completionRequestGetSuggestionDetails2Offset = 'offset'; +const String completionRequestGetSuggestions2 = 'completion.getSuggestions2'; +const String completionRequestGetSuggestions2CompletionCaseMatchingMode = + 'completionCaseMatchingMode'; +const String completionRequestGetSuggestions2CompletionMode = 'completionMode'; +const String completionRequestGetSuggestions2File = 'file'; +const String completionRequestGetSuggestions2InvocationCount = + 'invocationCount'; +const String completionRequestGetSuggestions2MaxResults = 'maxResults'; +const String completionRequestGetSuggestions2Offset = 'offset'; +const String completionRequestGetSuggestions2Timeout = 'timeout'; +const String completionRequestRegisterLibraryPaths = 'completion.registerLibraryPaths'; -const String COMPLETION_REQUEST_REGISTER_LIBRARY_PATHS_PATHS = 'paths'; -const String COMPLETION_RESPONSE_GET_SUGGESTIONS2_IS_INCOMPLETE = - 'isIncomplete'; -const String COMPLETION_RESPONSE_GET_SUGGESTIONS2_REPLACEMENT_LENGTH = +const String completionRequestRegisterLibraryPathsPaths = 'paths'; +const String completionResponseGetSuggestionDetails2Change = 'change'; +const String completionResponseGetSuggestionDetails2Completion = 'completion'; +const String completionResponseGetSuggestions2IsIncomplete = 'isIncomplete'; +const String completionResponseGetSuggestions2ReplacementLength = 'replacementLength'; -const String COMPLETION_RESPONSE_GET_SUGGESTIONS2_REPLACEMENT_OFFSET = +const String completionResponseGetSuggestions2ReplacementOffset = 'replacementOffset'; -const String COMPLETION_RESPONSE_GET_SUGGESTIONS2_SUGGESTIONS = 'suggestions'; -const String COMPLETION_RESPONSE_GET_SUGGESTION_DETAILS2_CHANGE = 'change'; -const String COMPLETION_RESPONSE_GET_SUGGESTION_DETAILS2_COMPLETION = - 'completion'; -const String DIAGNOSTIC_REQUEST_GET_DIAGNOSTICS = 'diagnostic.getDiagnostics'; -const String DIAGNOSTIC_REQUEST_GET_SERVER_PORT = 'diagnostic.getServerPort'; -const String DIAGNOSTIC_RESPONSE_GET_DIAGNOSTICS_CONTEXTS = 'contexts'; -const String DIAGNOSTIC_RESPONSE_GET_SERVER_PORT_PORT = 'port'; -const String EDIT_REQUEST_BULK_FIXES = 'edit.bulkFixes'; -const String EDIT_REQUEST_BULK_FIXES_CODES = 'codes'; -const String EDIT_REQUEST_BULK_FIXES_INCLUDED = 'included'; -const String EDIT_REQUEST_BULK_FIXES_IN_TEST_MODE = 'inTestMode'; -const String EDIT_REQUEST_BULK_FIXES_UPDATE_PUBSPEC = 'updatePubspec'; -const String EDIT_REQUEST_FORMAT = 'edit.format'; -const String EDIT_REQUEST_FORMAT_FILE = 'file'; -const String EDIT_REQUEST_FORMAT_IF_ENABLED = 'edit.formatIfEnabled'; -const String EDIT_REQUEST_FORMAT_IF_ENABLED_DIRECTORIES = 'directories'; -const String EDIT_REQUEST_FORMAT_LINE_LENGTH = 'lineLength'; -const String EDIT_REQUEST_FORMAT_SELECTION_LENGTH = 'selectionLength'; -const String EDIT_REQUEST_FORMAT_SELECTION_OFFSET = 'selectionOffset'; -const String EDIT_REQUEST_GET_ASSISTS = 'edit.getAssists'; -const String EDIT_REQUEST_GET_ASSISTS_FILE = 'file'; -const String EDIT_REQUEST_GET_ASSISTS_LENGTH = 'length'; -const String EDIT_REQUEST_GET_ASSISTS_OFFSET = 'offset'; -const String EDIT_REQUEST_GET_AVAILABLE_REFACTORINGS = +const String completionResponseGetSuggestions2Suggestions = 'suggestions'; +const String diagnosticRequestGetDiagnostics = 'diagnostic.getDiagnostics'; +const String diagnosticRequestGetServerPort = 'diagnostic.getServerPort'; +const String diagnosticResponseGetDiagnosticsContexts = 'contexts'; +const String diagnosticResponseGetServerPortPort = 'port'; +const String editRequestBulkFixes = 'edit.bulkFixes'; +const String editRequestBulkFixesCodes = 'codes'; +const String editRequestBulkFixesInTestMode = 'inTestMode'; +const String editRequestBulkFixesIncluded = 'included'; +const String editRequestBulkFixesUpdatePubspec = 'updatePubspec'; +const String editRequestFormat = 'edit.format'; +const String editRequestFormatFile = 'file'; +const String editRequestFormatIfEnabled = 'edit.formatIfEnabled'; +const String editRequestFormatIfEnabledDirectories = 'directories'; +const String editRequestFormatLineLength = 'lineLength'; +const String editRequestFormatSelectionLength = 'selectionLength'; +const String editRequestFormatSelectionOffset = 'selectionOffset'; +const String editRequestGetAssists = 'edit.getAssists'; +const String editRequestGetAssistsFile = 'file'; +const String editRequestGetAssistsLength = 'length'; +const String editRequestGetAssistsOffset = 'offset'; +const String editRequestGetAvailableRefactorings = 'edit.getAvailableRefactorings'; -const String EDIT_REQUEST_GET_AVAILABLE_REFACTORINGS_FILE = 'file'; -const String EDIT_REQUEST_GET_AVAILABLE_REFACTORINGS_LENGTH = 'length'; -const String EDIT_REQUEST_GET_AVAILABLE_REFACTORINGS_OFFSET = 'offset'; -const String EDIT_REQUEST_GET_FIXES = 'edit.getFixes'; -const String EDIT_REQUEST_GET_FIXES_FILE = 'file'; -const String EDIT_REQUEST_GET_FIXES_OFFSET = 'offset'; -const String EDIT_REQUEST_GET_POSTFIX_COMPLETION = 'edit.getPostfixCompletion'; -const String EDIT_REQUEST_GET_POSTFIX_COMPLETION_FILE = 'file'; -const String EDIT_REQUEST_GET_POSTFIX_COMPLETION_KEY = 'key'; -const String EDIT_REQUEST_GET_POSTFIX_COMPLETION_OFFSET = 'offset'; -const String EDIT_REQUEST_GET_REFACTORING = 'edit.getRefactoring'; -const String EDIT_REQUEST_GET_REFACTORING_FILE = 'file'; -const String EDIT_REQUEST_GET_REFACTORING_KIND = 'kind'; -const String EDIT_REQUEST_GET_REFACTORING_LENGTH = 'length'; -const String EDIT_REQUEST_GET_REFACTORING_OFFSET = 'offset'; -const String EDIT_REQUEST_GET_REFACTORING_OPTIONS = 'options'; -const String EDIT_REQUEST_GET_REFACTORING_VALIDATE_ONLY = 'validateOnly'; -const String EDIT_REQUEST_GET_STATEMENT_COMPLETION = - 'edit.getStatementCompletion'; -const String EDIT_REQUEST_GET_STATEMENT_COMPLETION_FILE = 'file'; -const String EDIT_REQUEST_GET_STATEMENT_COMPLETION_OFFSET = 'offset'; -const String EDIT_REQUEST_IMPORT_ELEMENTS = 'edit.importElements'; -const String EDIT_REQUEST_IMPORT_ELEMENTS_ELEMENTS = 'elements'; -const String EDIT_REQUEST_IMPORT_ELEMENTS_FILE = 'file'; -const String EDIT_REQUEST_IMPORT_ELEMENTS_OFFSET = 'offset'; -const String EDIT_REQUEST_IS_POSTFIX_COMPLETION_APPLICABLE = +const String editRequestGetAvailableRefactoringsFile = 'file'; +const String editRequestGetAvailableRefactoringsLength = 'length'; +const String editRequestGetAvailableRefactoringsOffset = 'offset'; +const String editRequestGetFixes = 'edit.getFixes'; +const String editRequestGetFixesFile = 'file'; +const String editRequestGetFixesOffset = 'offset'; +const String editRequestGetPostfixCompletion = 'edit.getPostfixCompletion'; +const String editRequestGetPostfixCompletionFile = 'file'; +const String editRequestGetPostfixCompletionKey = 'key'; +const String editRequestGetPostfixCompletionOffset = 'offset'; +const String editRequestGetRefactoring = 'edit.getRefactoring'; +const String editRequestGetRefactoringFile = 'file'; +const String editRequestGetRefactoringKind = 'kind'; +const String editRequestGetRefactoringLength = 'length'; +const String editRequestGetRefactoringOffset = 'offset'; +const String editRequestGetRefactoringOptions = 'options'; +const String editRequestGetRefactoringValidateOnly = 'validateOnly'; +const String editRequestGetStatementCompletion = 'edit.getStatementCompletion'; +const String editRequestGetStatementCompletionFile = 'file'; +const String editRequestGetStatementCompletionOffset = 'offset'; +const String editRequestImportElements = 'edit.importElements'; +const String editRequestImportElementsElements = 'elements'; +const String editRequestImportElementsFile = 'file'; +const String editRequestImportElementsOffset = 'offset'; +const String editRequestIsPostfixCompletionApplicable = 'edit.isPostfixCompletionApplicable'; -const String EDIT_REQUEST_IS_POSTFIX_COMPLETION_APPLICABLE_FILE = 'file'; -const String EDIT_REQUEST_IS_POSTFIX_COMPLETION_APPLICABLE_KEY = 'key'; -const String EDIT_REQUEST_IS_POSTFIX_COMPLETION_APPLICABLE_OFFSET = 'offset'; -const String EDIT_REQUEST_LIST_POSTFIX_COMPLETION_TEMPLATES = +const String editRequestIsPostfixCompletionApplicableFile = 'file'; +const String editRequestIsPostfixCompletionApplicableKey = 'key'; +const String editRequestIsPostfixCompletionApplicableOffset = 'offset'; +const String editRequestListPostfixCompletionTemplates = 'edit.listPostfixCompletionTemplates'; -const String EDIT_REQUEST_ORGANIZE_DIRECTIVES = 'edit.organizeDirectives'; -const String EDIT_REQUEST_ORGANIZE_DIRECTIVES_FILE = 'file'; -const String EDIT_REQUEST_SORT_MEMBERS = 'edit.sortMembers'; -const String EDIT_REQUEST_SORT_MEMBERS_FILE = 'file'; -const String EDIT_RESPONSE_BULK_FIXES_DETAILS = 'details'; -const String EDIT_RESPONSE_BULK_FIXES_EDITS = 'edits'; -const String EDIT_RESPONSE_BULK_FIXES_MESSAGE = 'message'; -const String EDIT_RESPONSE_FORMAT_EDITS = 'edits'; -const String EDIT_RESPONSE_FORMAT_IF_ENABLED_EDITS = 'edits'; -const String EDIT_RESPONSE_FORMAT_SELECTION_LENGTH = 'selectionLength'; -const String EDIT_RESPONSE_FORMAT_SELECTION_OFFSET = 'selectionOffset'; -const String EDIT_RESPONSE_GET_ASSISTS_ASSISTS = 'assists'; -const String EDIT_RESPONSE_GET_AVAILABLE_REFACTORINGS_KINDS = 'kinds'; -const String EDIT_RESPONSE_GET_FIXES_FIXES = 'fixes'; -const String EDIT_RESPONSE_GET_POSTFIX_COMPLETION_CHANGE = 'change'; -const String EDIT_RESPONSE_GET_REFACTORING_CHANGE = 'change'; -const String EDIT_RESPONSE_GET_REFACTORING_FEEDBACK = 'feedback'; -const String EDIT_RESPONSE_GET_REFACTORING_FINAL_PROBLEMS = 'finalProblems'; -const String EDIT_RESPONSE_GET_REFACTORING_INITIAL_PROBLEMS = 'initialProblems'; -const String EDIT_RESPONSE_GET_REFACTORING_OPTIONS_PROBLEMS = 'optionsProblems'; -const String EDIT_RESPONSE_GET_REFACTORING_POTENTIAL_EDITS = 'potentialEdits'; -const String EDIT_RESPONSE_GET_STATEMENT_COMPLETION_CHANGE = 'change'; -const String EDIT_RESPONSE_GET_STATEMENT_COMPLETION_WHITESPACE_ONLY = +const String editRequestOrganizeDirectives = 'edit.organizeDirectives'; +const String editRequestOrganizeDirectivesFile = 'file'; +const String editRequestSortMembers = 'edit.sortMembers'; +const String editRequestSortMembersFile = 'file'; +const String editResponseBulkFixesDetails = 'details'; +const String editResponseBulkFixesEdits = 'edits'; +const String editResponseBulkFixesMessage = 'message'; +const String editResponseFormatEdits = 'edits'; +const String editResponseFormatIfEnabledEdits = 'edits'; +const String editResponseFormatSelectionLength = 'selectionLength'; +const String editResponseFormatSelectionOffset = 'selectionOffset'; +const String editResponseGetAssistsAssists = 'assists'; +const String editResponseGetAvailableRefactoringsKinds = 'kinds'; +const String editResponseGetFixesFixes = 'fixes'; +const String editResponseGetPostfixCompletionChange = 'change'; +const String editResponseGetRefactoringChange = 'change'; +const String editResponseGetRefactoringFeedback = 'feedback'; +const String editResponseGetRefactoringFinalProblems = 'finalProblems'; +const String editResponseGetRefactoringInitialProblems = 'initialProblems'; +const String editResponseGetRefactoringOptionsProblems = 'optionsProblems'; +const String editResponseGetRefactoringPotentialEdits = 'potentialEdits'; +const String editResponseGetStatementCompletionChange = 'change'; +const String editResponseGetStatementCompletionWhitespaceOnly = 'whitespaceOnly'; -const String EDIT_RESPONSE_IMPORT_ELEMENTS_EDIT = 'edit'; -const String EDIT_RESPONSE_IS_POSTFIX_COMPLETION_APPLICABLE_VALUE = 'value'; -const String EDIT_RESPONSE_LIST_POSTFIX_COMPLETION_TEMPLATES_TEMPLATES = - 'templates'; -const String EDIT_RESPONSE_ORGANIZE_DIRECTIVES_EDIT = 'edit'; -const String EDIT_RESPONSE_SORT_MEMBERS_EDIT = 'edit'; -const String EXECUTION_NOTIFICATION_LAUNCH_DATA = 'execution.launchData'; -const String EXECUTION_NOTIFICATION_LAUNCH_DATA_FILE = 'file'; -const String EXECUTION_NOTIFICATION_LAUNCH_DATA_KIND = 'kind'; -const String EXECUTION_NOTIFICATION_LAUNCH_DATA_REFERENCED_FILES = - 'referencedFiles'; -const String EXECUTION_REQUEST_CREATE_CONTEXT = 'execution.createContext'; -const String EXECUTION_REQUEST_CREATE_CONTEXT_CONTEXT_ROOT = 'contextRoot'; -const String EXECUTION_REQUEST_DELETE_CONTEXT = 'execution.deleteContext'; -const String EXECUTION_REQUEST_DELETE_CONTEXT_ID = 'id'; -const String EXECUTION_REQUEST_GET_SUGGESTIONS = 'execution.getSuggestions'; -const String EXECUTION_REQUEST_GET_SUGGESTIONS_CODE = 'code'; -const String EXECUTION_REQUEST_GET_SUGGESTIONS_CONTEXT_FILE = 'contextFile'; -const String EXECUTION_REQUEST_GET_SUGGESTIONS_CONTEXT_OFFSET = 'contextOffset'; -const String EXECUTION_REQUEST_GET_SUGGESTIONS_EXPRESSIONS = 'expressions'; -const String EXECUTION_REQUEST_GET_SUGGESTIONS_OFFSET = 'offset'; -const String EXECUTION_REQUEST_GET_SUGGESTIONS_VARIABLES = 'variables'; -const String EXECUTION_REQUEST_MAP_URI = 'execution.mapUri'; -const String EXECUTION_REQUEST_MAP_URI_FILE = 'file'; -const String EXECUTION_REQUEST_MAP_URI_ID = 'id'; -const String EXECUTION_REQUEST_MAP_URI_URI = 'uri'; -const String EXECUTION_REQUEST_SET_SUBSCRIPTIONS = 'execution.setSubscriptions'; -const String EXECUTION_REQUEST_SET_SUBSCRIPTIONS_SUBSCRIPTIONS = - 'subscriptions'; -const String EXECUTION_RESPONSE_CREATE_CONTEXT_ID = 'id'; -const String EXECUTION_RESPONSE_GET_SUGGESTIONS_EXPRESSIONS = 'expressions'; -const String EXECUTION_RESPONSE_GET_SUGGESTIONS_SUGGESTIONS = 'suggestions'; -const String EXECUTION_RESPONSE_MAP_URI_FILE = 'file'; -const String EXECUTION_RESPONSE_MAP_URI_URI = 'uri'; -const String FLUTTER_NOTIFICATION_OUTLINE = 'flutter.outline'; -const String FLUTTER_NOTIFICATION_OUTLINE_FILE = 'file'; -const String FLUTTER_NOTIFICATION_OUTLINE_OUTLINE = 'outline'; -const String FLUTTER_REQUEST_GET_WIDGET_DESCRIPTION = +const String editResponseImportElementsEdit = 'edit'; +const String editResponseIsPostfixCompletionApplicableValue = 'value'; +const String editResponseListPostfixCompletionTemplatesTemplates = 'templates'; +const String editResponseOrganizeDirectivesEdit = 'edit'; +const String editResponseSortMembersEdit = 'edit'; +const String executionNotificationLaunchData = 'execution.launchData'; +const String executionNotificationLaunchDataFile = 'file'; +const String executionNotificationLaunchDataKind = 'kind'; +const String executionNotificationLaunchDataReferencedFiles = 'referencedFiles'; +const String executionRequestCreateContext = 'execution.createContext'; +const String executionRequestCreateContextContextRoot = 'contextRoot'; +const String executionRequestDeleteContext = 'execution.deleteContext'; +const String executionRequestDeleteContextId = 'id'; +const String executionRequestGetSuggestions = 'execution.getSuggestions'; +const String executionRequestGetSuggestionsCode = 'code'; +const String executionRequestGetSuggestionsContextFile = 'contextFile'; +const String executionRequestGetSuggestionsContextOffset = 'contextOffset'; +const String executionRequestGetSuggestionsExpressions = 'expressions'; +const String executionRequestGetSuggestionsOffset = 'offset'; +const String executionRequestGetSuggestionsVariables = 'variables'; +const String executionRequestMapUri = 'execution.mapUri'; +const String executionRequestMapUriFile = 'file'; +const String executionRequestMapUriId = 'id'; +const String executionRequestMapUriUri = 'uri'; +const String executionRequestSetSubscriptions = 'execution.setSubscriptions'; +const String executionRequestSetSubscriptionsSubscriptions = 'subscriptions'; +const String executionResponseCreateContextId = 'id'; +const String executionResponseGetSuggestionsExpressions = 'expressions'; +const String executionResponseGetSuggestionsSuggestions = 'suggestions'; +const String executionResponseMapUriFile = 'file'; +const String executionResponseMapUriUri = 'uri'; +const String flutterNotificationOutline = 'flutter.outline'; +const String flutterNotificationOutlineFile = 'file'; +const String flutterNotificationOutlineOutline = 'outline'; +const String flutterRequestGetWidgetDescription = 'flutter.getWidgetDescription'; -const String FLUTTER_REQUEST_GET_WIDGET_DESCRIPTION_FILE = 'file'; -const String FLUTTER_REQUEST_GET_WIDGET_DESCRIPTION_OFFSET = 'offset'; -const String FLUTTER_REQUEST_SET_SUBSCRIPTIONS = 'flutter.setSubscriptions'; -const String FLUTTER_REQUEST_SET_SUBSCRIPTIONS_SUBSCRIPTIONS = 'subscriptions'; -const String FLUTTER_REQUEST_SET_WIDGET_PROPERTY_VALUE = +const String flutterRequestGetWidgetDescriptionFile = 'file'; +const String flutterRequestGetWidgetDescriptionOffset = 'offset'; +const String flutterRequestSetSubscriptions = 'flutter.setSubscriptions'; +const String flutterRequestSetSubscriptionsSubscriptions = 'subscriptions'; +const String flutterRequestSetWidgetPropertyValue = 'flutter.setWidgetPropertyValue'; -const String FLUTTER_REQUEST_SET_WIDGET_PROPERTY_VALUE_ID = 'id'; -const String FLUTTER_REQUEST_SET_WIDGET_PROPERTY_VALUE_VALUE = 'value'; -const String FLUTTER_RESPONSE_GET_WIDGET_DESCRIPTION_PROPERTIES = 'properties'; -const String FLUTTER_RESPONSE_SET_WIDGET_PROPERTY_VALUE_CHANGE = 'change'; -const String LSP_NOTIFICATION_NOTIFICATION = 'lsp.notification'; -const String LSP_NOTIFICATION_NOTIFICATION_LSP_NOTIFICATION = 'lspNotification'; -const String LSP_REQUEST_HANDLE = 'lsp.handle'; -const String LSP_REQUEST_HANDLE_LSP_MESSAGE = 'lspMessage'; -const String LSP_RESPONSE_HANDLE_LSP_RESPONSE = 'lspResponse'; -const String SEARCH_NOTIFICATION_RESULTS = 'search.results'; -const String SEARCH_NOTIFICATION_RESULTS_ID = 'id'; -const String SEARCH_NOTIFICATION_RESULTS_IS_LAST = 'isLast'; -const String SEARCH_NOTIFICATION_RESULTS_RESULTS = 'results'; -const String SEARCH_REQUEST_FIND_ELEMENT_REFERENCES = +const String flutterRequestSetWidgetPropertyValueId = 'id'; +const String flutterRequestSetWidgetPropertyValueValue = 'value'; +const String flutterResponseGetWidgetDescriptionProperties = 'properties'; +const String flutterResponseSetWidgetPropertyValueChange = 'change'; +const String lspNotificationNotification = 'lsp.notification'; +const String lspNotificationNotificationLspNotification = 'lspNotification'; +const String lspRequestHandle = 'lsp.handle'; +const String lspRequestHandleLspMessage = 'lspMessage'; +const String lspResponseHandleLspResponse = 'lspResponse'; +const String searchNotificationResults = 'search.results'; +const String searchNotificationResultsId = 'id'; +const String searchNotificationResultsIsLast = 'isLast'; +const String searchNotificationResultsResults = 'results'; +const String searchRequestFindElementReferences = 'search.findElementReferences'; -const String SEARCH_REQUEST_FIND_ELEMENT_REFERENCES_FILE = 'file'; -const String SEARCH_REQUEST_FIND_ELEMENT_REFERENCES_INCLUDE_POTENTIAL = +const String searchRequestFindElementReferencesFile = 'file'; +const String searchRequestFindElementReferencesIncludePotential = 'includePotential'; -const String SEARCH_REQUEST_FIND_ELEMENT_REFERENCES_OFFSET = 'offset'; -const String SEARCH_REQUEST_FIND_MEMBER_DECLARATIONS = +const String searchRequestFindElementReferencesOffset = 'offset'; +const String searchRequestFindMemberDeclarations = 'search.findMemberDeclarations'; -const String SEARCH_REQUEST_FIND_MEMBER_DECLARATIONS_NAME = 'name'; -const String SEARCH_REQUEST_FIND_MEMBER_REFERENCES = - 'search.findMemberReferences'; -const String SEARCH_REQUEST_FIND_MEMBER_REFERENCES_NAME = 'name'; -const String SEARCH_REQUEST_FIND_TOP_LEVEL_DECLARATIONS = +const String searchRequestFindMemberDeclarationsName = 'name'; +const String searchRequestFindMemberReferences = 'search.findMemberReferences'; +const String searchRequestFindMemberReferencesName = 'name'; +const String searchRequestFindTopLevelDeclarations = 'search.findTopLevelDeclarations'; -const String SEARCH_REQUEST_FIND_TOP_LEVEL_DECLARATIONS_PATTERN = 'pattern'; -const String SEARCH_REQUEST_GET_ELEMENT_DECLARATIONS = +const String searchRequestFindTopLevelDeclarationsPattern = 'pattern'; +const String searchRequestGetElementDeclarations = 'search.getElementDeclarations'; -const String SEARCH_REQUEST_GET_ELEMENT_DECLARATIONS_FILE = 'file'; -const String SEARCH_REQUEST_GET_ELEMENT_DECLARATIONS_MAX_RESULTS = 'maxResults'; -const String SEARCH_REQUEST_GET_ELEMENT_DECLARATIONS_PATTERN = 'pattern'; -const String SEARCH_REQUEST_GET_TYPE_HIERARCHY = 'search.getTypeHierarchy'; -const String SEARCH_REQUEST_GET_TYPE_HIERARCHY_FILE = 'file'; -const String SEARCH_REQUEST_GET_TYPE_HIERARCHY_OFFSET = 'offset'; -const String SEARCH_REQUEST_GET_TYPE_HIERARCHY_SUPER_ONLY = 'superOnly'; -const String SEARCH_RESPONSE_FIND_ELEMENT_REFERENCES_ELEMENT = 'element'; -const String SEARCH_RESPONSE_FIND_ELEMENT_REFERENCES_ID = 'id'; -const String SEARCH_RESPONSE_FIND_MEMBER_DECLARATIONS_ID = 'id'; -const String SEARCH_RESPONSE_FIND_MEMBER_REFERENCES_ID = 'id'; -const String SEARCH_RESPONSE_FIND_TOP_LEVEL_DECLARATIONS_ID = 'id'; -const String SEARCH_RESPONSE_GET_ELEMENT_DECLARATIONS_DECLARATIONS = - 'declarations'; -const String SEARCH_RESPONSE_GET_ELEMENT_DECLARATIONS_FILES = 'files'; -const String SEARCH_RESPONSE_GET_TYPE_HIERARCHY_HIERARCHY_ITEMS = - 'hierarchyItems'; -const String SERVER_NOTIFICATION_CONNECTED = 'server.connected'; -const String SERVER_NOTIFICATION_CONNECTED_PID = 'pid'; -const String SERVER_NOTIFICATION_CONNECTED_VERSION = 'version'; -const String SERVER_NOTIFICATION_ERROR = 'server.error'; -const String SERVER_NOTIFICATION_ERROR_IS_FATAL = 'isFatal'; -const String SERVER_NOTIFICATION_ERROR_MESSAGE = 'message'; -const String SERVER_NOTIFICATION_ERROR_STACK_TRACE = 'stackTrace'; -const String SERVER_NOTIFICATION_LOG = 'server.log'; -const String SERVER_NOTIFICATION_LOG_ENTRY = 'entry'; -const String SERVER_NOTIFICATION_PLUGIN_ERROR = 'server.pluginError'; -const String SERVER_NOTIFICATION_PLUGIN_ERROR_MESSAGE = 'message'; -const String SERVER_NOTIFICATION_STATUS = 'server.status'; -const String SERVER_NOTIFICATION_STATUS_ANALYSIS = 'analysis'; -const String SERVER_NOTIFICATION_STATUS_PUB = 'pub'; -const String SERVER_REQUEST_CANCEL_REQUEST = 'server.cancelRequest'; -const String SERVER_REQUEST_CANCEL_REQUEST_ID = 'id'; -const String SERVER_REQUEST_GET_VERSION = 'server.getVersion'; -const String SERVER_REQUEST_OPEN_URL_REQUEST = 'server.openUrlRequest'; -const String SERVER_REQUEST_OPEN_URL_REQUEST_URL = 'url'; -const String SERVER_REQUEST_SET_CLIENT_CAPABILITIES = +const String searchRequestGetElementDeclarationsFile = 'file'; +const String searchRequestGetElementDeclarationsMaxResults = 'maxResults'; +const String searchRequestGetElementDeclarationsPattern = 'pattern'; +const String searchRequestGetTypeHierarchy = 'search.getTypeHierarchy'; +const String searchRequestGetTypeHierarchyFile = 'file'; +const String searchRequestGetTypeHierarchyOffset = 'offset'; +const String searchRequestGetTypeHierarchySuperOnly = 'superOnly'; +const String searchResponseFindElementReferencesElement = 'element'; +const String searchResponseFindElementReferencesId = 'id'; +const String searchResponseFindMemberDeclarationsId = 'id'; +const String searchResponseFindMemberReferencesId = 'id'; +const String searchResponseFindTopLevelDeclarationsId = 'id'; +const String searchResponseGetElementDeclarationsDeclarations = 'declarations'; +const String searchResponseGetElementDeclarationsFiles = 'files'; +const String searchResponseGetTypeHierarchyHierarchyItems = 'hierarchyItems'; +const String serverNotificationConnected = 'server.connected'; +const String serverNotificationConnectedPid = 'pid'; +const String serverNotificationConnectedVersion = 'version'; +const String serverNotificationError = 'server.error'; +const String serverNotificationErrorIsFatal = 'isFatal'; +const String serverNotificationErrorMessage = 'message'; +const String serverNotificationErrorStackTrace = 'stackTrace'; +const String serverNotificationLog = 'server.log'; +const String serverNotificationLogEntry = 'entry'; +const String serverNotificationPluginError = 'server.pluginError'; +const String serverNotificationPluginErrorMessage = 'message'; +const String serverNotificationStatus = 'server.status'; +const String serverNotificationStatusAnalysis = 'analysis'; +const String serverNotificationStatusPub = 'pub'; +const String serverRequestCancelRequest = 'server.cancelRequest'; +const String serverRequestCancelRequestId = 'id'; +const String serverRequestGetVersion = 'server.getVersion'; +const String serverRequestOpenUrlRequest = 'server.openUrlRequest'; +const String serverRequestOpenUrlRequestUrl = 'url'; +const String serverRequestSetClientCapabilities = 'server.setClientCapabilities'; -const String SERVER_REQUEST_SET_CLIENT_CAPABILITIES_LSP_CAPABILITIES = +const String serverRequestSetClientCapabilitiesLspCapabilities = 'lspCapabilities'; -const String SERVER_REQUEST_SET_CLIENT_CAPABILITIES_REQUESTS = 'requests'; -const String SERVER_REQUEST_SET_CLIENT_CAPABILITIES_SUPPORTS_URIS = - 'supportsUris'; -const String SERVER_REQUEST_SET_SUBSCRIPTIONS = 'server.setSubscriptions'; -const String SERVER_REQUEST_SET_SUBSCRIPTIONS_SUBSCRIPTIONS = 'subscriptions'; -const String SERVER_REQUEST_SHOW_MESSAGE_REQUEST = 'server.showMessageRequest'; -const String SERVER_REQUEST_SHOW_MESSAGE_REQUEST_ACTIONS = 'actions'; -const String SERVER_REQUEST_SHOW_MESSAGE_REQUEST_MESSAGE = 'message'; -const String SERVER_REQUEST_SHOW_MESSAGE_REQUEST_TYPE = 'type'; -const String SERVER_REQUEST_SHUTDOWN = 'server.shutdown'; -const String SERVER_RESPONSE_GET_VERSION_VERSION = 'version'; -const String SERVER_RESPONSE_SHOW_MESSAGE_REQUEST_ACTION = 'action'; +const String serverRequestSetClientCapabilitiesRequests = 'requests'; +const String serverRequestSetClientCapabilitiesSupportsUris = 'supportsUris'; +const String serverRequestSetSubscriptions = 'server.setSubscriptions'; +const String serverRequestSetSubscriptionsSubscriptions = 'subscriptions'; +const String serverRequestShowMessageRequest = 'server.showMessageRequest'; +const String serverRequestShowMessageRequestActions = 'actions'; +const String serverRequestShowMessageRequestMessage = 'message'; +const String serverRequestShowMessageRequestType = 'type'; +const String serverRequestShutdown = 'server.shutdown'; +const String serverResponseGetVersionVersion = 'version'; +const String serverResponseShowMessageRequestAction = 'action'; diff --git a/pkg/analysis_server_client/test/live_test.dart b/pkg/analysis_server_client/test/live_test.dart index e9ed329b8cc..496da18a64b 100644 --- a/pkg/analysis_server_client/test/live_test.dart +++ b/pkg/analysis_server_client/test/live_test.dart @@ -22,7 +22,7 @@ void main() { } var json = await server.send( - SERVER_REQUEST_GET_VERSION, ServerGetVersionParams().toJson()); + serverRequestGetVersion, ServerGetVersionParams().toJson()); final result = ServerGetVersionResult.fromJson(ResponseDecoder(null), 'result', json); await server.stop(); diff --git a/pkg/analysis_server_client/test/verify_sorted_test.dart b/pkg/analysis_server_client/test/verify_sorted_test.dart index c98f30fdfa6..3bfc3f70934 100644 --- a/pkg/analysis_server_client/test/verify_sorted_test.dart +++ b/pkg/analysis_server_client/test/verify_sorted_test.dart @@ -37,8 +37,8 @@ void main() async { provider.pathContext.relative(file.path, from: packagePath); test(relativePath, () async { - var response = await server.send(EDIT_REQUEST_SORT_MEMBERS, - EditSortMembersParams(file.path).toJson()); + var response = await server.send( + editRequestSortMembers, EditSortMembersParams(file.path).toJson()); var result = EditSortMembersResult.fromJson( ResponseDecoder(null), 'result', response); @@ -70,9 +70,9 @@ Future connectToServer(String packagePath) async { } // start analysis - await server.send(SERVER_REQUEST_SET_SUBSCRIPTIONS, + await server.send(serverRequestSetSubscriptions, ServerSetSubscriptionsParams([ServerService.STATUS]).toJson()); - await server.send(ANALYSIS_REQUEST_SET_ANALYSIS_ROOTS, + await server.send(analysisRequestSetAnalysisRoots, AnalysisSetAnalysisRootsParams([packagePath], const []).toJson()); // wait for initial analysis to complete