Merge pull request #1083 from keertip/analyze

fix analyzer warnings

Author: keertip

lib/dartdoc.dart

@@ -38,7 +38,7 @@ export 'src/package_meta.dart';
 
 const String name = 'dartdoc';
 // Update when pubspec version changes.
-const String version = '0.8.5';
+const String version = '0.8.5-dev';
 
 final String defaultOutDir = p.join('doc', 'api');
 

lib/src/element_type.dart

@@ -16,18 +16,10 @@ class ElementType {
 
   ElementType(this._type, this.element);
 
-  String toString() => "$_type";
-
   bool get isDynamic => _type.isDynamic;
 
-  bool get isParameterType => (_type is TypeParameterType);
-
   bool get isFunctionType => (_type is FunctionType);
 
-  String get name => _type.name;
-
-  DartType get _returnTypeCore => (_type as FunctionType).returnType;
-
   bool get isParameterizedType {
     if (_type is FunctionType) {
       return (_type as FunctionType).boundTypeParameters.isNotEmpty;
@@ -37,17 +29,38 @@ class ElementType {
     return false;
   }
 
-  String get _returnTypeName => _returnTypeCore.name;
+  bool get isParameterType => (_type is TypeParameterType);
 
-  ElementType get _returnType {
-    var rt = _returnTypeCore;
-    Library lib = element.package.findLibraryFor(rt.element);
-    if (lib == null) {
-      lib = new Library(rt.element.library, element.package);
+  String get linkedName {
+    if (_linkedName != null) return _linkedName;
+
+    StringBuffer buf = new StringBuffer();
+
+    if (isParameterType) {
+      buf.write(name);
+    } else {
+      buf.write(element.linkedName);
     }
-    return new ElementType(rt, new ModelElement.from(rt.element, lib));
+
+    // not TypeParameterType or Void or Union type
+    if (isParameterizedType) {
+      if (typeArguments.every((t) => t.linkedName == 'dynamic')) {
+        _linkedName = buf.toString();
+        return _linkedName;
+      }
+      if (typeArguments.isNotEmpty) {
+        buf.write('<');
+        buf.writeAll(typeArguments.map((t) => t.linkedName), ', ');
+        buf.write('>');
+      }
+    }
+    _linkedName = buf.toString();
+
+    return _linkedName;
   }
 
+  String get name => _type.name;
+
   ModelElement get returnElement {
     Element e = _returnTypeCore.element;
     if (e == null) {
@@ -64,7 +77,7 @@ class ElementType {
     if (_type is FunctionType) {
       return (_type as FunctionType)
           .boundTypeParameters
-          .map((f) => _getElementTypeFrom(f))
+          .map((f) => _getElementTypeFrom(f.type))
           .toList();
     } else {
       return (_type as ParameterizedType)
@@ -74,43 +87,18 @@ class ElementType {
     }
   }
 
-  ElementType _getElementTypeFrom(DartType f) {
-    Library lib;
-    // can happen if element is dynamic
-    lib = element.package.findLibraryFor(f.element);
-    if (lib == null && f.element.library != null) {
-      lib = new Library(f.element.library, element.package);
+  ElementType get _returnType {
+    var rt = _returnTypeCore;
+    Library lib = element.package.findLibraryFor(rt.element);
+    if (lib == null) {
+      lib = new Library(rt.element.library, element.package);
     }
-    return new ElementType(f, new ModelElement.from(f.element, lib));
+    return new ElementType(rt, new ModelElement.from(rt.element, lib));
   }
 
-  String get linkedName {
-    if (_linkedName != null) return _linkedName;
-
-    StringBuffer buf = new StringBuffer();
-
-    if (isParameterType) {
-      buf.write(name);
-    } else {
-      buf.write(element.linkedName);
-    }
-
-    // not TypeParameterType or Void or Union type
-    if (isParameterizedType) {
-      if (typeArguments.every((t) => t.linkedName == 'dynamic')) {
-        _linkedName = buf.toString();
-        return _linkedName;
-      }
-      if (typeArguments.isNotEmpty) {
-        buf.write('<');
-        buf.writeAll(typeArguments.map((t) => t.linkedName), ', ');
-        buf.write('>');
-      }
-    }
-    _linkedName = buf.toString();
+  DartType get _returnTypeCore => (_type as FunctionType).returnType;
 
-    return _linkedName;
-  }
+  String get _returnTypeName => _returnTypeCore.name;
 
   String createLinkedReturnTypeName() {
     if (_returnTypeCore.element == null ||
@@ -128,4 +116,16 @@ class ElementType {
       return _returnType.linkedName;
     }
   }
+
+  String toString() => "$_type";
+
+  ElementType _getElementTypeFrom(DartType f) {
+    Library lib;
+    // can happen if element is dynamic
+    lib = element.package.findLibraryFor(f.element);
+    if (lib == null && f.element.library != null) {
+      lib = new Library(f.element.library, element.package);
+    }
+    return new ElementType(f, new ModelElement.from(f.element, lib));
+  }
 }

lib/src/model.dart

@@ -827,7 +827,7 @@ class Field extends ModelElement
   @override
   String get _computeDocumentationComment {
     String docs = getterSetterDocumentationComment;
-    if (docs.isEmpty) return _field.computeDocumentationComment();
+    if (docs.isEmpty) return _field.documentationComment;
     return docs;
   }
 
@@ -862,12 +862,12 @@ abstract class GetterSetterCombo {
     var buffer = new StringBuffer();
 
     if (hasGetter && !_getter.isSynthetic) {
-      String docs = stripComments(_getter.computeDocumentationComment());
+      String docs = stripComments(_getter.documentationComment);
       if (docs != null) buffer.write(docs);
     }
 
     if (hasSetter && !_setter.isSynthetic) {
-      String docs = stripComments(_setter.computeDocumentationComment());
+      String docs = stripComments(_setter.documentationComment);
       if (docs != null) {
         if (buffer.isNotEmpty) buffer.write('\n\n');
         buffer.write(docs);
@@ -1963,7 +1963,7 @@ class TopLevelVariable extends ModelElement
   @override
   String get _computeDocumentationComment {
     String docs = getterSetterDocumentationComment;
-    if (docs.isEmpty) return _variable.computeDocumentationComment();
+    if (docs.isEmpty) return _variable.documentationComment;
     return docs;
   }
 
@@ -2001,7 +2001,6 @@ class Typedef extends ModelElement implements EnclosedElement {
 
   String get nameWithGenerics {
     if (!modelType.isParameterizedType) return name;
-    String n = '$name<${_typeParameters.map((t) => t.name).join(', ')}>';
     return '$name<${_typeParameters.map((t) => t.name).join(', ')}>';
   }
 

pubspec.yaml

@@ -1,6 +1,6 @@
 name: dartdoc
 # Also update the `version` field in lib/dartdoc.dart.
-version: 0.8.5
+version: 0.8.5-dev
 author: Dart Team <misc@dartlang.org>
 description: A documentation generator for Dart.
 homepage: https://github.com/dart-lang/dartdoc

test_package_docs/index.html

@@ -4,7 +4,7 @@
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <meta name="generator" content="made with love by dartdoc 0.8.5">
+  <meta name="generator" content="made with love by dartdoc 0.8.5-dev">
   <meta name="description" content="test_package API docs, for the Dart programming language.">
   <title>test_package - Dart API docs</title>