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

Side by Side Diff: pkg/analysis_server/lib/src/computer/computer_overrides.dart

Issue 625413002: Remove special list behavior in analysis server protocol. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 years, 2 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file
2 // for details. All rights reserved. Use of this source code is governed by a 2 // for details. All rights reserved. Use of this source code is governed by a
3 // BSD-style license that can be found in the LICENSE file. 3 // BSD-style license that can be found in the LICENSE file.
4 4
5 library computer.overrides; 5 library computer.overrides;
6 6
7 import 'package:analysis_server/src/protocol.dart'; 7 import 'package:analysis_server/src/protocol.dart';
8 import 'package:analyzer/src/generated/ast.dart'; 8 import 'package:analyzer/src/generated/ast.dart';
9 import 'package:analyzer/src/generated/element.dart' as engine; 9 import 'package:analyzer/src/generated/element.dart' as engine;
10 10
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 engine.Element interfaceMember = _lookupMember(interfaceElement, name); 61 engine.Element interfaceMember = _lookupMember(interfaceElement, name);
62 if (interfaceMember != null) { 62 if (interfaceMember != null) {
63 interfaceEngineElements.add(interfaceMember); 63 interfaceEngineElements.add(interfaceMember);
64 } 64 }
65 } 65 }
66 // is there any override? 66 // is there any override?
67 if (superEngineElement != null || interfaceEngineElements.isNotEmpty) { 67 if (superEngineElement != null || interfaceEngineElements.isNotEmpty) {
68 OverriddenMember superMember = superEngineElement != null ? 68 OverriddenMember superMember = superEngineElement != null ?
69 new OverriddenMember.fromEngine(superEngineElement) : 69 new OverriddenMember.fromEngine(superEngineElement) :
70 null; 70 null;
71 List<OverriddenMember> interfaceMembers = 71 List<OverriddenMember> interfaceMembers = interfaceEngineElements.map(
72 interfaceEngineElements.map((engine.Element member) => 72 (engine.Element member) => new OverriddenMember.fromEngine(member)).to List();
73 new OverriddenMember.fromEngine(member)).toList();
74 _overrides.add( 73 _overrides.add(
75 new Override(offset, length, superclassMember: superMember, 74 new Override(
76 interfaceMembers: interfaceMembers)); 75 offset,
76 length,
77 superclassMember: superMember,
78 interfaceMembers: interfaceMembers.isEmpty ? null : interfaceMembe rs));
77 } 79 }
78 } 80 }
79 81
80 static engine.Element _lookupMember(engine.ClassElement classElement, 82 static engine.Element _lookupMember(engine.ClassElement classElement,
81 String name) { 83 String name) {
82 if (classElement == null) { 84 if (classElement == null) {
83 return null; 85 return null;
84 } 86 }
85 engine.LibraryElement library = classElement.library; 87 engine.LibraryElement library = classElement.library;
86 // method 88 // method
87 engine.Element member = classElement.lookUpMethod(name, library); 89 engine.Element member = classElement.lookUpMethod(name, library);
88 if (member != null) { 90 if (member != null) {
89 return member; 91 return member;
90 } 92 }
91 // getter 93 // getter
92 member = classElement.lookUpGetter(name, library); 94 member = classElement.lookUpGetter(name, library);
93 if (member != null) { 95 if (member != null) {
94 return member; 96 return member;
95 } 97 }
96 // setter 98 // setter
97 member = classElement.lookUpSetter(name + '=', library); 99 member = classElement.lookUpSetter(name + '=', library);
98 if (member != null) { 100 if (member != null) {
99 return member; 101 return member;
100 } 102 }
101 // not found 103 // not found
102 return null; 104 return null;
103 } 105 }
104 } 106 }
OLDNEW
« no previous file with comments | « pkg/analysis_server/lib/src/computer/computer_outline.dart ('k') | pkg/analysis_server/lib/src/edit/edit_domain.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698