Skip to content

HtmlGeneratorInstance: cleanup JSON writing #1536

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 6, 2017
Merged

HtmlGeneratorInstance: cleanup JSON writing #1536

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 13 additions & 11 deletions lib/src/html/html_generator_instance.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,7 @@ class HtmlGeneratorInstance implements HtmlOptions {
var encoder =
prettyIndexJson ? new JsonEncoder.withIndent(' ') : new JsonEncoder();

File jsonFile = _createOutputFile(path.join(out.path, 'index.json'));
String json = encoder.convert(
final List<Map> indexItems =
documentedElements.where((e) => e.isCanonical).map((ModelElement e) {
Map data = {
'name': e.name,
Expand All @@ -82,15 +81,18 @@ class HtmlGeneratorInstance implements HtmlOptions {
data['qualifiedName'] = e.fullyQualifiedName;
}
return data;
}).toList()
..sort((a, b) {
var value = compareNatural(a['qualifiedName'], b['qualifiedName']);
if (value == 0) {
value = compareNatural(a['type'], b['type']);
}
return value;
}));
jsonFile.writeAsStringSync('${json}\n');
}).toList();

indexItems.sort((a, b) {
var value = compareNatural(a['qualifiedName'], b['qualifiedName']);
if (value == 0) {
value = compareNatural(a['type'], b['type']);
}
return value;
});

String json = encoder.convert(indexItems);
_writeFile(path.join(out.path, 'index.json'), '${json}\n');
}

void _generateDocs() {
Expand Down