Skip to content

Commit 7c789b4

Browse files
jcollins-gjcollins-g
committed
Fix some remaining templating bugs
1 parent 6e46e32 commit 7c789b4

File tree

9 files changed

+19
-22
lines changed

9 files changed

+19
-22
lines changed

‎lib/src/model/container.dart

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,6 @@ abstract class Container extends ModelElement {
124124
Iterable<Accessor> get instanceAccessors =>
125125
instanceFields.expand((f) => f.allAccessors);
126126

127-
Iterable<Accessor> get constantAccessors =>
128-
constantFields.expand((f) => f.allAccessors);
129-
130127
Iterable<Accessor> get staticAccessors =>
131128
staticFields.expand((f) => f.allAccessors);
132129

@@ -197,7 +194,7 @@ abstract class Container extends ModelElement {
197194
staticFields.where((f) => !f.isConst);
198195

199196
bool get hasPublicVariableStaticFields =>
200-
publicVariableStaticFieldsSorted.isEmpty;
197+
publicVariableStaticFieldsSorted.isNotEmpty;
201198

202199
Iterable<Field> get publicVariableStaticFields =>
203200
model_utils.filterNonPublic(variableStaticFields);

‎lib/templates/html/_sidebar_for_class.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@
3131
{{/publicInstanceOperatorsSorted}}
3232
{{/hasPublicInstanceOperators}}
3333

34-
{{#hasPublicStaticFields}}
34+
{{#hasPublicVariableStaticFields}}
3535
<li class="section-title"><a href="{{{href}}}#static-properties">Static properties</a></li>
3636
{{#publicVariableStaticFieldsSorted}}
3737
<li>{{{ linkedName }}}</li>
3838
{{/publicVariableStaticFieldsSorted}}
39-
{{/hasPublicStaticFields}}
39+
{{/hasPublicVariableStaticFields}}
4040

4141
{{#hasPublicStaticMethods}}
4242
<li class="section-title"><a href="{{{href}}}#static-methods">Static methods</a></li>

‎lib/templates/html/_sidebar_for_container.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@
3232
{{/publicInstanceOperatorsSorted}}
3333
{{/hasPublicInstanceOperators}}
3434

35-
{{#hasPublicStaticFields}}
35+
{{#hasPublicVariableStaticFields}}
3636
<li class="section-title"><a href="{{{href}}}#static-properties">Static properties</a></li>
3737
{{#publicVariableStaticFieldsSorted}}
3838
<li>{{{ linkedName }}}</li>
3939
{{/publicVariableStaticFieldsSorted}}
40-
{{/hasPublicStaticFields}}
40+
{{/hasPublicVariableStaticFields}}
4141

4242
{{#hasPublicStaticMethods}}
4343
<li class="section-title"><a href="{{{href}}}#static-methods">Static methods</a></li>
@@ -77,12 +77,12 @@
7777
{{/publicInstanceOperatorsSorted}}
7878
{{/hasPublicInstanceOperators}}
7979

80-
{{#hasPublicStaticFields}}
80+
{{#hasPublicVariableStaticFields}}
8181
<li class="section-title"><a href="{{{href}}}#static-properties">Static properties</a></li>
8282
{{#publicVariableStaticFieldsSorted}}
8383
<li>{{{ linkedName }}}</li>
8484
{{/publicVariableStaticFieldsSorted}}
85-
{{/hasPublicStaticFields}}
85+
{{/hasPublicVariableStaticFields}}
8686

8787
{{#hasPublicStaticMethods}}
8888
<li class="section-title"><a href="{{{href}}}#static-methods">Static methods</a></li>

‎lib/templates/html/_sidebar_for_enum.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@
3737
{{/publicInstanceOperatorsSorted}}
3838
{{/hasPublicInstanceOperators}}
3939

40-
{{#hasPublicStaticFields}}
40+
{{#hasPublicVariableStaticFields}}
4141
<li class="section-title"><a href="{{{href}}}#static-properties">Static properties</a></li>
4242
{{#publicVariableStaticFieldsSorted}}
4343
<li>{{{ linkedName }}}</li>
4444
{{/publicVariableStaticFieldsSorted}}
45-
{{/hasPublicStaticFields}}
45+
{{/hasPublicVariableStaticFields}}
4646

4747
{{#hasPublicStaticMethods}}
4848
<li class="section-title"><a href="{{{href}}}#static-methods">Static methods</a></li>

‎lib/templates/html/_sidebar_for_extension.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
{{/publicInstanceOperatorsSorted}}
2424
{{/hasPublicInstanceOperators}}
2525

26-
{{#hasPublicStaticFields}}
26+
{{#hasPublicVariableStaticFields}}
2727
<li class="section-title"><a href="{{{href}}}#static-properties">Static properties</a></li>
2828
{{#publicVariableStaticFieldsSorted}}
2929
<li>{{{ linkedName }}}</li>
3030
{{/publicVariableStaticFieldsSorted}}
31-
{{/hasPublicStaticFields}}
31+
{{/hasPublicVariableStaticFields}}
3232

3333
{{#hasPublicStaticMethods}}
3434
<li class="section-title"><a href="{{{href}}}#static-methods">Static methods</a></li>

‎lib/templates/html/class.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ <h2>Operators</h2>
135135
</section>
136136
{{/hasPublicInstanceOperators}}
137137

138-
{{#hasPublicStaticFields}}
138+
{{#hasPublicVariableStaticFields}}
139139
<section class="summary offset-anchor" id="static-properties">
140140
<h2>Static Properties</h2>
141141

@@ -145,7 +145,7 @@ <h2>Static Properties</h2>
145145
{{/publicVariableStaticFieldsSorted}}
146146
</dl>
147147
</section>
148-
{{/hasPublicStaticFields}}
148+
{{/hasPublicVariableStaticFields}}
149149

150150
{{#hasPublicStaticMethods}}
151151
<section class="summary offset-anchor" id="static-methods">

‎lib/templates/html/enum.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ <h2>Operators</h2>
138138
</section>
139139
{{/hasPublicInstanceOperators}}
140140

141-
{{#hasPublicStaticFields}}
141+
{{#hasPublicVariableStaticFields}}
142142
<section class="summary offset-anchor" id="static-properties">
143143
<h2>Static Properties</h2>
144144

@@ -148,7 +148,7 @@ <h2>Static Properties</h2>
148148
{{/publicVariableStaticFieldsSorted}}
149149
</dl>
150150
</section>
151-
{{/hasPublicStaticFields}}
151+
{{/hasPublicVariableStaticFields}}
152152

153153
{{#hasPublicStaticMethods}}
154154
<section class="summary offset-anchor" id="static-methods">

‎lib/templates/html/extension.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ <h2>Operators</h2>
6060
</section>
6161
{{/hasPublicInstanceOperators}}
6262

63-
{{#hasPublicStaticFields}}
63+
{{#hasPublicVariableStaticFields}}
6464
<section class="summary offset-anchor" id="static-properties">
6565
<h2>Static Properties</h2>
6666

@@ -70,7 +70,7 @@ <h2>Static Properties</h2>
7070
{{/publicVariableStaticFieldsSorted}}
7171
</dl>
7272
</section>
73-
{{/hasPublicStaticFields}}
73+
{{/hasPublicVariableStaticFields}}
7474

7575
{{#hasPublicStaticMethods}}
7676
<section class="summary offset-anchor" id="static-methods">

‎lib/templates/html/mixin.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ <h2>Operators</h2>
135135
</section>
136136
{{/hasPublicInstanceOperators}}
137137

138-
{{#hasPublicStaticFields}}
138+
{{#hasPublicVariableStaticFields}}
139139
<section class="summary offset-anchor" id="static-properties">
140140
<h2>Static Properties</h2>
141141

@@ -145,7 +145,7 @@ <h2>Static Properties</h2>
145145
{{/publicVariableStaticFieldsSorted}}
146146
</dl>
147147
</section>
148-
{{/hasPublicStaticFields}}
148+
{{/hasPublicVariableStaticFields}}
149149

150150
{{#hasPublicStaticMethods}}
151151
<section class="summary offset-anchor" id="static-methods">

0 commit comments

Comments
 (0)