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

Unified Diff: pkg/analysis_server/lib/src/computer/computer_occurrences.dart

Issue 479683005: Make more use of generated code in analysis server. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 years, 4 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
Index: pkg/analysis_server/lib/src/computer/computer_occurrences.dart
diff --git a/pkg/analysis_server/lib/src/computer/computer_occurrences.dart b/pkg/analysis_server/lib/src/computer/computer_occurrences.dart
index 198646d6a49ece97b95c1228a01edff603838e69..b4f7aa133b78b9057f93279474c5c960ce94531b 100644
--- a/pkg/analysis_server/lib/src/computer/computer_occurrences.dart
+++ b/pkg/analysis_server/lib/src/computer/computer_occurrences.dart
@@ -6,9 +6,7 @@ library computer.occurrences;
import 'dart:collection';
-import 'package:analysis_server/src/computer/element.dart' as server;
-import 'package:analysis_server/src/constants.dart';
-import 'package:analysis_server/src/services/json.dart';
+import 'package:analysis_server/src/protocol2.dart' as protocol;
import 'package:analyzer/src/generated/ast.dart';
import 'package:analyzer/src/generated/element.dart';
@@ -27,13 +25,13 @@ class DartUnitOccurrencesComputer {
/**
* Returns the computed occurrences, not `null`.
*/
- List<Occurrences> compute() {
+ List<protocol.Occurrences> compute() {
_unit.accept(new _DartUnitOccurrencesComputerVisitor(this));
- List<Occurrences> occurrences = <Occurrences>[];
+ List<protocol.Occurrences> occurrences = <protocol.Occurrences>[];
_elementsOffsets.forEach((engineElement, offsets) {
- var serverElement = new server.Element.fromEngine(engineElement);
+ var serverElement = new protocol.Element.fromEngine(engineElement);
var length = engineElement.displayName.length;
- occurrences.add(new Occurrences(serverElement, offsets, length));
+ occurrences.add(new protocol.Occurrences(serverElement, offsets, length));
});
return occurrences;
}
@@ -66,33 +64,6 @@ class DartUnitOccurrencesComputer {
}
-class Occurrences implements HasToJson {
- final server.Element element;
- final List<int> offsets;
- final int length;
-
- Occurrences(this.element, this.offsets, this.length);
-
- factory Occurrences.fromJson(Map<String, Object> map) {
- server.Element element = new server.Element.fromJson(map[ELEMENT]);
- List<int> offsets = map[OFFSETS];
- int length = map[LENGTH];
- return new Occurrences(element, offsets, length);
- }
-
- Map<String, Object> toJson() {
- Map<String, Object> json = new HashMap<String, Object>();
- json[ELEMENT] = element.toJson();
- json[OFFSETS] = offsets;
- json[LENGTH] = length;
- return json;
- }
-
- @override
- String toString() => toJson().toString();
-}
-
-
class _DartUnitOccurrencesComputerVisitor extends RecursiveAstVisitor {
final DartUnitOccurrencesComputer computer;

Powered by Google App Engine
This is Rietveld 408576698