Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(687)

Unified Diff: pkg/analysis_server/lib/src/edit/edit_domain.dart

Issue 530033002: Use a more precise type for "object" in analysis server API. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | pkg/analysis_server/lib/src/generated_protocol.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/analysis_server/lib/src/edit/edit_domain.dart
diff --git a/pkg/analysis_server/lib/src/edit/edit_domain.dart b/pkg/analysis_server/lib/src/edit/edit_domain.dart
index 759db8dcb3b3322e73f818265657d80ccffa7365..7c3cccb8c7f23c3b4638dc8a677a2b0f50c16a20 100644
--- a/pkg/analysis_server/lib/src/edit/edit_domain.dart
+++ b/pkg/analysis_server/lib/src/edit/edit_domain.dart
@@ -12,6 +12,7 @@ import 'package:analysis_server/src/protocol.dart' hide Element;
import 'package:analysis_server/src/services/correction/assist.dart';
import 'package:analysis_server/src/services/correction/fix.dart';
import 'package:analysis_server/src/services/correction/status.dart';
+import 'package:analysis_server/src/services/json.dart';
import 'package:analysis_server/src/services/refactoring/refactoring.dart';
import 'package:analysis_server/src/services/search/search_engine.dart';
import 'package:analyzer/src/generated/ast.dart';
@@ -165,7 +166,7 @@ class _RefactoringManager {
int offset;
int length;
Refactoring refactoring;
- Object feedback;
+ HasToJson feedback;
RefactoringStatus initStatus;
RefactoringStatus optionsStatus;
RefactoringStatus finalStatus;
@@ -197,7 +198,7 @@ class _RefactoringManager {
if (params.options == null) {
return _sendResultResponse();
}
- optionsStatus = _setOptions(params.options);
+ optionsStatus = _setOptions(params, request);
if (_hasFatalError) {
return _sendResultResponse();
}
@@ -284,7 +285,7 @@ class _RefactoringManager {
}
void _sendResultResponse() {
- result.feedback = feedback;
+ result.feedback = feedback.toJson();
// set problems
{
RefactoringStatus status = new RefactoringStatus();
@@ -300,17 +301,20 @@ class _RefactoringManager {
result = null;
}
- RefactoringStatus _setOptions(Object options) {
+ RefactoringStatus _setOptions(EditGetRefactoringParams params,
+ Request request) {
if (refactoring is ExtractLocalRefactoring) {
ExtractLocalRefactoring extractRefactoring = refactoring;
- ExtractLocalVariableOptions extractOptions = options;
+ ExtractLocalVariableOptions extractOptions =
+ new ExtractLocalVariableOptions.fromRefactoringParams(params, request);
extractRefactoring.name = extractOptions.name;
extractRefactoring.extractAll = extractOptions.extractAll;
return extractRefactoring.checkName();
}
if (refactoring is RenameRefactoring) {
RenameRefactoring renameRefactoring = refactoring;
- RenameOptions renameOptions = options;
+ RenameOptions renameOptions =
+ new RenameOptions.fromRefactoringParams(params, request);
renameRefactoring.newName = renameOptions.newName;
return renameRefactoring.checkNewName();
}
« no previous file with comments | « no previous file | pkg/analysis_server/lib/src/generated_protocol.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698