Fix inconsistencies in #1581

Author: jcollins-g

lib/src/model.dart

@@ -1474,9 +1474,9 @@ class Field extends ModelElement
   bool get isInherited => _isInherited;
 
   @override
-  String get kind => 'property';
+  String get kind => isConst ? 'constant' : 'property';
 
-  String get typeName => "property";
+  String get typeName => kind;
 
   @override
   List<String> get annotations {
@@ -4806,7 +4806,7 @@ class TopLevelVariable extends ModelElement
   }
 
   @override
-  String get kind => 'top-level property';
+  String get kind => isConst ? 'top-level constant' : 'top-level property';
 
   @override
   Set<String> get features => super.features..addAll(comboFeatures);

test/model_test.dart

@@ -797,10 +797,12 @@ void main() {
 
     test('get constants', () {
       expect(Apple.publicConstants, hasLength(1));
+      expect(Apple.publicConstants.first.kind, equals('constant'));
     });
 
     test('get instance fields', () {
       expect(Apple.publicInstanceProperties, hasLength(3));
+      expect(Apple.publicInstanceProperties.first.kind, equals('property'));
     });
 
     test('get inherited properties, including properties of Object', () {
@@ -1910,6 +1912,10 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
       expect(greenConstant.fullyQualifiedName, 'ex.COLOR_GREEN');
     });
 
+    test('has the correct kind', () {
+      expect(greenConstant.kind, equals('top-level constant'));
+    });
+
     test('has enclosing element', () {
       expect(greenConstant.enclosingElement.name, equals(exLibrary.name));
     });

testing/test_package_docs/anonymous_library/doesStuff.html

@@ -54,7 +54,8 @@ <h1>doesStuff function</h1>
 
     <section class="multi-line-signature">
         <span class="returntype">String</span>
-        <span class="name ">doesStuff</span>(<wbr>)
+        <span class="name ">doesStuff</span>
+(<wbr>)
     </section>
 
 

testing/test_package_docs/another_anonymous_lib/greeting.html

@@ -54,7 +54,8 @@ <h1>greeting function</h1>
 
     <section class="multi-line-signature">
         <span class="returntype">String</span>
-        <span class="name ">greeting</span>(<wbr>)
+        <span class="name ">greeting</span>
+(<wbr>)
     </section>
 
 

testing/test_package_docs/css/theOnlyThingInTheLibrary.html

@@ -54,7 +54,8 @@ <h1>theOnlyThingInTheLibrary top-level property</h1>
 
     <section class="multi-line-signature">
       <span class="returntype">String</span>
-      <span class="name ">theOnlyThingInTheLibrary</span>      <div class="features">read / write</div>
+      <span class="name ">theOnlyThingInTheLibrary</span>
+      <div class="features">read / write</div>
     </section>
 
 

testing/test_package_docs/ex/Animal-class.html

@@ -121,7 +121,7 @@ <h2>Constants</h2>
       <dl class="properties">
         <dt id="CAT" class="constant">
           <span class="name ">CAT</span>
-          <span class="signature">&#8594; <a href="ex/Animal-class.html">Animal</a></span>
+          <span class="signature">&#8594; const <a href="ex/Animal-class.html">Animal</a></span>
         </dt>
         <dd>
           <p>Single line docs.</p>
@@ -132,7 +132,7 @@ <h2>Constants</h2>
         </dd>
         <dt id="DOG" class="constant">
           <span class="name ">DOG</span>
-          <span class="signature">&#8594; <a href="ex/Animal-class.html">Animal</a></span>
+          <span class="signature">&#8594; const <a href="ex/Animal-class.html">Animal</a></span>
         </dt>
         <dd>
           <p>Multi line docs.</p>
@@ -144,7 +144,7 @@ <h2>Constants</h2>
         </dd>
         <dt id="HORSE" class="constant">
           <span class="name ">HORSE</span>
-          <span class="signature">&#8594; <a href="ex/Animal-class.html">Animal</a></span>
+          <span class="signature">&#8594; const <a href="ex/Animal-class.html">Animal</a></span>
         </dt>
         <dd>
 
@@ -155,7 +155,7 @@ <h2>Constants</h2>
         </dd>
         <dt id="values" class="constant">
           <span class="name ">values</span>
-          <span class="signature">&#8594; List<span class="signature">&lt;<a href="ex/Animal-class.html">Animal</a>&gt;</span></span>
+          <span class="signature">&#8594; const List<span class="signature">&lt;<a href="ex/Animal-class.html">Animal</a>&gt;</span></span>
         </dt>
         <dd>
           <p>A constant List of the values in this enum, in order of their declaration.</p>

testing/test_package_docs/ex/Animal/hashCode.html

@@ -72,7 +72,8 @@ <h1>hashCode property</h1>
 
         <section class="multi-line-signature">
           <span class="returntype">int</span>
-          <span class="name ">hashCode</span>  <div class="features">inherited</div>
+          <span class="name ">hashCode</span>
+  <div class="features">inherited</div>
 </section>
 
 

testing/test_package_docs/ex/Animal/noSuchMethod.html

@@ -69,7 +69,8 @@ <h1>noSuchMethod method</h1>
 
     <section class="multi-line-signature">
       <span class="returntype">dynamic</span>
-      <span class="name ">noSuchMethod</span>(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
+      <span class="name ">noSuchMethod</span>
+(<wbr><span class="parameter" id="noSuchMethod-param-invocation"><span class="type-annotation">Invocation</span> <span class="parameter-name">invocation</span></span>)
     </section>
 
 

testing/test_package_docs/ex/Animal/operator_equals.html

@@ -69,7 +69,8 @@ <h1>operator == method</h1>
 
     <section class="multi-line-signature">
       <span class="returntype">bool</span>
-      <span class="name ">operator ==</span>(<wbr><span class="parameter" id="==-param-other"><span class="parameter-name">other</span></span>)
+      <span class="name ">operator ==</span>
+(<wbr><span class="parameter" id="==-param-other"><span class="parameter-name">other</span></span>)
     </section>
 
 

testing/test_package_docs/ex/Animal/runtimeType.html

@@ -72,7 +72,8 @@ <h1>runtimeType property</h1>
 
         <section class="multi-line-signature">
           <span class="returntype">Type</span>
-          <span class="name ">runtimeType</span>  <div class="features">inherited</div>
+          <span class="name ">runtimeType</span>
+  <div class="features">inherited</div>
 </section>