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

Unified Diff: utils/apidoc/html_diff_dump.dart

Issue 9350049: When dumping JSON for html_diff, don't list renames where the member name (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 8 years, 10 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: utils/apidoc/html_diff_dump.dart
diff --git a/utils/apidoc/html_diff_dump.dart b/utils/apidoc/html_diff_dump.dart
index 7016e7f681769af49db111abb130b14ec837b928..5b20ffd1312f904a6d28a085593385809c8f8db0 100644
--- a/utils/apidoc/html_diff_dump.dart
+++ b/utils/apidoc/html_diff_dump.dart
@@ -40,30 +40,29 @@ bool sameType(Type domType, Type htmlType) {
return htmlTypes != null && htmlTypes.some((t) => t == htmlType);
}
+/** Returns the name of a member, including `get:` if it's a field. */
+String memberName(Member m) => m is FieldMember ? 'get:${m.name}' : m.name;
+
/**
* Returns a string describing the name of a member. If [type] is passed, it's
* used in place of the member's real type name.
*/
-String memberName(Member m, [Type type = null]) {
+String memberDesc(Member m, [Type type = null]) {
if (type == null) type = m.declaringType;
- if (m is FieldMember) {
- return '${type.name}.get:${m.name}';
- } else {
- return '${type.name}.${m.name}';
- }
+ return '${type.name}.${memberName(m)}';
}
/**
- * Same as [memberName], but if [m] is a `dart:dom` type its `dart:html`
+ * Same as [memberDesc], but if [m] is a `dart:dom` type its `dart:html`
* typename is used instead.
*/
-String htmlishMemberName(Member m) {
+String htmlishMemberDesc(Member m) {
var type = m.declaringType;
final htmlTypes = diff.domTypesToHtml[type];
if (htmlTypes != null && htmlTypes.length == 1) {
type = htmlTypes.iterator().next();
}
- return memberName(m, type);
+ return memberDesc(m, type);
}
bool isGetter(Member member) => member.name.startsWith('get:');
@@ -79,7 +78,7 @@ void maybeAddRename(Map<String, String> renamed, Member domMember,
final htmlMember = htmlMembers.iterator().next();
if (memberName(domMember) != memberName(htmlMember) &&
sameType(domMember.returnType, htmlMember.returnType)) {
- renamed[memberName(domMember)] = memberName(htmlMember);
+ renamed[memberDesc(domMember)] = memberDesc(htmlMember);
}
}
@@ -116,18 +115,18 @@ void main() {
for (final member in type.members.getValues()) {
if (!diff.domToHtml.containsKey(member)) {
if (member is PropertyMember) {
- if (member.canGet) removed.add(htmlishMemberName(member.getter));
- if (member.canSet) removed.add(htmlishMemberName(member.setter));
+ if (member.canGet) removed.add(htmlishMemberDesc(member.getter));
+ if (member.canSet) removed.add(htmlishMemberDesc(member.setter));
} else {
- removed.add(htmlishMemberName(member));
+ removed.add(htmlishMemberDesc(member));
}
} else if (member is PropertyMember) {
final htmlMembers = diff.domToHtml[member];
if (member.canGet && !htmlMembers.some((m) => m.name.startsWith('get:'))) {
- removed.add(htmlishMemberName(member.getter));
+ removed.add(htmlishMemberDesc(member.getter));
}
if (member.canSet && !htmlMembers.some((m) => m.name.startsWith('set:'))) {
- removed.add(htmlishMemberName(member.setter));
+ removed.add(htmlishMemberDesc(member.setter));
}
}
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698