Fix up const-declaration

Author: jcollins-g

lib/src/model.dart

@@ -19,7 +19,6 @@ import 'package:analyzer/source/package_map_resolver.dart';
 import 'package:analyzer/source/sdk_ext.dart';
 // TODO(jcollins-g): Stop using internal analyzer structures somehow.
 import 'package:analyzer/src/context/builder.dart';
-import 'package:analyzer/src/dart/constant/value.dart';
 import 'package:analyzer/src/dart/element/element.dart';
 import 'package:analyzer/src/dart/sdk/sdk.dart';
 import 'package:analyzer/src/generated/engine.dart';
@@ -1565,33 +1564,33 @@ abstract class GetterSetterCombo implements ModelElement {
 
   Expression get constantInitializer => (element as ConstVariableElement).constantInitializer;
 
-  String linkifyConstantValue(String constructorName, Element staticElement, String original) {
+  String linkifyConstantValue(String original) {
     if (constantInitializer is! InstanceCreationExpression) return original;
     String constructorName = (constantInitializer as InstanceCreationExpression).constructorName.toString();
     Element staticElement = (constantInitializer as InstanceCreationExpression).staticElement;
     Constructor target = new ModelElement.fromElement(staticElement, package);
     Class targetClass = target.enclosingElement;
+    // TODO(jcollins-g): this logic really should be integrated into Constructor,
+    // but that's not trivial because of linkedName's usage.
+    if (targetClass.name == target.name) {
+      return original.replaceAll(constructorName, "${target.linkedName}");
+    }
     return original.replaceAll(constructorName, "${targetClass.linkedName}.${target.linkedName}");
   }
 
   String _constantValueBase;
   String get constantValueBase {
     if (_constantValueBase == null) {
-      if (constantInitializer != null) {
-        _constantValueBase = const HtmlEscape(HtmlEscapeMode.UNKNOWN).convert(constantInitializer.toString());
-        if (constantInitializer is InstanceCreationExpression) {
-          _constantValueBase = linkifyConstantValue((constantInitializer as InstanceCreationExpression).constructorName.toString(), (constantInitializer as InstanceCreationExpression).staticElement, _constantValueBase);
-        }
-        if (_constantValueBase.contains('Stuff'))
-          1+1;
-      }
+      _constantValueBase = constantInitializer?.toString();
+      if (_constantValueBase == null) _constantValueBase = '';
+      _constantValueBase =
+          const HtmlEscape(HtmlEscapeMode.UNKNOWN).convert(_constantValueBase);
     }
     return _constantValueBase;
   }
 
-  String get constantValue => constantValueBase;
-
-  String get constantValueTruncated => truncateString(constantValueBase, 200);
+  String get constantValue => linkifyConstantValue(constantValueBase);
+  String get constantValueTruncated => linkifyConstantValue(truncateString(constantValueBase, 200));
 
   /// Returns true if both accessors are synthetic.
   bool get hasSyntheticAccessors {

test/model_test.dart

@@ -1877,7 +1877,6 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
         cat,
         orangeConstant,
         prettyColorsConstant,
-        stuffConstant,
         deprecated;
 
     Field aStaticConstField, aName;
@@ -1889,8 +1888,6 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
           exLibrary.constants.firstWhere((c) => c.name == 'COLOR_ORANGE');
       prettyColorsConstant =
           exLibrary.constants.firstWhere((c) => c.name == 'PRETTY_COLORS');
-      stuffConstant =
-          fakeLibrary.constants.firstWhere((c) => c.name == 'STUFF');
       cat = exLibrary.constants.firstWhere((c) => c.name == 'MY_CAT');
       deprecated =
           exLibrary.constants.firstWhere((c) => c.name == 'deprecated');
@@ -1902,7 +1899,7 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
 
     test('substrings of the constant values type are not linked (#1535)', () {
       expect(aName.constantValue,
-          'const ExtendedShortName("hello there")');
+          'const <a href="ex/ExtendedShortName/ExtendedShortName.html">ExtendedShortName</a>(&quot;hello there&quot;)');
     });
 
     test('constant field values are escaped', () {
@@ -1934,8 +1931,8 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
           "const &lt;String&gt; [COLOR_GREEN, COLOR_ORANGE, &#39;blue&#39;]");
     });
 
-    test('MY_CAT is not linked', () {
-      expect(cat.constantValue, 'const ConstantCat(&#39;tabby&#39;)');
+    test('MY_CAT is linked', () {
+      expect(cat.constantValue, 'const <a href="ex/ConstantCat/ConstantCat.html">ConstantCat</a>(&#39;tabby&#39;)');
     });
 
     test('exported property', () {

testing/test_package/lib/fake.dart

@@ -595,12 +595,6 @@ class SpecialList<E> extends ListBase<E> {
   void operator []=(int index, E value) {}
 }
 
-class AClassWithConstConstructor {
-  const AClassWithConstConstructor.Stuff(String one, String two);
-}
-
-const AClassWithConstConstructor STUFF = const AClassWithConstConstructor.Stuff('one', 'two');
-
 /// This inherits operators.
 class ExtraSpecialList<E> extends SpecialList {}