Skip to content

Commit 86c2ad4

Browse files
jcollins-gjcollins-g
committed
Consistency and whitespace issues in property templates
1 parent 4721571 commit 86c2ad4

File tree

225 files changed

+644
-983
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

225 files changed

+644
-983
lines changed

‎lib/src/model.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1550,7 +1550,6 @@ abstract class GetterSetterCombo implements ModelElement {
15501550
return _documentationFrom;
15511551
}
15521552

1553-
String _oneLineDoc;
15541553
@override
15551554
String get oneLineDoc {
15561555
if (_oneLineDoc == null) {

‎lib/src/warnings.dart

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
// for details. All rights reserved. Use of this source code is governed by a
33
// BSD-style license that can be found in the LICENSE file.
44

5-
import 'dart:io';
6-
75
import 'package:analyzer/dart/element/element.dart';
86
import 'package:dartdoc/src/model.dart';
97
import 'package:tuple/tuple.dart';

‎lib/templates/property.html

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,12 @@ <h5>{{parent.kind}} {{parent.name}}</h5>
1010
{{#self}}
1111
<section class="multi-line-signature">
1212
<span class="returntype">{{{ linkedReturnType }}}</span>
13-
{{>name_summary}}
14-
{{>features}}
13+
{{>name_summary}}
14+
{{>features}}
1515
</section>
1616

1717
{{>documentation}}
18-
1918
{{>source_code}}
20-
2119
{{/self}}
2220
</div> <!-- /.main-content -->
2321

‎lib/templates/top_level_constant.html

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,17 @@ <h5>{{parent.kind}} {{parent.name}}</h5>
77

88
<div class="col-xs-12 col-sm-9 col-md-8 main-content">
99

10+
{{#self}}
1011
<section class="multi-line-signature">
11-
{{#property}}
12-
{{>name_summary}}
13-
=
14-
<span class="constant-value">{{{ constantValue }}}</span>
15-
{{>features}}
16-
{{/property}}
12+
{{>name_summary}}
13+
=
14+
<span class="constant-value">{{{ constantValue }}}</span>
15+
{{>features}}
1716
</section>
1817

19-
{{#property}}
20-
{{>documentation}}
21-
{{>source_code}}
22-
{{/property}}
18+
{{>documentation}}
19+
{{>source_code}}
20+
{{/self}}
2321

2422
</div> <!-- /.main-content -->
2523

‎lib/templates/top_level_property.html

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,17 @@ <h5>{{parent.kind}} {{parent.name}}</h5>
77

88
<div class="col-xs-12 col-sm-9 col-md-8 main-content">
99

10-
{{#self}}
11-
<section class="multi-line-signature">
12-
<span class="returntype">{{{ linkedReturnType }}}</span>
13-
{{>name_summary}}
14-
{{>features}}
15-
</section>
10+
{{#self}}
11+
<section class="multi-line-signature">
12+
<span class="returntype">{{{ linkedReturnType }}}</span>
13+
{{>name_summary}}
14+
{{>features}}
15+
</section>
16+
17+
{{>documentation}}
18+
{{>source_code}}
19+
{{/self}}
1620

17-
{{>documentation}}
18-
{{/self}}
1921
</div> <!-- /.main-content -->
2022

2123
<div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">

‎testing/test_package_docs/css/theOnlyThingInTheLibrary.html

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,14 @@ <h5>library css</h5>
5151

5252
<div class="col-xs-12 col-sm-9 col-md-8 main-content">
5353

54-
<section class="multi-line-signature">
55-
<span class="returntype">String</span>
56-
<span class="name ">theOnlyThingInTheLibrary</span> <div class="features">read / write</div>
57-
</section>
54+
<section class="multi-line-signature">
55+
<span class="returntype">String</span>
56+
<span class="name ">theOnlyThingInTheLibrary</span> <div class="features">read / write</div>
57+
</section>
5858

59-
</div> <!-- /.main-content -->
59+
60+
61+
</div> <!-- /.main-content -->
6062

6163
<div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">
6264
<h5>top-level property theOnlyThingInTheLibrary</h5>

‎testing/test_package_docs/ex/Animal/hashCode.html

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,10 @@ <h5>enum Animal</h5>
6868

6969
<section class="multi-line-signature">
7070
<span class="returntype">int</span>
71-
<span class="name ">hashCode</span> <div class="features">read-only, inherited</div>
71+
<span class="name ">hashCode</span> <div class="features">read-only, inherited</div>
7272
</section>
7373

74-
75-
76-
74+
7775
</div> <!-- /.main-content -->
7876

7977
<div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">

‎testing/test_package_docs/ex/Animal/runtimeType.html

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,10 @@ <h5>enum Animal</h5>
6868

6969
<section class="multi-line-signature">
7070
<span class="returntype">Type</span>
71-
<span class="name ">runtimeType</span> <div class="features">read-only, inherited</div>
71+
<span class="name ">runtimeType</span> <div class="features">read-only, inherited</div>
7272
</section>
7373

74-
75-
76-
74+
7775
</div> <!-- /.main-content -->
7876

7977
<div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">

‎testing/test_package_docs/ex/AnotherParameterizedClass/hashCode.html

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,10 @@ <h5>class AnotherParameterizedClass</h5>
6464

6565
<section class="multi-line-signature">
6666
<span class="returntype">int</span>
67-
<span class="name ">hashCode</span> <div class="features">read-only, inherited</div>
67+
<span class="name ">hashCode</span> <div class="features">read-only, inherited</div>
6868
</section>
6969

70-
71-
72-
70+
7371
</div> <!-- /.main-content -->
7472

7573
<div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">

‎testing/test_package_docs/ex/AnotherParameterizedClass/runtimeType.html

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,10 @@ <h5>class AnotherParameterizedClass</h5>
6464

6565
<section class="multi-line-signature">
6666
<span class="returntype">Type</span>
67-
<span class="name ">runtimeType</span> <div class="features">read-only, inherited</div>
67+
<span class="name ">runtimeType</span> <div class="features">read-only, inherited</div>
6868
</section>
6969

70-
71-
72-
70+
7371
</div> <!-- /.main-content -->
7472

7573
<div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">

‎testing/test_package_docs/ex/Apple/fieldWithTypedef.html

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,15 +79,13 @@ <h5>class Apple</h5>
7979

8080
<section class="multi-line-signature">
8181
<span class="returntype"><a href="ex/ParameterizedTypedef.html">ParameterizedTypedef</a>&lt;bool&gt;</span>
82-
<span class="name ">fieldWithTypedef</span> <div class="features">final</div>
82+
<span class="name ">fieldWithTypedef</span> <div class="features">final</div>
8383
</section>
8484

8585
<section class="desc markdown">
8686
<p>fieldWithTypedef docs here</p>
8787
</section>
88-
89-
90-
88+
9189
</div> <!-- /.main-content -->
9290

9391
<div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">

‎testing/test_package_docs/ex/Apple/hashCode.html

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,10 @@ <h5>class Apple</h5>
7979

8080
<section class="multi-line-signature">
8181
<span class="returntype">int</span>
82-
<span class="name ">hashCode</span> <div class="features">read-only, inherited</div>
82+
<span class="name ">hashCode</span> <div class="features">read-only, inherited</div>
8383
</section>
8484

85-
86-
87-
85+
8886
</div> <!-- /.main-content -->
8987

9088
<div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">

‎testing/test_package_docs/ex/Apple/m.html

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,15 +79,13 @@ <h5>class Apple</h5>
7979

8080
<section class="multi-line-signature">
8181
<span class="returntype">int</span>
82-
<span class="name ">m</span> <div class="features">read / write</div>
82+
<span class="name ">m</span> <div class="features">read / write</div>
8383
</section>
8484

8585
<section class="desc markdown">
8686
<p>The read-write field <code>m</code>.</p>
8787
</section>
88-
89-
90-
88+
9189
</div> <!-- /.main-content -->
9290

9391
<div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">

‎testing/test_package_docs/ex/Apple/runtimeType.html

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,10 @@ <h5>class Apple</h5>
7979

8080
<section class="multi-line-signature">
8181
<span class="returntype">Type</span>
82-
<span class="name ">runtimeType</span> <div class="features">read-only, inherited</div>
82+
<span class="name ">runtimeType</span> <div class="features">read-only, inherited</div>
8383
</section>
8484

85-
86-
87-
85+
8886
</div> <!-- /.main-content -->
8987

9088
<div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">

‎testing/test_package_docs/ex/Apple/s.html

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,15 +79,13 @@ <h5>class Apple</h5>
7979

8080
<section class="multi-line-signature">
8181
<span class="returntype">String</span>
82-
<span class="name ">s</span> <div class="features">read / write</div>
82+
<span class="name ">s</span> <div class="features">read / write</div>
8383
</section>
8484

8585
<section class="desc markdown">
8686
<p>The getter for <code>s</code></p><p>The setter for <code>s</code></p>
8787
</section>
88-
89-
90-
88+
9189
</div> <!-- /.main-content -->
9290

9391
<div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">

‎testing/test_package_docs/ex/Apple/string.html

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,10 @@ <h5>class Apple</h5>
7979

8080
<section class="multi-line-signature">
8181
<span class="returntype">String</span>
82-
<span class="name ">string</span> <div class="features">read / write</div>
82+
<span class="name ">string</span> <div class="features">read / write</div>
8383
</section>
8484

85-
86-
87-
85+
8886
</div> <!-- /.main-content -->
8987

9088
<div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">

‎testing/test_package_docs/ex/B/autoCompress.html

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,16 +80,14 @@ <h5>class B</h5>
8080

8181
<section class="multi-line-signature">
8282
<span class="returntype">bool</span>
83-
<span class="name ">autoCompress</span> <div class="features">read / write</div>
83+
<span class="name ">autoCompress</span> <div class="features">read / write</div>
8484
</section>
8585

8686
<section class="desc markdown">
8787
<p>The default value is <code>false</code> (compression disabled).
8888
To enable, set <code>autoCompress</code> to <code>true</code>.</p>
8989
</section>
90-
91-
92-
90+
9391
</div> <!-- /.main-content -->
9492

9593
<div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">

‎testing/test_package_docs/ex/B/isImplemented.html

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,10 @@ <h5>class B</h5>
8080

8181
<section class="multi-line-signature">
8282
<span class="returntype">bool</span>
83-
<span class="name ">isImplemented</span> <div class="features">@override, read-only</div>
83+
<span class="name ">isImplemented</span> <div class="features">@override, read-only</div>
8484
</section>
8585

86-
87-
88-
86+
8987
</div> <!-- /.main-content -->
9088

9189
<div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">

‎testing/test_package_docs/ex/B/list.html

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,15 +80,13 @@ <h5>class B</h5>
8080

8181
<section class="multi-line-signature">
8282
<span class="returntype">List&lt;String&gt;</span>
83-
<span class="name ">list</span> <div class="features">read / write</div>
83+
<span class="name ">list</span> <div class="features">read / write</div>
8484
</section>
8585

8686
<section class="desc markdown">
8787
<p>A list of Strings</p>
8888
</section>
89-
90-
91-
89+
9290
</div> <!-- /.main-content -->
9391

9492
<div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">

‎testing/test_package_docs/ex/B/s.html

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,15 +80,13 @@ <h5>class B</h5>
8080

8181
<section class="multi-line-signature">
8282
<span class="returntype">String</span>
83-
<span class="name ">s</span> <div class="features">@override, inherited-setter, read / write</div>
83+
<span class="name ">s</span> <div class="features">@override, inherited-setter, read / write</div>
8484
</section>
8585

8686
<section class="desc markdown">
8787
<p>The getter for <code>s</code></p><p>The setter for <code>s</code></p>
8888
</section>
89-
90-
91-
89+
9290
</div> <!-- /.main-content -->
9391

9492
<div class="col-xs-6 col-sm-6 col-md-2 sidebar sidebar-offcanvas-right">

‎testing/test_package_docs/ex/COLOR-constant.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,12 +107,12 @@ <h5>library ex</h5>
107107
<div class="col-xs-12 col-sm-9 col-md-8 main-content">
108108

109109
<section class="multi-line-signature">
110-
<span class="name ">COLOR</span> =
111-
<span class="constant-value">&#39;red&#39;</span>
112-
110+
<span class="name ">COLOR</span> =
111+
<span class="constant-value">&#39;red&#39;</span>
112+
113113
</section>
114114

115-
115+
116116

117117
</div> <!-- /.main-content -->
118118

‎testing/test_package_docs/ex/COLOR_GREEN-constant.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,12 +107,12 @@ <h5>library ex</h5>
107107
<div class="col-xs-12 col-sm-9 col-md-8 main-content">
108108

109109
<section class="multi-line-signature">
110-
<span class="name ">COLOR_GREEN</span> =
111-
<span class="constant-value">&#39;green&#39;</span>
112-
110+
<span class="name ">COLOR_GREEN</span> =
111+
<span class="constant-value">&#39;green&#39;</span>
112+
113113
</section>
114114

115-
115+
116116

117117
</div> <!-- /.main-content -->
118118

‎testing/test_package_docs/ex/COLOR_ORANGE-constant.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,12 +107,12 @@ <h5>library ex</h5>
107107
<div class="col-xs-12 col-sm-9 col-md-8 main-content">
108108

109109
<section class="multi-line-signature">
110-
<span class="name ">COLOR_ORANGE</span> =
111-
<span class="constant-value">&#39;orange&#39;</span>
112-
110+
<span class="name ">COLOR_ORANGE</span> =
111+
<span class="constant-value">&#39;orange&#39;</span>
112+
113113
</section>
114114

115-
115+
116116

117117
</div> <!-- /.main-content -->
118118

0 commit comments

Comments
 (0)