languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-10-14 19:21:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Roll back two files that shouldn't have had dartfmt run.

Browse source 
BUG=

Review-Url: https://codereview.chromium.org/2757753003 .
This commit is contained in:
Jacob Richman 2017-03-16 16:56:20 -07:00
parent 1133a4dc2c
commit 3688edaa17
2 changed files with 29 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
pkg/analyzer_plugin/lib/protocol/protocol_constants.dart
View file

@ -26,13 +26,11 @@ 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_OUTLINE = 'outline';
const String ANALYSIS_REQUEST_HANDLE_WATCH_EVENTS =
'analysis.handleWatchEvents';
const String ANALYSIS_REQUEST_HANDLE_WATCH_EVENTS = 'analysis.handleWatchEvents';
const String ANALYSIS_REQUEST_HANDLE_WATCH_EVENTS_EVENTS = 'events';
const String ANALYSIS_REQUEST_REANALYZE = 'analysis.reanalyze';
const String ANALYSIS_REQUEST_REANALYZE_ROOTS = 'roots';
const String ANALYSIS_REQUEST_SET_CONTEXT_BUILDER_OPTIONS =
'analysis.setContextBuilderOptions';
const String ANALYSIS_REQUEST_SET_CONTEXT_BUILDER_OPTIONS = 'analysis.setContextBuilderOptions';
const String ANALYSIS_REQUEST_SET_CONTEXT_BUILDER_OPTIONS_OPTIONS = 'options';
const String ANALYSIS_REQUEST_SET_CONTEXT_ROOTS = 'analysis.setContextRoots';
const String ANALYSIS_REQUEST_SET_CONTEXT_ROOTS_ROOTS = 'roots';
@ -45,17 +43,14 @@ const String ANALYSIS_REQUEST_UPDATE_CONTENT_FILES = 'files';
const String COMPLETION_REQUEST_GET_SUGGESTIONS = 'completion.getSuggestions';
const String COMPLETION_REQUEST_GET_SUGGESTIONS_FILE = 'file';
const String COMPLETION_REQUEST_GET_SUGGESTIONS_OFFSET = 'offset';
const String COMPLETION_RESPONSE_GET_SUGGESTIONS_REPLACEMENTLENGTH =
'replacementLength';
const String COMPLETION_RESPONSE_GET_SUGGESTIONS_REPLACEMENTOFFSET =
'replacementOffset';
const String COMPLETION_RESPONSE_GET_SUGGESTIONS_REPLACEMENTLENGTH = 'replacementLength';
const String COMPLETION_RESPONSE_GET_SUGGESTIONS_REPLACEMENTOFFSET = 'replacementOffset';
const String COMPLETION_RESPONSE_GET_SUGGESTIONS_RESULTS = 'results';
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 =
'edit.getAvailableRefactorings';
const String EDIT_REQUEST_GET_AVAILABLE_REFACTORINGS = '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';
@ -87,8 +82,7 @@ const String PLUGIN_REQUEST_VERSION_CHECK = 'plugin.versionCheck';
const String PLUGIN_REQUEST_VERSION_CHECK_BYTESTOREPATH = 'byteStorePath';
const String PLUGIN_REQUEST_VERSION_CHECK_VERSION = 'version';
const String PLUGIN_RESPONSE_VERSION_CHECK_CONTACTINFO = 'contactInfo';
const String PLUGIN_RESPONSE_VERSION_CHECK_INTERESTINGFILES =
'interestingFiles';
const String PLUGIN_RESPONSE_VERSION_CHECK_INTERESTINGFILES = 'interestingFiles';
const String PLUGIN_RESPONSE_VERSION_CHECK_ISCOMPATIBLE = 'isCompatible';
const String PLUGIN_RESPONSE_VERSION_CHECK_NAME = 'name';
const String PLUGIN_RESPONSE_VERSION_CHECK_VERSION = 'version';

72
pkg/analyzer_plugin/test/integration/support/integration_test_methods.dart
View file

@ -70,8 +70,7 @@ abstract class IntegrationTestMixin {
* Otherwise, it will be used to identify the files for which the plugin
* should be notified of changes.
*/
Future<PluginVersionCheckResult> sendPluginVersionCheck(
String byteStorePath, String version) async {
Future<PluginVersionCheckResult> sendPluginVersionCheck(String byteStorePath, String version) async {
var params = new PluginVersionCheckParams(byteStorePath, version).toJson();
var result = await server.send("plugin.versionCheck", params);
ResponseDecoder decoder = new ResponseDecoder(null);
@ -171,8 +170,7 @@ abstract class IntegrationTestMixin {
*
* The options used to build the analysis contexts.
*/
Future sendAnalysisSetContextBuilderOptions(
ContextBuilderOptions options) async {
Future sendAnalysisSetContextBuilderOptions(ContextBuilderOptions options) async {
var params = new AnalysisSetContextBuilderOptionsParams(options).toJson();
var result = await server.send("analysis.setContextBuilderOptions", params);
outOfTestExpect(result, isNull);
@ -231,8 +229,7 @@ abstract class IntegrationTestMixin {
* A table mapping services to a list of the files being subscribed to the
* service.
*/
Future sendAnalysisSetSubscriptions(
Map<AnalysisService, List<String>> subscriptions) async {
Future sendAnalysisSetSubscriptions(Map<AnalysisService, List<String>> subscriptions) async {
var params = new AnalysisSetSubscriptionsParams(subscriptions).toJson();
var result = await server.send("analysis.setSubscriptions", params);
outOfTestExpect(result, isNull);
@ -484,13 +481,11 @@ abstract class IntegrationTestMixin {
* client to respond to further keystrokes from the user without having to
* make additional requests.
*/
Future<CompletionGetSuggestionsResult> sendCompletionGetSuggestions(
String file, int offset) async {
Future<CompletionGetSuggestionsResult> sendCompletionGetSuggestions(String file, int offset) async {
var params = new CompletionGetSuggestionsParams(file, offset).toJson();
var result = await server.send("completion.getSuggestions", params);
ResponseDecoder decoder = new ResponseDecoder(null);
return new CompletionGetSuggestionsResult.fromJson(
decoder, 'result', result);
return new CompletionGetSuggestionsResult.fromJson(decoder, 'result', result);
}
/**
@ -519,8 +514,7 @@ abstract class IntegrationTestMixin {
*
* The assists that are available at the given location.
*/
Future<EditGetAssistsResult> sendEditGetAssists(
String file, int offset, int length) async {
Future<EditGetAssistsResult> sendEditGetAssists(String file, int offset, int length) async {
var params = new EditGetAssistsParams(file, offset, length).toJson();
var result = await server.send("edit.getAssists", params);
ResponseDecoder decoder = new ResponseDecoder(null);
@ -556,14 +550,11 @@ abstract class IntegrationTestMixin {
* However, plugins can support pre-defined refactorings, such as a rename
* refactoring, at locations not supported by server.
*/
Future<EditGetAvailableRefactoringsResult> sendEditGetAvailableRefactorings(
String file, int offset, int length) async {
var params =
new EditGetAvailableRefactoringsParams(file, offset, length).toJson();
Future<EditGetAvailableRefactoringsResult> sendEditGetAvailableRefactorings(String file, int offset, int length) async {
var params = new EditGetAvailableRefactoringsParams(file, offset, length).toJson();
var result = await server.send("edit.getAvailableRefactorings", params);
ResponseDecoder decoder = new ResponseDecoder(null);
return new EditGetAvailableRefactoringsResult.fromJson(
decoder, 'result', result);
return new EditGetAvailableRefactoringsResult.fromJson(decoder, 'result', result);
}
/**
@ -671,13 +662,8 @@ abstract class IntegrationTestMixin {
* the change field is omitted or if there are no potential edits for the
* refactoring.
*/
Future<EditGetRefactoringResult> sendEditGetRefactoring(RefactoringKind kind,
String file, int offset, int length, bool validateOnly,
{RefactoringOptions options}) async {
var params = new EditGetRefactoringParams(
kind, file, offset, length, validateOnly,
options: options)
.toJson();
Future<EditGetRefactoringResult> sendEditGetRefactoring(RefactoringKind kind, String file, int offset, int length, bool validateOnly, {RefactoringOptions options}) async {
var params = new EditGetRefactoringParams(kind, file, offset, length, validateOnly, options: options).toJson();
var result = await server.send("edit.getRefactoring", params);
ResponseDecoder decoder = new ResponseDecoder(kind);
return new EditGetRefactoringResult.fromJson(decoder, 'result', result);
@ -692,20 +678,15 @@ abstract class IntegrationTestMixin {
onPluginError = _onPluginError.stream.asBroadcastStream();
_onAnalysisErrors = new StreamController<AnalysisErrorsParams>(sync: true);
onAnalysisErrors = _onAnalysisErrors.stream.asBroadcastStream();
_onAnalysisFolding =
new StreamController<AnalysisFoldingParams>(sync: true);
_onAnalysisFolding = new StreamController<AnalysisFoldingParams>(sync: true);
onAnalysisFolding = _onAnalysisFolding.stream.asBroadcastStream();
_onAnalysisHighlights =
new StreamController<AnalysisHighlightsParams>(sync: true);
_onAnalysisHighlights = new StreamController<AnalysisHighlightsParams>(sync: true);
onAnalysisHighlights = _onAnalysisHighlights.stream.asBroadcastStream();
_onAnalysisNavigation =
new StreamController<AnalysisNavigationParams>(sync: true);
_onAnalysisNavigation = new StreamController<AnalysisNavigationParams>(sync: true);
onAnalysisNavigation = _onAnalysisNavigation.stream.asBroadcastStream();
_onAnalysisOccurrences =
new StreamController<AnalysisOccurrencesParams>(sync: true);
_onAnalysisOccurrences = new StreamController<AnalysisOccurrencesParams>(sync: true);
onAnalysisOccurrences = _onAnalysisOccurrences.stream.asBroadcastStream();
_onAnalysisOutline =
new StreamController<AnalysisOutlineParams>(sync: true);
_onAnalysisOutline = new StreamController<AnalysisOutlineParams>(sync: true);
onAnalysisOutline = _onAnalysisOutline.stream.asBroadcastStream();
}
@ -718,38 +699,31 @@ abstract class IntegrationTestMixin {
switch (event) {
case "plugin.error":
outOfTestExpect(params, isPluginErrorParams);
_onPluginError
.add(new PluginErrorParams.fromJson(decoder, 'params', params));
_onPluginError.add(new PluginErrorParams.fromJson(decoder, 'params', params));
break;
case "analysis.errors":
outOfTestExpect(params, isAnalysisErrorsParams);
_onAnalysisErrors
.add(new AnalysisErrorsParams.fromJson(decoder, 'params', params));
_onAnalysisErrors.add(new AnalysisErrorsParams.fromJson(decoder, 'params', params));
break;
case "analysis.folding":
outOfTestExpect(params, isAnalysisFoldingParams);
_onAnalysisFolding
.add(new AnalysisFoldingParams.fromJson(decoder, 'params', params));
_onAnalysisFolding.add(new AnalysisFoldingParams.fromJson(decoder, 'params', params));
break;
case "analysis.highlights":
outOfTestExpect(params, isAnalysisHighlightsParams);
_onAnalysisHighlights.add(
new AnalysisHighlightsParams.fromJson(decoder, 'params', params));
_onAnalysisHighlights.add(new AnalysisHighlightsParams.fromJson(decoder, 'params', params));
break;
case "analysis.navigation":
outOfTestExpect(params, isAnalysisNavigationParams);
_onAnalysisNavigation.add(
new AnalysisNavigationParams.fromJson(decoder, 'params', params));
_onAnalysisNavigation.add(new AnalysisNavigationParams.fromJson(decoder, 'params', params));
break;
case "analysis.occurrences":
outOfTestExpect(params, isAnalysisOccurrencesParams);
_onAnalysisOccurrences.add(
new AnalysisOccurrencesParams.fromJson(decoder, 'params', params));
_onAnalysisOccurrences.add(new AnalysisOccurrencesParams.fromJson(decoder, 'params', params));
break;
case "analysis.outline":
outOfTestExpect(params, isAnalysisOutlineParams);
_onAnalysisOutline
.add(new AnalysisOutlineParams.fromJson(decoder, 'params', params));
_onAnalysisOutline.add(new AnalysisOutlineParams.fromJson(decoder, 'params', params));
break;
default:
fail('Unexpected notification: $event');