From c213186fc3f335ac1b17e1bfcb24c4216aa77211 Mon Sep 17 00:00:00 2001 From: Janice Collins Date: Thu, 13 Apr 2017 14:48:44 -0700 Subject: [PATCH 01/19] First stab at disambiguation, but needs to be extracted --- lib/src/model.dart | 119 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 112 insertions(+), 7 deletions(-) diff --git a/lib/src/model.dart b/lib/src/model.dart index c90eb48aab..473bc22003 100644 --- a/lib/src/model.dart +++ b/lib/src/model.dart @@ -84,6 +84,8 @@ int byFeatureOrdering(String a, String b) { return compareAsciiLowerCaseNatural(a, b); } +final RegExp _locationSplitter = new RegExp(r"(package:|[\\/;.])"); + /// Mixin for subclasses of ModelElement representing Elements that can be /// inherited from one class to another. /// @@ -1472,6 +1474,42 @@ class Library extends ModelElement { return (_allCanonicalModelElements ??= allModelElements.where((e) => e.isCanonical).toList()); } + + final Map_isReexportedBy = {}; + /// Heuristic that tries to guess if this library is actually largely + /// reexported by some other library. We guess this by comparing the elements + /// inside each of allModelElements for both libraries. Don't use this + /// except as a last-resort for canonicalization as it is a pretty fuzzy + /// definition. + /// + /// If most of the elements from this library appear in the other, but not + /// the reverse, then the other library is considered to be a reexporter of + /// this one. + /// + /// If not, then the situation is either ambiguous, or the reverse is true. + /// Computing this is expensive, so cache it. + bool isReexportedBy(Library library) { + assert (package.allLibrariesAdded); + if (_isReexportedBy.containsKey(library)) return _isReexportedBy[library]; + Set otherElements = new Set()..addAll(library.allModelElements.map((l) => l.element)); + Set ourElements = new Set()..addAll(allModelElements.map((l) => l.element)); + if (ourElements.difference(otherElements).length <= ourElements.length / 2) { + // Less than half of our elements are unique to us. + if (otherElements.difference(ourElements).length <= otherElements.length / 2) { + // ... but the same is true for the other library. Reexporting + // is ambiguous. + _isReexportedBy[library] = false; + } else { + _isReexportedBy[library] = true; + } + } else { + // We have a lot of unique elements, we're probably not reexported by + // the other libraries. + _isReexportedBy[library] = false; + } + + return _isReexportedBy[library]; + } } class Method extends ModelElement @@ -1691,6 +1729,50 @@ abstract class ModelElement implements Comparable, Nameable, Documentable { return library.package.libraryElementReexportedBy[this.element.library]; } + Set get locationPieces { + return new Set()..addAll( + element.location.toString().split(_locationSplitter).where((s) => s.isNotEmpty)); + } + + Set get namePieces { + return new Set()..addAll( + name.split(_locationSplitter).where((s) => s.isNotEmpty)); + } + + // Use components of this element's location to return a score for library + // location. + double scoreElementWithLibrary(Library lib) { + Iterable resplit(Set items) sync* { + for (String item in items) { + for (String subItem in item.split('_')) { + yield subItem; + } + } + } + double result = 0.0; + // Penalty for deprecated libraries. + if (lib.isDeprecated) result -= 1; + // Give a big boost if the library has the package name embedded in it. + if (package.namePieces.intersection(lib.namePieces).length > 0) + result += 1; + // Give a tiny boost for libraries with long names. + result += .01 * lib.namePieces.length; + // If we don't know the location of this element, return our best guess. + // TODO(jcollins-g): is that even possible? + if (locationPieces.isEmpty) return result; + // The more pieces we have of the location in our library name, the more we should boost our score. + result += (lib.namePieces.intersection(locationPieces).length.toDouble()) / (locationPieces.length.toDouble()); + // If pieces of location at least start with elements of our library name, boost the score a little bit. + for (String piece in resplit(locationPieces)) { + for (String namePiece in lib.namePieces) { + if (piece.startsWith(namePiece)) { + result += 0.001; + } + } + } + return result; + } + // TODO(jcollins-g): annotations should now be able to use the utility // functions in package for finding elements and avoid using computeNode(). List get annotations { @@ -1812,14 +1894,25 @@ abstract class ModelElement implements Comparable, Nameable, Documentable { if (topLevelElement == lookup) return true; return false; }).toList(); - // If path inspection or other disambiguation heuristics are needed, - // they should go here. if (candidateLibraries.length > 1) { - library.package.warn(this, PackageWarning.ambiguousReexport, - "${candidateLibraries.map((l) => l.name)}"); + // Heuristic scoring to determine which library a human likely + // considers this element to be primarily 'from', and therefore, + // canonical. Still warn if the heuristic isn't that confident. + candidateLibraries = scoreCanonicalCandidates(candidateLibraries); + double secondHighestScore = scoreElementWithLibrary( + candidateLibraries[candidateLibraries.length - 2]); + double highestScore = scoreElementWithLibrary( + candidateLibraries.last); + double confidence = highestScore - secondHighestScore; + // In debugging I've found below .1 to be the most tricky; even + // humans have to scratch their heads a bit at this level. + if (confidence < 0.1) { + library.package.warn(this, PackageWarning.ambiguousReexport, + "${candidateLibraries.map((l) => l.name)} -> ${candidateLibraries.last.name} (confidence ${confidence})"); + } } if (candidateLibraries.isNotEmpty) - _canonicalLibrary = candidateLibraries.first; + _canonicalLibrary = candidateLibraries.last; } } else { _canonicalLibrary = definingLibrary; @@ -1836,6 +1929,11 @@ abstract class ModelElement implements Comparable, Nameable, Documentable { return _canonicalLibrary; } + int byScore(Library a, Library b) { + return Comparable.compare(scoreElementWithLibrary(a), scoreElementWithLibrary(b)); + } + List scoreCanonicalCandidates(List libraries) => libraries..sort(byScore); + bool get isCanonical { if (library == canonicalLibrary) { if (this is Inheritable) { @@ -2562,8 +2660,10 @@ class Package implements Nameable, Documentable { break; case PackageWarning.ambiguousReexport: // Fix these warnings by adding the original library exporting the - // symbol with --include, or by using --auto-include-dependencies. - // TODO(jcollins-g): add a dartdoc flag to force a particular resolution order for (or drop) ambiguous reexports + // symbol with --include, by using --auto-include-dependencies, + // or by using --exclude to hide one of the libraries involved + // TODO(jcollins-g): add a dartdoc flag to force a particular resolution + // order for (or drop) ambiguous reexports warningMessage = "ambiguous reexport of ${fullElementName}, canonicalization candidates: ${message}"; break; @@ -2577,6 +2677,11 @@ class Package implements Nameable, Documentable { _displayedWarnings[modelElement.element].add(kind); } + Set get namePieces { + return new Set()..addAll( + name.split(_locationSplitter).where((s) => s.isNotEmpty)); + } + static Package _withAutoIncludedDependencies( Set libraryElements, PackageMeta packageMeta) { var startLength = libraryElements.length; From 787d4f8f3c7f392e1c5172e63169294da7e49bbe Mon Sep 17 00:00:00 2001 From: Janice Collins Date: Wed, 17 May 2017 08:30:23 -0700 Subject: [PATCH 02/19] scorer in pretty good shape now --- lib/src/model.dart | 94 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 66 insertions(+), 28 deletions(-) diff --git a/lib/src/model.dart b/lib/src/model.dart index d3be82f624..f3ce30b5c0 100644 --- a/lib/src/model.dart +++ b/lib/src/model.dart @@ -1722,6 +1722,37 @@ class Method extends ModelElement MethodElement get _method => (element as MethodElement); } +/// This class represents the score for a particular element; how likely +/// it is that this is the canonical element. +class ScoredCandidate implements Comparable { + final List reasons = []; + /// The ModelElement being scored. + final ModelElement element; + final Library library; + /// The score accumulated so far. Higher means it is more likely that this + /// is is the + double score = 0.0; + + ScoredCandidate(this.element, this.library); + + void alterScore(double scoreDelta, String reason) { + score += scoreDelta; + if (scoreDelta != 0) { + reasons.add("${reason} (${scoreDelta >= 0 ? '+' : ''}${scoreDelta.toStringAsPrecision(4)})"); + } + } + + int compareTo(ScoredCandidate other) { + assert(element == other.element); + return score.compareTo(other.score); + } + + String toString() { + return "${library.name}: ${score.toStringAsPrecision(4)} - ${reasons.join(', ')}"; + } +} + + /// This class is the foundation of Dartdoc's model for source code. /// All ModelElements are contained within a [Package], and laid out in a /// structure that mirrors the availability of identifiers in the various @@ -1894,7 +1925,8 @@ abstract class ModelElement implements Comparable, Nameable, Documentable { // Use components of this element's location to return a score for library // location. - double scoreElementWithLibrary(Library lib) { + ScoredCandidate scoreElementWithLibrary(Library lib) { + ScoredCandidate scoredCandidate = new ScoredCandidate(this, lib); Iterable resplit(Set items) sync* { for (String item in items) { for (String subItem in item.split('_')) { @@ -1902,28 +1934,30 @@ abstract class ModelElement implements Comparable, Nameable, Documentable { } } } - double result = 0.0; // Penalty for deprecated libraries. - if (lib.isDeprecated) result -= 1; + if (lib.isDeprecated) scoredCandidate.alterScore(-1.0, 'is deprecated'); // Give a big boost if the library has the package name embedded in it. - if (package.namePieces.intersection(lib.namePieces).length > 0) - result += 1; + if (package.namePieces.intersection(lib.namePieces).length > 0) { + scoredCandidate.alterScore(1.0, 'embeds package name'); + } // Give a tiny boost for libraries with long names. - result += .01 * lib.namePieces.length; + scoredCandidate.alterScore(.01 * lib.namePieces.length, 'name is long'); // If we don't know the location of this element, return our best guess. // TODO(jcollins-g): is that even possible? - if (locationPieces.isEmpty) return result; + if (locationPieces.isEmpty) return scoredCandidate; // The more pieces we have of the location in our library name, the more we should boost our score. - result += (lib.namePieces.intersection(locationPieces).length.toDouble()) / (locationPieces.length.toDouble()); + scoredCandidate.alterScore(lib.namePieces.intersection(locationPieces).length.toDouble() / locationPieces.length.toDouble(), 'element location shares parts with name'); // If pieces of location at least start with elements of our library name, boost the score a little bit. + double scoreBoost = 0.0; for (String piece in resplit(locationPieces)) { for (String namePiece in lib.namePieces) { if (piece.startsWith(namePiece)) { - result += 0.001; + scoreBoost += 0.001; } } } - return result; + scoredCandidate.alterScore(scoreBoost, 'element location parts start with parts of name'); + return scoredCandidate; } // TODO(jcollins-g): annotations should now be able to use the utility @@ -2051,17 +2085,30 @@ abstract class ModelElement implements Comparable, Nameable, Documentable { // Heuristic scoring to determine which library a human likely // considers this element to be primarily 'from', and therefore, // canonical. Still warn if the heuristic isn't that confident. - candidateLibraries = scoreCanonicalCandidates(candidateLibraries); - double secondHighestScore = scoreElementWithLibrary( - candidateLibraries[candidateLibraries.length - 2]); - double highestScore = scoreElementWithLibrary( - candidateLibraries.last); + + // Start with our top-level element. + ModelElement warnable = this; + Element topLevelElement = warnable.element; + while (topLevelElement.enclosingElement is! CompilationUnitElement) { + topLevelElement = topLevelElement.enclosingElement; + } + warnable = new ModelElement.from( + topLevelElement, package.findOrCreateLibraryFor(topLevelElement)); + + List scoredCandidates = warnable.scoreCanonicalCandidates(candidateLibraries); + candidateLibraries = scoredCandidates.map((s) => s.library).toList(); + double secondHighestScore = scoredCandidates[scoredCandidates.length - 2].score; + double highestScore = scoredCandidates.last.score; double confidence = highestScore - secondHighestScore; // In debugging I've found below .1 to be the most tricky; even // humans have to scratch their heads a bit at this level. + List debugLines = ["${candidateLibraries.map((l) => l.name)} -> ${candidateLibraries.last.name} (confidence ${confidence.toStringAsPrecision(4)})"]; + debugLines.addAll(scoredCandidates.map((s) => ' ${s.toString()}')); + debugLines.add(warnable.namePieces.join(',')); + debugLines.add(candidateLibraries.last.locationPieces.join(',')); + if (confidence < 0.1) { - warn(PackageWarning.ambiguousReexport, - "${candidateLibraries.map((l) => l.name)} -> ${candidateLibraries.last.name} (confidence ${confidence})"); + warnable.warn(PackageWarning.ambiguousReexport, debugLines.join('\n')); } } if (candidateLibraries.isNotEmpty) @@ -2082,10 +2129,9 @@ abstract class ModelElement implements Comparable, Nameable, Documentable { return _canonicalLibrary; } - int byScore(Library a, Library b) { - return Comparable.compare(scoreElementWithLibrary(a), scoreElementWithLibrary(b)); + List scoreCanonicalCandidates(List libraries) { + return libraries.map((l) => scoreElementWithLibrary(l)).toList()..sort(); } - List scoreCanonicalCandidates(List libraries) => libraries..sort(byScore); @override bool get isCanonical { @@ -3080,14 +3126,6 @@ class Package implements Nameable, Documentable { void warnOnElement(Warnable warnable, PackageWarning kind, [String message]) { if (warnable != null) { // This sort of warning is only applicable to top level elements. - if (kind == PackageWarning.ambiguousReexport) { - Element topLevelElement = warnable.element; - while (topLevelElement.enclosingElement is! CompilationUnitElement) { - topLevelElement = topLevelElement.enclosingElement; - } - warnable = new ModelElement.from( - topLevelElement, findOrCreateLibraryFor(topLevelElement)); - } if (warnable is Accessor) { // This might be part of a Field, if so, assign this warning to the field // rather than the Accessor. From 13717b5fad3a98d6e909360f96fa743decfa0215 Mon Sep 17 00:00:00 2001 From: Janice Collins Date: Mon, 22 May 2017 07:58:46 -0700 Subject: [PATCH 03/19] beginnings of being able to set canonicalization manually --- lib/src/model.dart | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/lib/src/model.dart b/lib/src/model.dart index 2728304415..f7063c06bd 100644 --- a/lib/src/model.dart +++ b/lib/src/model.dart @@ -1745,11 +1745,13 @@ class ScoredCandidate implements Comparable { } } + @override int compareTo(ScoredCandidate other) { assert(element == other.element); return score.compareTo(other.score); } + @override String toString() { return "${library.name}: ${score.toStringAsPrecision(4)} - ${reasons.join(', ')}"; } @@ -2026,6 +2028,28 @@ abstract class ModelElement implements Comparable, Nameable, Documentable { bool get canHaveParameters => element is ExecutableElement || element is FunctionTypeAliasElement; + + String _preferredCanonicalLibrary; + String get preferredCanonicalLibrary { + if (_preferredCanonicalLibrary == null) documentation; + return _preferredCanonicalLibrary; + } + + /// Hide canonicalFor from doc while leaving a note to ourselves to + /// help with ambiguous canonicalization determination. + /// + /// Example: + /// + /// {@canonicalFor angular2.common} + String _setPreferredCanonicalLibrary(String rawDocs) { + final canonicalRegExp = new RegExp(r'{@canonicalFor\s([^}]+)}'); + rawDocs.replaceFirstMapped(canonicalRegExp, (Match match) { + _preferredCanonicalLibrary = match.group(1); + return ''; + }); + return rawDocs; + } + /// Returns the docs, stripped of their leading comments syntax. /// /// This getter will walk up the inheritance hierarchy @@ -2049,6 +2073,7 @@ abstract class ModelElement implements Comparable, Nameable, Documentable { _rawDocs = _injectExamples(_rawDocs); _rawDocs = _stripMacroTemplatesAndAddToIndex(_rawDocs); _rawDocs = _injectMacros(_rawDocs); + _rawDocs = _setPreferredCanonicalLibrary(_rawDocs); return _rawDocs; } @@ -3931,6 +3956,7 @@ class Typedef extends ModelElement return ''; } + @override String get href { if (canonicalLibrary == null) return null; return '${canonicalLibrary.dirName}/$fileName'; From 2ef88ba61c6f445d067cc53e82cfa5244213091d Mon Sep 17 00:00:00 2001 From: Janice Collins Date: Tue, 23 May 2017 12:10:03 -0700 Subject: [PATCH 04/19] intermediate state: moving to library-based canonicalFor declaration --- bin/dartdoc.dart | 20 ++-- lib/src/config.dart | 14 ++- lib/src/model.dart | 223 ++++++++++++++++++++++++++------------------ 3 files changed, 156 insertions(+), 101 deletions(-) diff --git a/bin/dartdoc.dart b/bin/dartdoc.dart index 67509438ab..a5f4884624 100644 --- a/bin/dartdoc.dart +++ b/bin/dartdoc.dart @@ -152,21 +152,20 @@ main(List arguments) async { generator.onFileCreated.listen(_onProgress); } - var addCrossdart = args['add-crossdart'] as bool; - var includeSource = args['include-source'] as bool; - DartSdk sdk = new FolderBasedDartSdk(PhysicalResourceProvider.INSTANCE, PhysicalResourceProvider.INSTANCE.getFolder(sdkDir.path)); setConfig( - addCrossdart: addCrossdart, + addCrossdart: args['add-crossdart'] as bool, examplePathPrefix: args['example-path-prefix'], showWarnings: args['show-warnings'], - includeSource: includeSource, + includeSource: args['include-source'] as bool, inputDir: inputDir, sdkVersion: sdk.sdkVersion, autoIncludeDependencies: args['auto-include-dependencies'], - categoryOrder: args['category-order']); + categoryOrder: args['category-order'], + reexportMinConfidence: double.parse(args['ambiguous-reexport-scorer-min-confidence']), + verboseWarnings: args['verbose-warnings'] as bool); DartDoc dartdoc = new DartDoc(inputDir, excludeLibraries, sdkDir, generators, outputDir, packageMeta, includeLibraries, @@ -266,6 +265,15 @@ ArgParser _createArgsParser() { "Generates `index.json` with indentation and newlines. The file is larger, but it's also easier to diff.", negatable: false, defaultsTo: false); + parser.addOption('ambiguous-reexport-scorer-min-confidence', + help: + 'Minimum scorer confidence to suppress warning on ambiguous reexport.', + defaultsTo: "0.1"); + parser.addFlag('verbose-warnings', + help: + 'Display extra debugging information and help with warnings.', + negatable: true, + defaultsTo: true); return parser; } diff --git a/lib/src/config.dart b/lib/src/config.dart index e4a4e4d3c2..589089f840 100644 --- a/lib/src/config.dart +++ b/lib/src/config.dart @@ -16,6 +16,8 @@ class Config { final String sdkVersion; final bool autoIncludeDependencies; final List categoryOrder; + final double reexportMinConfidence; + final bool verboseWarnings; Config._( this.inputDir, this.showWarnings, @@ -24,7 +26,9 @@ class Config { this.includeSource, this.sdkVersion, this.autoIncludeDependencies, - this.categoryOrder); + this.categoryOrder, + this.reexportMinConfidence, + this.verboseWarnings); } Config _config; @@ -38,7 +42,9 @@ void setConfig( bool includeSource: true, String sdkVersion, bool autoIncludeDependencies: false, - List categoryOrder}) { + List categoryOrder, + double reexportMinConfidence: 0.1, + verboseWarnings: true}) { if (categoryOrder == null) { categoryOrder = new UnmodifiableListView([]); } @@ -50,5 +56,7 @@ void setConfig( includeSource, sdkVersion, autoIncludeDependencies, - categoryOrder); + categoryOrder, + reexportMinConfidence, + verboseWarnings); } diff --git a/lib/src/model.dart b/lib/src/model.dart index 4ac859d2b6..f18359cd35 100644 --- a/lib/src/model.dart +++ b/lib/src/model.dart @@ -179,11 +179,11 @@ class Accessor extends ModelElement ModelElement get enclosingCombo => _enclosingCombo; @override - void warn(PackageWarning kind, {String message, Locatable referredFrom}) { + void warn(PackageWarning kind, {String message, Locatable referredFrom, List extendedDebug}) { if (enclosingCombo != null) { - enclosingCombo.warn(kind, message: message, referredFrom: referredFrom); + enclosingCombo.warn(kind, message: message, referredFrom: referredFrom, extendedDebug: extendedDebug); } else { - super.warn(kind, message: message, referredFrom: referredFrom); + super.warn(kind, message: message, referredFrom: referredFrom, extendedDebug: extendedDebug); } } @@ -1308,6 +1308,31 @@ class Library extends ModelElement { String get dirName => name.replaceAll(':', '-'); + Set canonicalFor = new Set(); + /// Hide canonicalFor from doc while leaving a note to ourselves to + /// help with ambiguous canonicalization determination. + /// + /// Example: + /// + /// {@canonicalFor angular2.common} + String _setCanonicalFor(String rawDocs) { + final canonicalRegExp = new RegExp(r'{@canonicalFor\s([^}]+)}'); + rawDocs.replaceAllMapped(canonicalRegExp, (Match match) { + canonicalFor.add(match.group(1)); + if (match.group(1)) + return ''; + }); + return rawDocs; + } + + String _rawDocs; + String get documentation { + if (_rawDocs == null) { + _rawDocs = _setCanonicalFor(super.documentation); + } + return _rawDocs; + } + /// Libraries are not enclosed by anything. ModelElement get enclosingElement => null; @@ -1949,6 +1974,10 @@ abstract class ModelElement implements Comparable, Nameable, Documentable { } } } + // Large boost for @canonicalFor, essentially overriding all other concerns. + if (lib.canonicalFor.contains(fullyQualifiedName)) { + scoredCandidate.alterScore(5.0, 'marked @canonicalFor'); + } // Penalty for deprecated libraries. if (lib.isDeprecated) scoredCandidate.alterScore(-1.0, 'is deprecated'); // Give a big boost if the library has the package name embedded in it. @@ -2038,26 +2067,6 @@ abstract class ModelElement implements Comparable, Nameable, Documentable { bool get canHaveParameters => element is ExecutableElement || element is FunctionTypeAliasElement; - String _preferredCanonicalLibrary; - String get preferredCanonicalLibrary { - if (_preferredCanonicalLibrary == null) documentation; - return _preferredCanonicalLibrary; - } - - /// Hide canonicalFor from doc while leaving a note to ourselves to - /// help with ambiguous canonicalization determination. - /// - /// Example: - /// - /// {@canonicalFor angular2.common} - String _setPreferredCanonicalLibrary(String rawDocs) { - final canonicalRegExp = new RegExp(r'{@canonicalFor\s([^}]+)}'); - rawDocs.replaceFirstMapped(canonicalRegExp, (Match match) { - _preferredCanonicalLibrary = match.group(1); - return ''; - }); - return rawDocs; - } /// Returns the docs, stripped of their leading comments syntax. ModelElement _documentationFrom; @@ -2093,7 +2102,6 @@ abstract class ModelElement implements Comparable, Nameable, Documentable { _rawDocs = _injectExamples(_rawDocs); _rawDocs = _stripMacroTemplatesAndAddToIndex(_rawDocs); _rawDocs = _injectMacros(_rawDocs); - _rawDocs = _setPreferredCanonicalLibrary(_rawDocs); return _rawDocs; } @@ -2133,34 +2141,32 @@ abstract class ModelElement implements Comparable, Nameable, Documentable { if (topLevelElement == lookup) return true; return false; }).toList(); + // Start with our top-level element. + ModelElement warnable = new ModelElement.from( + topLevelElement, package.findOrCreateLibraryFor(topLevelElement)); + // Validate that the user didn't ask us to do something impossible. + if (preferredCanonicalLibrary != null) { + List names = candidateLibraries.map((l) => l.name).toList(); + if (!names.contains(preferredCanonicalLibrary)) { + warnable.warn(PackageWarning.ignoredCanonicalFor, message: preferredCanonicalLibrary, + extendedDebug: ["canonicalization candidates: ($names)"]); + } + } if (candidateLibraries.length > 1) { // Heuristic scoring to determine which library a human likely // considers this element to be primarily 'from', and therefore, // canonical. Still warn if the heuristic isn't that confident. - - // Start with our top-level element. - ModelElement warnable = this; - Element topLevelElement = warnable.element; - while (topLevelElement.enclosingElement is! CompilationUnitElement) { - topLevelElement = topLevelElement.enclosingElement; - } - warnable = new ModelElement.from( - topLevelElement, package.findOrCreateLibraryFor(topLevelElement)); - List scoredCandidates = warnable.scoreCanonicalCandidates(candidateLibraries); candidateLibraries = scoredCandidates.map((s) => s.library).toList(); double secondHighestScore = scoredCandidates[scoredCandidates.length - 2].score; double highestScore = scoredCandidates.last.score; double confidence = highestScore - secondHighestScore; - // In debugging I've found below .1 to be the most tricky; even - // humans have to scratch their heads a bit at this level. - List debugLines = ["${candidateLibraries.map((l) => l.name)} -> ${candidateLibraries.last.name} (confidence ${confidence.toStringAsPrecision(4)})"]; - debugLines.addAll(scoredCandidates.map((s) => ' ${s.toString()}')); - debugLines.add(warnable.namePieces.join(',')); - debugLines.add(candidateLibraries.last.locationPieces.join(',')); - - if (confidence < 0.1) { - warnable.warn(PackageWarning.ambiguousReexport, message: debugLines.join('\n')); + String message = "${candidateLibraries.map((l) => l.name)} -> ${candidateLibraries.last.name} (confidence ${confidence.toStringAsPrecision(4)})"; + List debugLines = []; + debugLines.addAll(scoredCandidates.map((s) => '${s.toString()}')); + + if (confidence < config.reexportMinConfidence) { + warnable.warn(PackageWarning.ambiguousReexport, message: message, extendedDebug: debugLines); } } if (candidateLibraries.isNotEmpty) @@ -2437,9 +2443,9 @@ abstract class ModelElement implements Comparable, Nameable, Documentable { } @override - void warn(PackageWarning kind, {String message, Locatable referredFrom}) { + void warn(PackageWarning kind, {String message, Locatable referredFrom, List extendedDebug}) { package.warnOnElement(this, kind, - message: message, referredFrom: referredFrom); + message: message, referredFrom: referredFrom, extendedDebug: extendedDebug); } String get _computeDocumentationComment => element.documentationComment; @@ -2905,6 +2911,7 @@ class Operator extends Method { enum PackageWarning { ambiguousDocReference, ambiguousReexport, + ignoredCanonicalFor, noCanonicalFound, noLibraryLevelDocs, categoryOrderGivesMissingPackageName, @@ -2915,49 +2922,69 @@ enum PackageWarning { typeAsHtml, } +class PackageWarningHelpText { + final String warningName; + final String shortHelp; + List longHelp; + final PackageWarning warning; + + PackageWarningHelpText(this.warning, this.warningName, this.shortHelp, [this.longHelp]) { + if (this.longHelp == null) this.longHelp = []; + } +} + /// Provides description text and command line flags for warnings. /// TODO(jcollins-g): Actually use this for command line flags. -Map> packageWarningText = { - PackageWarning.ambiguousDocReference: [ - "ambiguous-doc-reference", - "A comment reference could refer to two or more different objects" - ], - PackageWarning.ambiguousReexport: [ - "ambiguous-reexport", - "A symbol is exported from private to public in more than one place and dartdoc is forced to guess which one is canonical" - ], - PackageWarning.noCanonicalFound: [ - "no-canonical-found", - "A symbol is part of the public interface for this package, but no library documented with this package documents it so dartdoc can not link to it" - ], - PackageWarning.noLibraryLevelDocs: [ - "no-library-level-docs", - "There are no library level docs for this library" - ], - PackageWarning.categoryOrderGivesMissingPackageName: [ - "category-order-gives-missing-package-name", - "The category-order flag on the command line was given the name of a nonexistent package" - ], - PackageWarning.unresolvedDocReference: [ - "unresolved-doc-reference", - "A comment reference could not be found in parameters, enclosing class, enclosing library, or at the top level of any documented library with the package" - ], - PackageWarning.brokenLink: [ - "brokenLink", - "Dartdoc generated a link to a non-existent file" - ], - PackageWarning.orphanedFile: [ - "orphanedFile", - "Dartdoc generated files that are unreachable from the index" - ], - PackageWarning.unknownFile: [ - "unknownFile", - "A leftover file exists in the tree that dartdoc did not write in this pass" - ], - PackageWarning.typeAsHtml: [ - "typeAsHtml", - "Use of <> in a comment for type parameters is being treated as HTML by markdown" - ], +Map packageWarningText = { + PackageWarning.ambiguousDocReference: new PackageWarningHelpText( + PackageWarning.ambiguousDocReference, + "ambiguous-doc-reference", + "A comment reference could refer to two or more different objects"), + PackageWarning.ambiguousReexport: new PackageWarningHelpText( + PackageWarning.ambiguousReexport, + "ambiguous-reexport", + "A symbol is exported from private to public in more than one place and dartdoc must guess which one is canonical", + ["Use {@canonicalFor library.name} in the symbol's documentation to resolve", + "the ambiguity and/or override dartdoc's decision, or structure your package", + "so the reexport is less ambiguous.", + "The flag --ambiguous-reexport-scorer-min-confidence allows you to set the", + "threshold at which this warning will appear."]), + PackageWarning.ignoredCanonicalFor: new PackageWarningHelpText( + PackageWarning.ignoredCanonicalFor, + "ignored-canonical-for", + "A @canonicalFor tag refers to a library which this symbol can not be canonical for"), + PackageWarning.noCanonicalFound: new PackageWarningHelpText( + PackageWarning.noCanonicalFound, + "no-canonical-found", + "A symbol is part of the public interface for this package, but no library documented with this package documents it so dartdoc can not link to it"), + PackageWarning.noLibraryLevelDocs: new PackageWarningHelpText( + PackageWarning.noLibraryLevelDocs, + "no-library-level-docs", + "There are no library level docs for this library"), + PackageWarning.categoryOrderGivesMissingPackageName: new PackageWarningHelpText( + PackageWarning.categoryOrderGivesMissingPackageName, + "category-order-gives-missing-package-name", + "The category-order flag on the command line was given the name of a nonexistent package"), + PackageWarning.unresolvedDocReference: new PackageWarningHelpText( + PackageWarning.unresolvedDocReference, + "unresolved-doc-reference", + "A comment reference could not be found in parameters, enclosing class, enclosing library, or at the top level of any documented library with the package"), + PackageWarning.brokenLink: new PackageWarningHelpText( + PackageWarning.brokenLink, + "brokenLink", + "Dartdoc generated a link to a non-existent file"), + PackageWarning.orphanedFile: new PackageWarningHelpText( + PackageWarning.orphanedFile, + "orphanedFile", + "Dartdoc generated files that are unreachable from the index"), + PackageWarning.unknownFile: new PackageWarningHelpText( + PackageWarning.unknownFile, + "unknownFile", + "A leftover file exists in the tree that dartdoc did not write in this pass"), + PackageWarning.typeAsHtml: new PackageWarningHelpText( + PackageWarning.typeAsHtml, + "typeAsHtml", + "Use of <> in a comment for type parameters is being treated as HTML by markdown"), }; /// Something that package warnings can be called on. @@ -3043,7 +3070,15 @@ class PackageWarningCounter { } else { if (options.asErrors.contains(kind)) toWrite = "error: ${fullMessage}"; } - if (toWrite != null) stderr.write("\n ${toWrite}"); + if (toWrite != null) { + stderr.write("\n ${toWrite}"); + if (_warningCounts[kind] == 1 && config.verboseWarnings && packageWarningText[kind].longHelp.isNotEmpty) { + // First time we've seen this warning. Give a little extra info. + String separator = '\n '; + stderr.write(separator); + stderr.write(packageWarningText[kind].longHelp.join(separator)); + } + } } /// Returns true if we've already warned for this. @@ -3171,8 +3206,8 @@ class Package implements Nameable, Documentable { PackageWarningCounter get packageWarningCounter => _packageWarningCounter; @override - void warn(PackageWarning kind, {String message, Locatable referredFrom}) { - warnOnElement(this, kind, message: message, referredFrom: referredFrom); + void warn(PackageWarning kind, {String message, Locatable referredFrom, List extendedDebug}) { + warnOnElement(this, kind, message: message, referredFrom: referredFrom, extendedDebug: extendedDebug); } /// Returns colon-stripped name and location of the given locatable. @@ -3187,7 +3222,7 @@ class Package implements Nameable, Documentable { } void warnOnElement(Warnable warnable, PackageWarning kind, - {String message, Locatable referredFrom}) { + {String message, Locatable referredFrom, List extendedDebug}) { if (warnable != null) { // This sort of warning is only applicable to top level elements. if (warnable is Accessor) { @@ -3228,8 +3263,6 @@ class Package implements Nameable, Documentable { // Fix these warnings by adding the original library exporting the // symbol with --include, by using --auto-include-dependencies, // or by using --exclude to hide one of the libraries involved - // TODO(jcollins-g): add a dartdoc flag to force a particular resolution - // order for (or drop) ambiguous reexports warningMessage = "ambiguous reexport of ${name}, canonicalization candidates: ${message}"; break; @@ -3240,6 +3273,10 @@ class Package implements Nameable, Documentable { case PackageWarning.ambiguousDocReference: warningMessage = "ambiguous doc reference ${message}"; break; + case PackageWarning.ignoredCanonicalFor: + warningMessage = + "${warnable.fullyQualifiedName} says it is {@canonicalFor ${message}}, but is not exported there"; + break; case PackageWarning.categoryOrderGivesMissingPackageName: warningMessage = "--category-order gives invalid package name: '${message}'"; @@ -3276,6 +3313,8 @@ class Package implements Nameable, Documentable { messageParts.add( "${referredFromPrefix} ${referredFromStrings.item1}: ${referredFromStrings.item2}"); } + if (config.verboseWarnings && extendedDebug != null) + messageParts.addAll(extendedDebug.map((s) => " $s")); String fullMessage; if (messageParts.length <= 2) { fullMessage = messageParts.join(', '); From 5fa4ca1a45dd8e6b6760ea6d137245e6f04f7291 Mon Sep 17 00:00:00 2001 From: Janice Collins Date: Fri, 2 Jun 2017 13:06:58 -0700 Subject: [PATCH 05/19] intermediate state -- autoinclude deps broken --- lib/src/markdown_processor.dart | 1 - lib/src/model.dart | 109 +++++++++++++++++++++----------- 2 files changed, 72 insertions(+), 38 deletions(-) diff --git a/lib/src/markdown_processor.dart b/lib/src/markdown_processor.dart index 5636a62760..7147c199ef 100644 --- a/lib/src/markdown_processor.dart +++ b/lib/src/markdown_processor.dart @@ -6,7 +6,6 @@ library dartdoc.markdown_processor; import 'dart:convert'; -import 'dart:io'; import 'dart:math'; import 'package:analyzer/dart/ast/ast.dart'; diff --git a/lib/src/model.dart b/lib/src/model.dart index 1376bbbd14..d9cf5b0b9a 100644 --- a/lib/src/model.dart +++ b/lib/src/model.dart @@ -1301,6 +1301,23 @@ class Library extends ModelElement { new NamespaceBuilder().createExportNamespaceForLibrary(element); } + List _allOriginalModelElementNames; + /// [allModelElements] resolved to their original names. + /// + /// A collection of [ModelElement.fullyQualifiedNames] for [ModelElement]s + /// documented with this library, but these ModelElements and names correspond + /// to the defining library where each originally came from with respect + /// to inheritance and reexporting. Most useful for error reporting. + Iterable get allOriginalModelElementNames { + if (_allOriginalModelElementNames == null) { + _allOriginalModelElementNames = allModelElements.map((e) { + return new ModelElement.from( + e.element, package.findOrCreateLibraryFor(e.element)).fullyQualifiedName; + }).toList(); + } + return _allOriginalModelElementNames; + } + List get allClasses => _allClasses; List get classes { @@ -1316,31 +1333,49 @@ class Library extends ModelElement { String get dirName => name.replaceAll(':', '-'); - Set canonicalFor = new Set(); + Set _canonicalFor; + + Set get canonicalFor { + if (_canonicalFor == null) { + // TODO(jcollins-g): restructure to avoid using side effects. + documentation; + } + return _canonicalFor; + } + + /// Hide canonicalFor from doc while leaving a note to ourselves to /// help with ambiguous canonicalization determination. /// /// Example: - /// - /// {@canonicalFor angular2.common} + /// {@canonicalFor libname.ClassName} String _setCanonicalFor(String rawDocs) { + if (_canonicalFor == null) { + _canonicalFor = new Set(); + } + Set notFoundInAllModelElements = new Set(); final canonicalRegExp = new RegExp(r'{@canonicalFor\s([^}]+)}'); - rawDocs.replaceAllMapped(canonicalRegExp, (Match match) { + rawDocs = rawDocs.replaceAllMapped(canonicalRegExp, (Match match) { canonicalFor.add(match.group(1)); - if (match.group(1)) + notFoundInAllModelElements.add(match.group(1)); return ''; }); + if (notFoundInAllModelElements.isNotEmpty) { + notFoundInAllModelElements.removeAll(allOriginalModelElementNames); + } + for (String notFound in notFoundInAllModelElements) { + warn(PackageWarning.ignoredCanonicalFor, message: notFound); + } return rawDocs; } - @override - String _rawDocs; + String _libraryDocs; @override String get documentation { - if (_rawDocs == null) { - _rawDocs = _setCanonicalFor(super.documentation); + if (_libraryDocs == null) { + _libraryDocs = _setCanonicalFor(super.documentation); } - return _rawDocs; + return _libraryDocs; } /// Libraries are not enclosed by anything. @@ -1994,10 +2029,12 @@ abstract class ModelElement implements Comparable, Nameable, Documentable { if (package.namePieces.intersection(lib.namePieces).length > 0) { scoredCandidate.alterScore(1.0, 'embeds package name'); } - // Give a tiny boost for libraries with long names. + // Give a tiny boost for libraries with long names, assuming they're + // more specific (and therefore more likely to be the owner of this symbol). scoredCandidate.alterScore(.01 * lib.namePieces.length, 'name is long'); // If we don't know the location of this element, return our best guess. // TODO(jcollins-g): is that even possible? + assert(!locationPieces.isEmpty); if (locationPieces.isEmpty) return scoredCandidate; // The more pieces we have of the location in our library name, the more we should boost our score. scoredCandidate.alterScore(lib.namePieces.intersection(locationPieces).length.toDouble() / locationPieces.length.toDouble(), 'element location shares parts with name'); @@ -2154,14 +2191,6 @@ abstract class ModelElement implements Comparable, Nameable, Documentable { // Start with our top-level element. ModelElement warnable = new ModelElement.from( topLevelElement, package.findOrCreateLibraryFor(topLevelElement)); - // Validate that the user didn't ask us to do something impossible. - if (preferredCanonicalLibrary != null) { - List names = candidateLibraries.map((l) => l.name).toList(); - if (!names.contains(preferredCanonicalLibrary)) { - warnable.warn(PackageWarning.ignoredCanonicalFor, message: preferredCanonicalLibrary, - extendedDebug: ["canonicalization candidates: ($names)"]); - } - } if (candidateLibraries.length > 1) { // Heuristic scoring to determine which library a human likely // considers this element to be primarily 'from', and therefore, @@ -2958,10 +2987,12 @@ Map packageWarningText = { PackageWarning.ambiguousReexport: new PackageWarningHelpText( PackageWarning.ambiguousReexport, "ambiguous-reexport", - "A symbol is exported from private to public in more than one place and dartdoc must guess which one is canonical", - ["Use {@canonicalFor library.name} in the symbol's documentation to resolve", - "the ambiguity and/or override dartdoc's decision, or structure your package", - "so the reexport is less ambiguous.", + "A symbol is exported from private to public in more than one library and dartdoc can not determine which one is canonical", + ["Use {@canonicalFor @@name@@} in the desired library's documentation to resolve", + "the ambiguity and/or override dartdoc's decision, or structure your package ", + "so the reexport is less ambiguous. The symbol will still be referenced in ", + "all candidates -- this only controls the location where it will be written ", + "and which library will be displayed in navigation for the relevant pages.", "The flag --ambiguous-reexport-scorer-min-confidence allows you to set the", "threshold at which this warning will appear."]), PackageWarning.ignoredCanonicalFor: new PackageWarningHelpText( @@ -3080,7 +3111,7 @@ class PackageWarningCounter { PackageWarningCounter(this.options); /// Actually write out the warning. Assumes it is already counted with add. - void _writeWarning(PackageWarning kind, String fullMessage) { + void _writeWarning(PackageWarning kind, String name, String fullMessage) { if (options.ignoreWarnings.contains(kind)) return; String toWrite; if (!options.asErrors.contains(kind)) { @@ -3093,33 +3124,35 @@ class PackageWarningCounter { stderr.write("\n ${toWrite}"); if (_warningCounts[kind] == 1 && config.verboseWarnings && packageWarningText[kind].longHelp.isNotEmpty) { // First time we've seen this warning. Give a little extra info. - String separator = '\n '; - stderr.write(separator); - stderr.write(packageWarningText[kind].longHelp.join(separator)); + final String separator = '\n '; + final String nameSub = r'@@name@@'; + String verboseOut = '$separator${packageWarningText[kind].longHelp.join(separator)}'; + verboseOut = verboseOut.replaceAll(nameSub, name); + stderr.write(verboseOut); } } } /// Returns true if we've already warned for this. - bool hasWarning(Element element, PackageWarning kind, String message) { + bool hasWarning(Warnable element, PackageWarning kind, String message) { Tuple2 warningData = new Tuple2(kind, message); - if (_countedWarnings.containsKey(element)) { - return _countedWarnings[element].contains(warningData); + if (_countedWarnings.containsKey(element?.element)) { + return _countedWarnings[element?.element].contains(warningData); } return false; } /// Adds the warning to the counter, and writes out the fullMessage string /// if configured to do so. - void addWarning(Element element, PackageWarning kind, String message, + void addWarning(Warnable element, PackageWarning kind, String message, String fullMessage) { assert(!hasWarning(element, kind, message)); Tuple2 warningData = new Tuple2(kind, message); _warningCounts.putIfAbsent(kind, () => 0); _warningCounts[kind] += 1; - _countedWarnings.putIfAbsent(element, () => new Set()); - _countedWarnings[element].add(warningData); - _writeWarning(kind, fullMessage); + _countedWarnings.putIfAbsent(element?.element, () => new Set()); + _countedWarnings[element?.element].add(warningData); + _writeWarning(kind, element?.fullyQualifiedName, fullMessage); } int get errorCount { @@ -3257,7 +3290,7 @@ class Package implements Nameable, Documentable { // If we don't have an element, we need a message to disambiguate. assert(message != null); } - if (_packageWarningCounter.hasWarning(warnable?.element, kind, message)) { + if (_packageWarningCounter.hasWarning(warnable, kind, message)) { return; } // Elements that are part of the Dart SDK can have colons in their FQNs. @@ -3297,7 +3330,7 @@ class Package implements Nameable, Documentable { break; case PackageWarning.ignoredCanonicalFor: warningMessage = - "${warnable.fullyQualifiedName} says it is {@canonicalFor ${message}}, but is not exported there"; + "library says it is {@canonicalFor ${message}} but ${message} is not exported there"; break; case PackageWarning.categoryOrderGivesMissingPackageName: warningMessage = @@ -3351,7 +3384,7 @@ class Package implements Nameable, Documentable { } packageWarningCounter.addWarning( - warnable?.element, kind, message, fullMessage); + warnable, kind, message, fullMessage); } Set get namePieces { @@ -3703,6 +3736,8 @@ class Package implements Nameable, Documentable { /// a documentation entry point (for elements that have no Library within the /// set of canonical Libraries). Library findOrCreateLibraryFor(Element e) { + if (e == null) + 1+1; // This is just a cache to avoid creating lots of libraries over and over. if (_allLibraries.containsKey(e.library)) { return _allLibraries[e.library]; From 4dedc213028f00726f23d7cd501da1c14bae7589 Mon Sep 17 00:00:00 2001 From: Janice Collins Date: Fri, 2 Jun 2017 14:59:16 -0700 Subject: [PATCH 06/19] intermediate: tests written and working --- lib/src/model.dart | 52 +++++++++++++++++----- test/dartdoc_test.dart | 4 +- test/model_test.dart | 51 +++++++++++++++++++-- test/src/utils.dart | 7 ++- testing/test_package/lib/reexport_one.dart | 5 +++ testing/test_package/lib/reexport_two.dart | 6 +++ testing/test_package/lib/src/somelib.dart | 6 +++ 7 files changed, 114 insertions(+), 17 deletions(-) create mode 100644 testing/test_package/lib/reexport_one.dart create mode 100644 testing/test_package/lib/reexport_two.dart create mode 100644 testing/test_package/lib/src/somelib.dart diff --git a/lib/src/model.dart b/lib/src/model.dart index d9cf5b0b9a..86d5f04594 100644 --- a/lib/src/model.dart +++ b/lib/src/model.dart @@ -25,6 +25,7 @@ import 'package:analyzer/src/generated/resolver.dart' import 'package:analyzer/src/generated/utilities_dart.dart' show ParameterKind; import 'package:analyzer/src/dart/element/member.dart' show Member; import 'package:collection/collection.dart'; +import 'package:meta/meta.dart'; import 'package:path/path.dart' as p; import 'package:tuple/tuple.dart'; @@ -2168,7 +2169,7 @@ abstract class ModelElement implements Comparable, Nameable, Documentable { // Since we're looking for a library, find the [Element] immediately // contained by a [CompilationUnitElement] in the tree. Element topLevelElement = element; - while (topLevelElement != null && + while (topLevelElement != null && topLevelElement is! LibraryElement && topLevelElement.enclosingElement is! CompilationUnitElement) { topLevelElement = topLevelElement.enclosingElement; } @@ -2204,7 +2205,7 @@ abstract class ModelElement implements Comparable, Nameable, Documentable { List debugLines = []; debugLines.addAll(scoredCandidates.map((s) => '${s.toString()}')); - if (confidence < config.reexportMinConfidence) { + if (config == null || confidence < config.reexportMinConfidence) { warnable.warn(PackageWarning.ambiguousReexport, message: message, extendedDebug: debugLines); } } @@ -3060,6 +3061,8 @@ class PackageWarningOptions { final Set _asWarnings = new Set(); final Set _asErrors = new Set(); + bool autoFlush = true; + Set get ignoreWarnings => _ignoreWarnings; Set get asWarnings => _asWarnings; Set get asErrors => _asErrors; @@ -3108,8 +3111,21 @@ class PackageWarningCounter { final Map _warningCounts = new Map(); final PackageWarningOptions options; + StringBuffer buffer = new StringBuffer(); + PackageWarningCounter(this.options); + /// Flush to stderr, but only if [options.autoFlush] is true. + /// + /// We keep a buffer because under certain conditions (--auto-include-dependencies) + /// warnings here might be duplicated across multiple Package constructions. + void maybeFlush() { + if (options.autoFlush) { + stderr.write(buffer.toString()); + buffer = new StringBuffer(); + } + } + /// Actually write out the warning. Assumes it is already counted with add. void _writeWarning(PackageWarning kind, String name, String fullMessage) { if (options.ignoreWarnings.contains(kind)) return; @@ -3121,16 +3137,17 @@ class PackageWarningCounter { if (options.asErrors.contains(kind)) toWrite = "error: ${fullMessage}"; } if (toWrite != null) { - stderr.write("\n ${toWrite}"); + buffer.write("\n ${toWrite}"); if (_warningCounts[kind] == 1 && config.verboseWarnings && packageWarningText[kind].longHelp.isNotEmpty) { // First time we've seen this warning. Give a little extra info. final String separator = '\n '; final String nameSub = r'@@name@@'; String verboseOut = '$separator${packageWarningText[kind].longHelp.join(separator)}'; verboseOut = verboseOut.replaceAll(nameSub, name); - stderr.write(verboseOut); + buffer.write(verboseOut); } } + maybeFlush(); } /// Returns true if we've already warned for this. @@ -3182,12 +3199,16 @@ class PackageWarningCounter { class Package implements Nameable, Documentable { // Library objects serving as entry points for documentation. final List _libraries = []; + // All library objects related to this package; a superset of _libraries. - final Map _allLibraries = new Map(); + @visibleForTesting + final Map allLibraries = new Map(); // Objects to keep track of warnings. final PackageWarningOptions _packageWarningOptions; + PackageWarningCounter _packageWarningCounter; + // All ModelElements constructed for this package; a superset of allModelElements. final Map, ModelElement> _allConstructedModelElements = new Map(); @@ -3221,14 +3242,14 @@ class Package implements Nameable, Documentable { Package(Iterable libraryElements, this.packageMeta, this._packageWarningOptions) { assert(_allConstructedModelElements.isEmpty); - assert(_allLibraries.isEmpty); + assert(allLibraries.isEmpty); _packageWarningCounter = new PackageWarningCounter(_packageWarningOptions); libraryElements.forEach((element) { // add only if the element should be included in the public api if (isPublic(element)) { var lib = new Library._(element, this); _libraries.add(lib); - _allLibraries[element] = lib; + allLibraries[element] = lib; assert(!_elementToLibrary.containsKey(lib.element)); _elementToLibrary[element] = lib; } @@ -3249,6 +3270,12 @@ class Package implements Nameable, Documentable { @override String get elementLocation => '(top level package)'; + /// Flush out any warnings we might have collected while + /// [_packageWarningOptions.autoFlush] was false. + void flushWarnings() { + _packageWarningCounter.maybeFlush(); + } + @override Tuple2 get lineAndColumn => null; @@ -3397,6 +3424,7 @@ class Package implements Nameable, Documentable { PackageMeta packageMeta, PackageWarningOptions options) { var startLength = libraryElements.length; + options.autoFlush = false; Package package = new Package(libraryElements, packageMeta, options); // TODO(jcollins-g): this is inefficient; keep track of modelElements better @@ -3417,8 +3445,10 @@ class Package implements Nameable, Documentable { }); if (libraryElements.length > startLength) - return _withAutoIncludedDependencies( + package = _withAutoIncludedDependencies( libraryElements, packageMeta, options); + options.autoFlush = true; + package.flushWarnings; return package; } @@ -3739,8 +3769,8 @@ class Package implements Nameable, Documentable { if (e == null) 1+1; // This is just a cache to avoid creating lots of libraries over and over. - if (_allLibraries.containsKey(e.library)) { - return _allLibraries[e.library]; + if (allLibraries.containsKey(e.library)) { + return allLibraries[e.library]; } // can be null if e is for dynamic if (e.library == null) { @@ -3750,7 +3780,7 @@ class Package implements Nameable, Documentable { if (foundLibrary == null) { foundLibrary = new Library._(e.library, this); - _allLibraries[e.library] = foundLibrary; + allLibraries[e.library] = foundLibrary; } return foundLibrary; } diff --git a/test/dartdoc_test.dart b/test/dartdoc_test.dart index 7f1ad4c495..a663ea77cc 100644 --- a/test/dartdoc_test.dart +++ b/test/dartdoc_test.dart @@ -39,7 +39,7 @@ void main() { Package p = results.package; expect(p.name, 'test_package'); expect(p.hasDocumentationFile, isTrue); - expect(p.libraries, hasLength(8)); + expect(p.libraries, hasLength(10)); }); test('generate docs for ${path.basename(testPackageBadDir.path)} fails', @@ -96,7 +96,7 @@ void main() { Package p = results.package; expect(p.name, 'test_package'); expect(p.hasDocumentationFile, isTrue); - expect(p.libraries, hasLength(7)); + expect(p.libraries, hasLength(9)); expect(p.libraries.map((lib) => lib.name).contains('fake'), isFalse); }); diff --git a/test/model_test.dart b/test/model_test.dart index cd4d5cbb82..33f7b4b9ba 100644 --- a/test/model_test.dart +++ b/test/model_test.dart @@ -51,7 +51,7 @@ void main() { }); test('libraries', () { - expect(package.libraries, hasLength(6)); + expect(package.libraries, hasLength(8)); }); test('categories', () { @@ -59,7 +59,7 @@ void main() { PackageCategory category = package.categories.first; expect(category.name, 'test_package'); - expect(category.libraries, hasLength(6)); + expect(category.libraries, hasLength(8)); }); test('multiple categories, sorted default', () { @@ -125,7 +125,8 @@ void main() { }); group('Library', () { - Library dartAsyncLib, anonLib, isDeprecated; + Library dartAsyncLib, anonLib, isDeprecated, someLib, reexportOneLib, reexportTwoLib; + Class SomeClass, SomeOtherClass, YetAnotherClass, AUnicornClass; setUp(() { dartAsyncLib = new Library( @@ -136,6 +137,17 @@ void main() { anonLib = package.libraries .firstWhere((lib) => lib.name == 'anonymous_library'); + someLib = package.allLibraries.values + .firstWhere((lib) => lib.name == 'reexport.somelib'); + reexportOneLib = package.libraries + .firstWhere((lib) => lib.name == 'reexport_one'); + reexportTwoLib = package.libraries + .firstWhere((lib) => lib.name == 'reexport_two'); + SomeClass = someLib.getClassByName('SomeClass'); + SomeOtherClass = someLib.getClassByName('SomeOtherClass'); + YetAnotherClass = someLib.getClassByName('YetAnotherClass'); + AUnicornClass = someLib.getClassByName('AUnicornClass'); + isDeprecated = package.libraries.firstWhere((lib) => lib.name == 'is_deprecated'); @@ -218,6 +230,39 @@ void main() { test('anonymous lib', () { expect(anonLib.isAnonymous, isTrue); }); + + test('with ambiguous reexport warnings', () { + final warningMsg = '(reexport_one, reexport_two) -> reexport_two (confidence 0.000)'; + // Unicorn class has a warning because two @canonicalFors cancel each other out. + expect(package.packageWarningCounter.hasWarning( + AUnicornClass, + PackageWarning.ambiguousReexport, + warningMsg), isTrue); + // This class is ambiguous without a @canonicalFor + expect(package.packageWarningCounter.hasWarning( + YetAnotherClass, + PackageWarning.ambiguousReexport, + warningMsg), isTrue); + // These two classes have a @canonicalFor + expect(package.packageWarningCounter.hasWarning( + SomeClass, + PackageWarning.ambiguousReexport, + warningMsg), isFalse); + expect(package.packageWarningCounter.hasWarning( + SomeOtherClass, + PackageWarning.ambiguousReexport, + warningMsg), isFalse); + // This library has a canonicalFor with no corresponding item + expect(package.packageWarningCounter.hasWarning( + reexportTwoLib, + PackageWarning.ignoredCanonicalFor, + 'something.ThatDoesntExist'), isTrue); + }); + + test('@canonicalFor directive works', () { + expect(SomeOtherClass.canonicalLibrary, equals(reexportOneLib)); + expect(SomeClass.canonicalLibrary, equals(reexportOneLib)); + }); }); group('Macros', () { diff --git a/test/src/utils.dart b/test/src/utils.dart index 9280211018..5d9c8baa9f 100644 --- a/test/src/utils.dart +++ b/test/src/utils.dart @@ -14,6 +14,7 @@ import 'package:analyzer/src/generated/engine.dart'; import 'package:analyzer/src/generated/java_io.dart'; import 'package:analyzer/src/generated/sdk.dart'; import 'package:analyzer/src/generated/source_io.dart'; +import 'package:dartdoc/src/config.dart'; import 'package:dartdoc/src/model.dart'; import 'package:dartdoc/src/package_meta.dart'; import 'package:dartdoc/src/sdk.dart'; @@ -41,6 +42,8 @@ void init() { sdkDir = new FolderBasedDartSdk( resourceProvider, resourceProvider.getFolder(getSdkDir().path)); + setConfig(); + analyzerHelper = new AnalyzerHelper(); var pathsForTestLib = [ 'lib/example.dart', @@ -48,7 +51,9 @@ void init() { 'lib/fake.dart', 'lib/anonymous_library.dart', 'lib/another_anonymous_lib.dart', - 'lib/is_deprecated.dart' + 'lib/is_deprecated.dart', + 'lib/reexport_one.dart', + 'lib/reexport_two.dart', ]; testPackage = _bootPackage(pathsForTestLib, 'testing/test_package', false); diff --git a/testing/test_package/lib/reexport_one.dart b/testing/test_package/lib/reexport_one.dart new file mode 100644 index 0000000000..609d2986b3 --- /dev/null +++ b/testing/test_package/lib/reexport_one.dart @@ -0,0 +1,5 @@ +/// {@canonicalFor reexport.somelib.SomeOtherClass} +/// {@canonicalFor reexport.somelib.AUnicornClass} +library reexport_one; + +export 'src/somelib.dart'; diff --git a/testing/test_package/lib/reexport_two.dart b/testing/test_package/lib/reexport_two.dart new file mode 100644 index 0000000000..d8fbd053e2 --- /dev/null +++ b/testing/test_package/lib/reexport_two.dart @@ -0,0 +1,6 @@ +/// {@canonicalFor reexport.somelib.SomeClass} +/// {@canonicalFor reexport.somelib.AUnicornClass} +/// {@canonicalFor something.ThatDoesntExist} +library reexport_two; + +export 'src/somelib.dart'; diff --git a/testing/test_package/lib/src/somelib.dart b/testing/test_package/lib/src/somelib.dart new file mode 100644 index 0000000000..e5ab132ef6 --- /dev/null +++ b/testing/test_package/lib/src/somelib.dart @@ -0,0 +1,6 @@ +library reexport.somelib; + +class SomeClass {} +class SomeOtherClass {} +class YetAnotherClass {} +class AUnicornClass {} From 7d307a946281c246263b45df7a8eb5218241c92d Mon Sep 17 00:00:00 2001 From: Janice Collins Date: Fri, 2 Jun 2017 14:59:45 -0700 Subject: [PATCH 07/19] test really works now. --- test/model_test.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/model_test.dart b/test/model_test.dart index 33f7b4b9ba..06b09e388a 100644 --- a/test/model_test.dart +++ b/test/model_test.dart @@ -261,7 +261,7 @@ void main() { test('@canonicalFor directive works', () { expect(SomeOtherClass.canonicalLibrary, equals(reexportOneLib)); - expect(SomeClass.canonicalLibrary, equals(reexportOneLib)); + expect(SomeClass.canonicalLibrary, equals(reexportTwoLib)); }); }); From 899eb1526166c967763f0f9ffabc148a94050b07 Mon Sep 17 00:00:00 2001 From: Janice Collins Date: Fri, 2 Jun 2017 15:01:50 -0700 Subject: [PATCH 08/19] regen test docs --- .../anonymous_library-library.html | 3 + .../another_anonymous_lib-library.html | 3 + .../code_in_comments-library.html | 3 + .../test_package_docs/css/css-library.html | 3 + .../test_package_docs/ex/Animal-class.html | 2 +- testing/test_package_docs/ex/Apple-class.html | 4 +- .../ex/Apple/paramFromExportLib.html | 2 +- testing/test_package_docs/ex/B-class.html | 4 +- .../test_package_docs/ex/COLOR-constant.html | 2 +- .../ex/COLOR_GREEN-constant.html | 2 +- .../ex/COLOR_ORANGE-constant.html | 2 +- .../ex/COMPLEX_COLOR-constant.html | 2 +- testing/test_package_docs/ex/Cat-class.html | 2 +- .../test_package_docs/ex/CatString-class.html | 2 +- .../ex/ConstantCat-class.html | 2 +- .../ex/Deprecated-class.html | 2 +- testing/test_package_docs/ex/Dog-class.html | 2 +- testing/test_package_docs/ex/E-class.html | 2 +- testing/test_package_docs/ex/F-class.html | 2 +- .../ex/ForAnnotation-class.html | 2 +- .../ex/HasAnnotation-class.html | 2 +- .../test_package_docs/ex/Helper-class.html | 267 --------- .../test_package_docs/ex/Helper/Helper.html | 122 ----- .../ex/Helper/getContents.html | 121 ---- .../test_package_docs/ex/Helper/hashCode.html | 150 ----- .../ex/Helper/noSuchMethod.html | 127 ----- .../ex/Helper/operator_equals.html | 141 ----- .../ex/Helper/runtimeType.html | 129 ----- .../test_package_docs/ex/Helper/toString.html | 124 ----- testing/test_package_docs/ex/Klass-class.html | 2 +- .../test_package_docs/ex/MY_CAT-constant.html | 2 +- .../test_package_docs/ex/MyError-class.html | 2 +- .../ex/MyErrorImplements-class.html | 2 +- .../ex/MyException-class.html | 2 +- .../ex/MyExceptionImplements-class.html | 2 +- .../ex/PRETTY_COLORS-constant.html | 2 +- .../ex/ParameterizedTypedef.html | 2 +- .../PublicClassExtendsPrivateClass-class.html | 2 +- ...ClassImplementsPrivateInterface-class.html | 2 +- .../test_package_docs/ex/ShapeType-class.html | 2 +- .../ex/SpecializedDuration-class.html | 2 +- .../ex/WithGeneric-class.html | 2 +- .../ex/WithGenericSub-class.html | 2 +- .../ex/aThingToDo-class.html | 2 +- .../ex/deprecated-constant.html | 2 +- .../test_package_docs/ex/deprecatedField.html | 2 +- .../ex/deprecatedGetter.html | 2 +- .../ex/deprecatedSetter.html | 2 +- testing/test_package_docs/ex/ex-library.html | 7 +- testing/test_package_docs/ex/function1.html | 2 +- .../test_package_docs/ex/genericFunction.html | 2 +- .../ex/incorrectDocReference-constant.html | 2 +- .../incorrectDocReferenceFromEx-constant.html | 2 +- testing/test_package_docs/ex/number.html | 2 +- .../test_package_docs/ex/processMessage.html | 2 +- testing/test_package_docs/ex/y.html | 2 +- .../test_package_docs/fake/fake-library.html | 3 + testing/test_package_docs/index.html | 21 + testing/test_package_docs/index.json | 516 +++++++++++++++--- .../is_deprecated/is_deprecated-library.html | 3 + .../test_package_imported.main-library.html | 3 + .../two_exports/two_exports-library.html | 3 + 62 files changed, 523 insertions(+), 1316 deletions(-) delete mode 100644 testing/test_package_docs/ex/Helper-class.html delete mode 100644 testing/test_package_docs/ex/Helper/Helper.html delete mode 100644 testing/test_package_docs/ex/Helper/getContents.html delete mode 100644 testing/test_package_docs/ex/Helper/hashCode.html delete mode 100644 testing/test_package_docs/ex/Helper/noSuchMethod.html delete mode 100644 testing/test_package_docs/ex/Helper/operator_equals.html delete mode 100644 testing/test_package_docs/ex/Helper/runtimeType.html delete mode 100644 testing/test_package_docs/ex/Helper/toString.html diff --git a/testing/test_package_docs/anonymous_library/anonymous_library-library.html b/testing/test_package_docs/anonymous_library/anonymous_library-library.html index 7c13597a71..22a3614894 100644 --- a/testing/test_package_docs/anonymous_library/anonymous_library-library.html +++ b/testing/test_package_docs/anonymous_library/anonymous_library-library.html @@ -56,6 +56,9 @@
package test_package
  • ex
  • fake
  • is_deprecated
  • +
  • reexport_one
  • +
  • reexport_two
  • +
  • src.mylib
  • test_package_imported.main
  • two_exports
  • diff --git a/testing/test_package_docs/another_anonymous_lib/another_anonymous_lib-library.html b/testing/test_package_docs/another_anonymous_lib/another_anonymous_lib-library.html index 925d9025eb..1e55fdf112 100644 --- a/testing/test_package_docs/another_anonymous_lib/another_anonymous_lib-library.html +++ b/testing/test_package_docs/another_anonymous_lib/another_anonymous_lib-library.html @@ -56,6 +56,9 @@
    package test_package
  • ex
  • fake
  • is_deprecated
  • +
  • reexport_one
  • +
  • reexport_two
  • +
  • src.mylib
  • test_package_imported.main
  • two_exports
  • diff --git a/testing/test_package_docs/code_in_comments/code_in_comments-library.html b/testing/test_package_docs/code_in_comments/code_in_comments-library.html index 26c73bb202..fddbe82ccb 100644 --- a/testing/test_package_docs/code_in_comments/code_in_comments-library.html +++ b/testing/test_package_docs/code_in_comments/code_in_comments-library.html @@ -56,6 +56,9 @@
    package test_package
  • ex
  • fake
  • is_deprecated
  • +
  • reexport_one
  • +
  • reexport_two
  • +
  • src.mylib
  • test_package_imported.main
  • two_exports
  • diff --git a/testing/test_package_docs/css/css-library.html b/testing/test_package_docs/css/css-library.html index e7a9136fd1..3879d9aa17 100644 --- a/testing/test_package_docs/css/css-library.html +++ b/testing/test_package_docs/css/css-library.html @@ -56,6 +56,9 @@
    package test_package
  • ex
  • fake
  • is_deprecated
  • +
  • reexport_one
  • +
  • reexport_two
  • +
  • src.mylib
  • test_package_imported.main
  • two_exports
  • diff --git a/testing/test_package_docs/ex/Animal-class.html b/testing/test_package_docs/ex/Animal-class.html index 771c9365fa..0384ed2bf2 100644 --- a/testing/test_package_docs/ex/Animal-class.html +++ b/testing/test_package_docs/ex/Animal-class.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/Apple-class.html b/testing/test_package_docs/ex/Apple-class.html index a3590e5b7b..0a9dd798cd 100644 --- a/testing/test_package_docs/ex/Apple-class.html +++ b/testing/test_package_docs/ex/Apple-class.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • @@ -229,7 +229,7 @@

    Methods

    - paramFromExportLib(Helper helper) + paramFromExportLib(Helper helper) → void
    diff --git a/testing/test_package_docs/ex/Apple/paramFromExportLib.html b/testing/test_package_docs/ex/Apple/paramFromExportLib.html index ca36f453ba..67dd9ecebe 100644 --- a/testing/test_package_docs/ex/Apple/paramFromExportLib.html +++ b/testing/test_package_docs/ex/Apple/paramFromExportLib.html @@ -88,7 +88,7 @@
    class Apple
    void - paramFromExportLib(Helper helper) + paramFromExportLib(Helper helper)
    diff --git a/testing/test_package_docs/ex/B-class.html b/testing/test_package_docs/ex/B-class.html index 1213936452..b359ab2abb 100644 --- a/testing/test_package_docs/ex/B-class.html +++ b/testing/test_package_docs/ex/B-class.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • @@ -290,7 +290,7 @@

    Methods

    inherited
    - paramFromExportLib(Helper helper) + paramFromExportLib(Helper helper) → void
    diff --git a/testing/test_package_docs/ex/COLOR-constant.html b/testing/test_package_docs/ex/COLOR-constant.html index 95981eb87e..5275e1c36f 100644 --- a/testing/test_package_docs/ex/COLOR-constant.html +++ b/testing/test_package_docs/ex/COLOR-constant.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/COLOR_GREEN-constant.html b/testing/test_package_docs/ex/COLOR_GREEN-constant.html index 4572b14adb..ddbc695858 100644 --- a/testing/test_package_docs/ex/COLOR_GREEN-constant.html +++ b/testing/test_package_docs/ex/COLOR_GREEN-constant.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/COLOR_ORANGE-constant.html b/testing/test_package_docs/ex/COLOR_ORANGE-constant.html index 1fb700b099..a974c782ed 100644 --- a/testing/test_package_docs/ex/COLOR_ORANGE-constant.html +++ b/testing/test_package_docs/ex/COLOR_ORANGE-constant.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/COMPLEX_COLOR-constant.html b/testing/test_package_docs/ex/COMPLEX_COLOR-constant.html index 9735b3ec7a..8dfadf35cc 100644 --- a/testing/test_package_docs/ex/COMPLEX_COLOR-constant.html +++ b/testing/test_package_docs/ex/COMPLEX_COLOR-constant.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/Cat-class.html b/testing/test_package_docs/ex/Cat-class.html index 573b686196..553919e770 100644 --- a/testing/test_package_docs/ex/Cat-class.html +++ b/testing/test_package_docs/ex/Cat-class.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/CatString-class.html b/testing/test_package_docs/ex/CatString-class.html index f0ceeb50b8..12df3d3960 100644 --- a/testing/test_package_docs/ex/CatString-class.html +++ b/testing/test_package_docs/ex/CatString-class.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/ConstantCat-class.html b/testing/test_package_docs/ex/ConstantCat-class.html index 655f9688f4..37195654e1 100644 --- a/testing/test_package_docs/ex/ConstantCat-class.html +++ b/testing/test_package_docs/ex/ConstantCat-class.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/Deprecated-class.html b/testing/test_package_docs/ex/Deprecated-class.html index 4132707cef..489a2c8ab7 100644 --- a/testing/test_package_docs/ex/Deprecated-class.html +++ b/testing/test_package_docs/ex/Deprecated-class.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/Dog-class.html b/testing/test_package_docs/ex/Dog-class.html index cd4d90951f..5ccaff36ce 100644 --- a/testing/test_package_docs/ex/Dog-class.html +++ b/testing/test_package_docs/ex/Dog-class.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/E-class.html b/testing/test_package_docs/ex/E-class.html index 3190618016..8f86d78102 100644 --- a/testing/test_package_docs/ex/E-class.html +++ b/testing/test_package_docs/ex/E-class.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/F-class.html b/testing/test_package_docs/ex/F-class.html index cc2f50dc7f..6a6de82561 100644 --- a/testing/test_package_docs/ex/F-class.html +++ b/testing/test_package_docs/ex/F-class.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/ForAnnotation-class.html b/testing/test_package_docs/ex/ForAnnotation-class.html index 523cec56e8..b4643ccdfa 100644 --- a/testing/test_package_docs/ex/ForAnnotation-class.html +++ b/testing/test_package_docs/ex/ForAnnotation-class.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/HasAnnotation-class.html b/testing/test_package_docs/ex/HasAnnotation-class.html index ce8fde9d84..9d825ff805 100644 --- a/testing/test_package_docs/ex/HasAnnotation-class.html +++ b/testing/test_package_docs/ex/HasAnnotation-class.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/Helper-class.html b/testing/test_package_docs/ex/Helper-class.html deleted file mode 100644 index 0fbc22a325..0000000000 --- a/testing/test_package_docs/ex/Helper-class.html +++ /dev/null @@ -1,267 +0,0 @@ - - - - - - - - Helper class - ex library - Dart API - - - - - - - - - - - - - -
    - -
    - -
    - -
    -
    - - - -
    - -
    -

    Even unresolved references in the same library should be resolved -Apple -ex.B

    -
    - - -
    -

    Constructors

    - -
    -
    - Helper() -
    -
    - -
    -
    -
    - -
    -

    Properties

    - -
    -
    - hashCode - → int -
    -
    - The hash code for this object. -
    read-only, inherited
    -
    -
    - runtimeType - → Type -
    -
    - A representation of the runtime type of the object. -
    read-only, inherited
    -
    -
    -
    - -
    -

    Methods

    -
    -
    - getContents() - → String - -
    -
    - - -
    -
    - noSuchMethod(Invocation invocation) - → dynamic - -
    -
    - Invoked when a non-existent method or property is accessed. -
    inherited
    -
    -
    - toString() - → String - -
    -
    - Returns a string representation of this object. -
    inherited
    -
    -
    -
    - -
    -

    Operators

    -
    -
    - operator ==(other) - → bool - -
    -
    - The equality operator. -
    inherited
    -
    -
    -
    - - - - -
    - - - -
    -
    - -
    -
    -
    -

    - - test_package 0.0.1 - - • - - Dart - - • - - cc license - - -

    -
    -
    -
    - - - - - - - - - - - diff --git a/testing/test_package_docs/ex/Helper/Helper.html b/testing/test_package_docs/ex/Helper/Helper.html deleted file mode 100644 index 5a4550aea3..0000000000 --- a/testing/test_package_docs/ex/Helper/Helper.html +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - Helper constructor - Helper class - ex library - Dart API - - - - - - - - - - - - - -
    - -
    - -
    - -
    -
    - - - -
    -
    - - Helper() -
    - - - - -
    - - - -
    -
    - -
    -
    -
    -

    - - test_package 0.0.1 - - • - - Dart - - • - - cc license - - -

    -
    -
    -
    - - - - - - - - - - - diff --git a/testing/test_package_docs/ex/Helper/getContents.html b/testing/test_package_docs/ex/Helper/getContents.html deleted file mode 100644 index 3a164f65fc..0000000000 --- a/testing/test_package_docs/ex/Helper/getContents.html +++ /dev/null @@ -1,121 +0,0 @@ - - - - - - - - getContents method - Helper class - ex library - Dart API - - - - - - - - - - - - - -
    - -
    - -
    - -
    -
    - - - -
    -
    - String - getContents() -
    - - - -
    - - - -
    -
    - -
    -
    -
    -

    - - test_package 0.0.1 - - • - - Dart - - • - - cc license - - -

    -
    -
    -
    - - - - - - - - - - - diff --git a/testing/test_package_docs/ex/Helper/hashCode.html b/testing/test_package_docs/ex/Helper/hashCode.html deleted file mode 100644 index 16e8ae61c5..0000000000 --- a/testing/test_package_docs/ex/Helper/hashCode.html +++ /dev/null @@ -1,150 +0,0 @@ - - - - - - - - hashCode property - Helper class - ex library - Dart API - - - - - - - - - - - - - -
    - -
    - -
    - -
    -
    - - - -
    - - -
    - -
    - int - hashCode
    - -
    -

    The hash code for this object.

    -

    A hash code is a single integer which represents the state of the object -that affects == comparisons.

    -

    All objects have hash codes. -The default hash code represents only the identity of the object, -the same way as the default == implementation only considers objects -equal if they are identical (see identityHashCode).

    -

    If == is overridden to use the object state instead, -the hash code must also be changed to represent that state.

    -

    Hash codes must be the same for objects that are equal to each other -according to ==. -The hash code of an object should only change if the object changes -in a way that affects equality. -There are no further requirements for the hash codes. -They need not be consistent between executions of the same program -and there are no distribution guarantees.

    -

    Objects that are not equal are allowed to have the same hash code, -it is even technically allowed that all instances have the same hash code, -but if clashes happen too often, it may reduce the efficiency of hash-based -data structures like HashSet or HashMap.

    -

    If a subclass overrides hashCode, it should override the -== operator as well to maintain consistency.

    -
    -
    - - - -
    - - - -
    -
    - -
    -
    -
    -

    - - test_package 0.0.1 - - • - - Dart - - • - - cc license - - -

    -
    -
    -
    - - - - - - - - - - - diff --git a/testing/test_package_docs/ex/Helper/noSuchMethod.html b/testing/test_package_docs/ex/Helper/noSuchMethod.html deleted file mode 100644 index 616d815818..0000000000 --- a/testing/test_package_docs/ex/Helper/noSuchMethod.html +++ /dev/null @@ -1,127 +0,0 @@ - - - - - - - - noSuchMethod method - Helper class - ex library - Dart API - - - - - - - - - - - - - -
    - -
    - -
    - -
    -
    - - - -
    -
    - dynamic - noSuchMethod(Invocation invocation) -
    -
    -

    Invoked when a non-existent method or property is accessed.

    -

    Classes can override noSuchMethod to provide custom behavior.

    -

    If a value is returned, it becomes the result of the original invocation.

    -

    The default behavior is to throw a NoSuchMethodError.

    -
    - - - -
    - - - -
    -
    - -
    -
    -
    -

    - - test_package 0.0.1 - - • - - Dart - - • - - cc license - - -

    -
    -
    -
    - - - - - - - - - - - diff --git a/testing/test_package_docs/ex/Helper/operator_equals.html b/testing/test_package_docs/ex/Helper/operator_equals.html deleted file mode 100644 index 1d8423007d..0000000000 --- a/testing/test_package_docs/ex/Helper/operator_equals.html +++ /dev/null @@ -1,141 +0,0 @@ - - - - - - - - operator == method - Helper class - ex library - Dart API - - - - - - - - - - - - - -
    - -
    - -
    - -
    -
    - - - -
    -
    - bool - operator ==(other) -
    -
    -

    The equality operator.

    -

    The default behavior for all Objects is to return true if and -only if this and other are the same object.

    -

    Override this method to specify a different equality relation on -a class. The overriding method must still be an equivalence relation. -That is, it must be:

    • -

      Total: It must return a boolean for all arguments. It should never throw -or return null.

    • -

      Reflexive: For all objects o, o == o must be true.

    • -

      Symmetric: For all objects o1 and o2, o1 == o2 and o2 == o1 must -either both be true, or both be false.

    • -

      Transitive: For all objects o1, o2, and o3, if o1 == o2 and -o2 == o3 are true, then o1 == o3 must be true.

    -

    The method should also be consistent over time, -so whether two objects are equal should only change -if at least one of the objects was modified.

    -

    If a subclass overrides the equality operator it should override -the hashCode method as well to maintain consistency.

    -
    - - - -
    - - - -
    -
    - -
    -
    -
    -

    - - test_package 0.0.1 - - • - - Dart - - • - - cc license - - -

    -
    -
    -
    - - - - - - - - - - - diff --git a/testing/test_package_docs/ex/Helper/runtimeType.html b/testing/test_package_docs/ex/Helper/runtimeType.html deleted file mode 100644 index 8cd515dfa1..0000000000 --- a/testing/test_package_docs/ex/Helper/runtimeType.html +++ /dev/null @@ -1,129 +0,0 @@ - - - - - - - - runtimeType property - Helper class - ex library - Dart API - - - - - - - - - - - - - -
    - -
    - -
    - -
    -
    - - - -
    - - -
    - -
    - Type - runtimeType
    - -
    -

    A representation of the runtime type of the object.

    -
    -
    - - - -
    - - - -
    -
    - -
    -
    -
    -

    - - test_package 0.0.1 - - • - - Dart - - • - - cc license - - -

    -
    -
    -
    - - - - - - - - - - - diff --git a/testing/test_package_docs/ex/Helper/toString.html b/testing/test_package_docs/ex/Helper/toString.html deleted file mode 100644 index d5bd6ae5f6..0000000000 --- a/testing/test_package_docs/ex/Helper/toString.html +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - toString method - Helper class - ex library - Dart API - - - - - - - - - - - - - -
    - -
    - -
    - -
    -
    - - - -
    -
    - String - toString() -
    -
    -

    Returns a string representation of this object.

    -
    - - - -
    - - - -
    -
    - -
    -
    -
    -

    - - test_package 0.0.1 - - • - - Dart - - • - - cc license - - -

    -
    -
    -
    - - - - - - - - - - - diff --git a/testing/test_package_docs/ex/Klass-class.html b/testing/test_package_docs/ex/Klass-class.html index 05b7106fef..e182320196 100644 --- a/testing/test_package_docs/ex/Klass-class.html +++ b/testing/test_package_docs/ex/Klass-class.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/MY_CAT-constant.html b/testing/test_package_docs/ex/MY_CAT-constant.html index 06ca0d2bb6..872355441b 100644 --- a/testing/test_package_docs/ex/MY_CAT-constant.html +++ b/testing/test_package_docs/ex/MY_CAT-constant.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/MyError-class.html b/testing/test_package_docs/ex/MyError-class.html index ce1a92e4b3..b89aeae089 100644 --- a/testing/test_package_docs/ex/MyError-class.html +++ b/testing/test_package_docs/ex/MyError-class.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/MyErrorImplements-class.html b/testing/test_package_docs/ex/MyErrorImplements-class.html index 066fc84b61..877fe2409d 100644 --- a/testing/test_package_docs/ex/MyErrorImplements-class.html +++ b/testing/test_package_docs/ex/MyErrorImplements-class.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/MyException-class.html b/testing/test_package_docs/ex/MyException-class.html index d49c5f0856..c75ada8de4 100644 --- a/testing/test_package_docs/ex/MyException-class.html +++ b/testing/test_package_docs/ex/MyException-class.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/MyExceptionImplements-class.html b/testing/test_package_docs/ex/MyExceptionImplements-class.html index bd3d1ed582..940aa7f819 100644 --- a/testing/test_package_docs/ex/MyExceptionImplements-class.html +++ b/testing/test_package_docs/ex/MyExceptionImplements-class.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/PRETTY_COLORS-constant.html b/testing/test_package_docs/ex/PRETTY_COLORS-constant.html index a70291e481..59936cc639 100644 --- a/testing/test_package_docs/ex/PRETTY_COLORS-constant.html +++ b/testing/test_package_docs/ex/PRETTY_COLORS-constant.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/ParameterizedTypedef.html b/testing/test_package_docs/ex/ParameterizedTypedef.html index a7a74b14dd..a600a42642 100644 --- a/testing/test_package_docs/ex/ParameterizedTypedef.html +++ b/testing/test_package_docs/ex/ParameterizedTypedef.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/PublicClassExtendsPrivateClass-class.html b/testing/test_package_docs/ex/PublicClassExtendsPrivateClass-class.html index 7c556de546..b00c7440fb 100644 --- a/testing/test_package_docs/ex/PublicClassExtendsPrivateClass-class.html +++ b/testing/test_package_docs/ex/PublicClassExtendsPrivateClass-class.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/PublicClassImplementsPrivateInterface-class.html b/testing/test_package_docs/ex/PublicClassImplementsPrivateInterface-class.html index 9d6a30e52c..30d761d4b7 100644 --- a/testing/test_package_docs/ex/PublicClassImplementsPrivateInterface-class.html +++ b/testing/test_package_docs/ex/PublicClassImplementsPrivateInterface-class.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/ShapeType-class.html b/testing/test_package_docs/ex/ShapeType-class.html index 1cce18d08c..65e1a76301 100644 --- a/testing/test_package_docs/ex/ShapeType-class.html +++ b/testing/test_package_docs/ex/ShapeType-class.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/SpecializedDuration-class.html b/testing/test_package_docs/ex/SpecializedDuration-class.html index fc5db81322..b8232a3b56 100644 --- a/testing/test_package_docs/ex/SpecializedDuration-class.html +++ b/testing/test_package_docs/ex/SpecializedDuration-class.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/WithGeneric-class.html b/testing/test_package_docs/ex/WithGeneric-class.html index d766c1b7af..53249376a4 100644 --- a/testing/test_package_docs/ex/WithGeneric-class.html +++ b/testing/test_package_docs/ex/WithGeneric-class.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/WithGenericSub-class.html b/testing/test_package_docs/ex/WithGenericSub-class.html index 4a79c2a6ad..792bf8dc14 100644 --- a/testing/test_package_docs/ex/WithGenericSub-class.html +++ b/testing/test_package_docs/ex/WithGenericSub-class.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/aThingToDo-class.html b/testing/test_package_docs/ex/aThingToDo-class.html index adc12f5a9c..ac5b38cd59 100644 --- a/testing/test_package_docs/ex/aThingToDo-class.html +++ b/testing/test_package_docs/ex/aThingToDo-class.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/deprecated-constant.html b/testing/test_package_docs/ex/deprecated-constant.html index d4e1344f19..e0b2493cff 100644 --- a/testing/test_package_docs/ex/deprecated-constant.html +++ b/testing/test_package_docs/ex/deprecated-constant.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/deprecatedField.html b/testing/test_package_docs/ex/deprecatedField.html index 6fae627ed0..e01c1bab63 100644 --- a/testing/test_package_docs/ex/deprecatedField.html +++ b/testing/test_package_docs/ex/deprecatedField.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/deprecatedGetter.html b/testing/test_package_docs/ex/deprecatedGetter.html index 1f69cf9bc0..6b34aab9bc 100644 --- a/testing/test_package_docs/ex/deprecatedGetter.html +++ b/testing/test_package_docs/ex/deprecatedGetter.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/deprecatedSetter.html b/testing/test_package_docs/ex/deprecatedSetter.html index 5dc63b78b2..eb8d959288 100644 --- a/testing/test_package_docs/ex/deprecatedSetter.html +++ b/testing/test_package_docs/ex/deprecatedSetter.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/ex-library.html b/testing/test_package_docs/ex/ex-library.html index 677c2d1f06..71ab27b28c 100644 --- a/testing/test_package_docs/ex/ex-library.html +++ b/testing/test_package_docs/ex/ex-library.html @@ -56,6 +56,9 @@
    package test_package
  • ex
  • fake
  • is_deprecated
  • +
  • reexport_one
  • +
  • reexport_two
  • +
  • src.mylib
  • test_package_imported.main
  • two_exports
  • @@ -150,7 +153,7 @@

    Classes

    - Helper + Helper
    Even unresolved references in the same library should be resolved @@ -472,7 +475,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/function1.html b/testing/test_package_docs/ex/function1.html index 45d5ffd753..7da306e5f2 100644 --- a/testing/test_package_docs/ex/function1.html +++ b/testing/test_package_docs/ex/function1.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/genericFunction.html b/testing/test_package_docs/ex/genericFunction.html index c1f86ec90d..6cb83cb7a8 100644 --- a/testing/test_package_docs/ex/genericFunction.html +++ b/testing/test_package_docs/ex/genericFunction.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/incorrectDocReference-constant.html b/testing/test_package_docs/ex/incorrectDocReference-constant.html index d70c317f1b..8773005cef 100644 --- a/testing/test_package_docs/ex/incorrectDocReference-constant.html +++ b/testing/test_package_docs/ex/incorrectDocReference-constant.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/incorrectDocReferenceFromEx-constant.html b/testing/test_package_docs/ex/incorrectDocReferenceFromEx-constant.html index 9627b4250d..8bfaea1346 100644 --- a/testing/test_package_docs/ex/incorrectDocReferenceFromEx-constant.html +++ b/testing/test_package_docs/ex/incorrectDocReferenceFromEx-constant.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/number.html b/testing/test_package_docs/ex/number.html index 9c0cf5424a..ddfc3f989e 100644 --- a/testing/test_package_docs/ex/number.html +++ b/testing/test_package_docs/ex/number.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/processMessage.html b/testing/test_package_docs/ex/processMessage.html index e2784e8068..ef11302717 100644 --- a/testing/test_package_docs/ex/processMessage.html +++ b/testing/test_package_docs/ex/processMessage.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/y.html b/testing/test_package_docs/ex/y.html index a96c06f51d..b9d51809f2 100644 --- a/testing/test_package_docs/ex/y.html +++ b/testing/test_package_docs/ex/y.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/fake/fake-library.html b/testing/test_package_docs/fake/fake-library.html index 61e2a2f2b9..51b0319bb9 100644 --- a/testing/test_package_docs/fake/fake-library.html +++ b/testing/test_package_docs/fake/fake-library.html @@ -56,6 +56,9 @@
    package test_package
  • ex
  • fake
  • is_deprecated
  • +
  • reexport_one
  • +
  • reexport_two
  • +
  • src.mylib
  • test_package_imported.main
  • two_exports
  • diff --git a/testing/test_package_docs/index.html b/testing/test_package_docs/index.html index 1800eabead..2f6f47686f 100644 --- a/testing/test_package_docs/index.html +++ b/testing/test_package_docs/index.html @@ -54,6 +54,9 @@
    package test_package
  • ex
  • fake
  • is_deprecated
  • +
  • reexport_one
  • +
  • reexport_two
  • +
  • src.mylib
  • test_package_imported.main
  • two_exports
  • @@ -127,6 +130,24 @@

    Libraries

    This lib is deprecated. It never had a chance +
    +
    + reexport_one +
    +
    + +
    +
    + reexport_two +
    +
    + +
    +
    + src.mylib +
    +
    +
    test_package_imported.main diff --git a/testing/test_package_docs/index.json b/testing/test_package_docs/index.json index c835b8d78e..501e96f871 100644 --- a/testing/test_package_docs/index.json +++ b/testing/test_package_docs/index.json @@ -1574,94 +1574,6 @@ "type": "class" } }, - { - "name": "Helper", - "qualifiedName": "ex.Helper", - "href": "ex/Helper-class.html", - "type": "class", - "overriddenDepth": 0, - "enclosedBy": { - "name": "ex", - "type": "library" - } - }, - { - "name": "Helper", - "qualifiedName": "ex.Helper", - "href": "ex/Helper/Helper.html", - "type": "constructor", - "overriddenDepth": 0, - "enclosedBy": { - "name": "Helper", - "type": "class" - } - }, - { - "name": "operator ==", - "qualifiedName": "ex.Helper.==", - "href": "ex/Helper/operator_equals.html", - "type": "method", - "overriddenDepth": 0, - "enclosedBy": { - "name": "Helper", - "type": "class" - } - }, - { - "name": "getContents", - "qualifiedName": "ex.Helper.getContents", - "href": "ex/Helper/getContents.html", - "type": "method", - "overriddenDepth": 0, - "enclosedBy": { - "name": "Helper", - "type": "class" - } - }, - { - "name": "hashCode", - "qualifiedName": "ex.Helper.hashCode", - "href": "ex/Helper/hashCode.html", - "type": "property", - "overriddenDepth": 0, - "enclosedBy": { - "name": "Helper", - "type": "class" - } - }, - { - "name": "noSuchMethod", - "qualifiedName": "ex.Helper.noSuchMethod", - "href": "ex/Helper/noSuchMethod.html", - "type": "method", - "overriddenDepth": 0, - "enclosedBy": { - "name": "Helper", - "type": "class" - } - }, - { - "name": "runtimeType", - "qualifiedName": "ex.Helper.runtimeType", - "href": "ex/Helper/runtimeType.html", - "type": "property", - "overriddenDepth": 0, - "enclosedBy": { - "name": "Helper", - "type": "class" - } - }, - { - "name": "toString", - "qualifiedName": "ex.Helper.toString", - "href": "ex/Helper/toString.html", - "type": "method", - "overriddenDepth": 0, - "enclosedBy": { - "name": "Helper", - "type": "class" - } - }, { "name": "Klass", "qualifiedName": "ex.Klass", @@ -6142,6 +6054,434 @@ "type": "library", "overriddenDepth": 0 }, + { + "name": "reexport_one", + "qualifiedName": "reexport_one", + "href": "reexport_one/reexport_one-library.html", + "type": "library", + "overriddenDepth": 0 + }, + { + "name": "SomeOtherClass", + "qualifiedName": "reexport_one.SomeOtherClass", + "href": "reexport_one/SomeOtherClass-class.html", + "type": "class", + "overriddenDepth": 0, + "enclosedBy": { + "name": "reexport_one", + "type": "library" + } + }, + { + "name": "SomeOtherClass", + "qualifiedName": "reexport_one.SomeOtherClass", + "href": "reexport_one/SomeOtherClass/SomeOtherClass.html", + "type": "constructor", + "overriddenDepth": 0, + "enclosedBy": { + "name": "SomeOtherClass", + "type": "class" + } + }, + { + "name": "operator ==", + "qualifiedName": "reexport_one.SomeOtherClass.==", + "href": "reexport_one/SomeOtherClass/operator_equals.html", + "type": "method", + "overriddenDepth": 0, + "enclosedBy": { + "name": "SomeOtherClass", + "type": "class" + } + }, + { + "name": "hashCode", + "qualifiedName": "reexport_one.SomeOtherClass.hashCode", + "href": "reexport_one/SomeOtherClass/hashCode.html", + "type": "property", + "overriddenDepth": 0, + "enclosedBy": { + "name": "SomeOtherClass", + "type": "class" + } + }, + { + "name": "noSuchMethod", + "qualifiedName": "reexport_one.SomeOtherClass.noSuchMethod", + "href": "reexport_one/SomeOtherClass/noSuchMethod.html", + "type": "method", + "overriddenDepth": 0, + "enclosedBy": { + "name": "SomeOtherClass", + "type": "class" + } + }, + { + "name": "runtimeType", + "qualifiedName": "reexport_one.SomeOtherClass.runtimeType", + "href": "reexport_one/SomeOtherClass/runtimeType.html", + "type": "property", + "overriddenDepth": 0, + "enclosedBy": { + "name": "SomeOtherClass", + "type": "class" + } + }, + { + "name": "toString", + "qualifiedName": "reexport_one.SomeOtherClass.toString", + "href": "reexport_one/SomeOtherClass/toString.html", + "type": "method", + "overriddenDepth": 0, + "enclosedBy": { + "name": "SomeOtherClass", + "type": "class" + } + }, + { + "name": "reexport_two", + "qualifiedName": "reexport_two", + "href": "reexport_two/reexport_two-library.html", + "type": "library", + "overriddenDepth": 0 + }, + { + "name": "AUnicornClass", + "qualifiedName": "reexport_two.AUnicornClass", + "href": "reexport_two/AUnicornClass-class.html", + "type": "class", + "overriddenDepth": 0, + "enclosedBy": { + "name": "reexport_two", + "type": "library" + } + }, + { + "name": "AUnicornClass", + "qualifiedName": "reexport_two.AUnicornClass", + "href": "reexport_two/AUnicornClass/AUnicornClass.html", + "type": "constructor", + "overriddenDepth": 0, + "enclosedBy": { + "name": "AUnicornClass", + "type": "class" + } + }, + { + "name": "operator ==", + "qualifiedName": "reexport_two.AUnicornClass.==", + "href": "reexport_two/AUnicornClass/operator_equals.html", + "type": "method", + "overriddenDepth": 0, + "enclosedBy": { + "name": "AUnicornClass", + "type": "class" + } + }, + { + "name": "hashCode", + "qualifiedName": "reexport_two.AUnicornClass.hashCode", + "href": "reexport_two/AUnicornClass/hashCode.html", + "type": "property", + "overriddenDepth": 0, + "enclosedBy": { + "name": "AUnicornClass", + "type": "class" + } + }, + { + "name": "noSuchMethod", + "qualifiedName": "reexport_two.AUnicornClass.noSuchMethod", + "href": "reexport_two/AUnicornClass/noSuchMethod.html", + "type": "method", + "overriddenDepth": 0, + "enclosedBy": { + "name": "AUnicornClass", + "type": "class" + } + }, + { + "name": "runtimeType", + "qualifiedName": "reexport_two.AUnicornClass.runtimeType", + "href": "reexport_two/AUnicornClass/runtimeType.html", + "type": "property", + "overriddenDepth": 0, + "enclosedBy": { + "name": "AUnicornClass", + "type": "class" + } + }, + { + "name": "toString", + "qualifiedName": "reexport_two.AUnicornClass.toString", + "href": "reexport_two/AUnicornClass/toString.html", + "type": "method", + "overriddenDepth": 0, + "enclosedBy": { + "name": "AUnicornClass", + "type": "class" + } + }, + { + "name": "SomeClass", + "qualifiedName": "reexport_two.SomeClass", + "href": "reexport_two/SomeClass-class.html", + "type": "class", + "overriddenDepth": 0, + "enclosedBy": { + "name": "reexport_two", + "type": "library" + } + }, + { + "name": "SomeClass", + "qualifiedName": "reexport_two.SomeClass", + "href": "reexport_two/SomeClass/SomeClass.html", + "type": "constructor", + "overriddenDepth": 0, + "enclosedBy": { + "name": "SomeClass", + "type": "class" + } + }, + { + "name": "operator ==", + "qualifiedName": "reexport_two.SomeClass.==", + "href": "reexport_two/SomeClass/operator_equals.html", + "type": "method", + "overriddenDepth": 0, + "enclosedBy": { + "name": "SomeClass", + "type": "class" + } + }, + { + "name": "hashCode", + "qualifiedName": "reexport_two.SomeClass.hashCode", + "href": "reexport_two/SomeClass/hashCode.html", + "type": "property", + "overriddenDepth": 0, + "enclosedBy": { + "name": "SomeClass", + "type": "class" + } + }, + { + "name": "noSuchMethod", + "qualifiedName": "reexport_two.SomeClass.noSuchMethod", + "href": "reexport_two/SomeClass/noSuchMethod.html", + "type": "method", + "overriddenDepth": 0, + "enclosedBy": { + "name": "SomeClass", + "type": "class" + } + }, + { + "name": "runtimeType", + "qualifiedName": "reexport_two.SomeClass.runtimeType", + "href": "reexport_two/SomeClass/runtimeType.html", + "type": "property", + "overriddenDepth": 0, + "enclosedBy": { + "name": "SomeClass", + "type": "class" + } + }, + { + "name": "toString", + "qualifiedName": "reexport_two.SomeClass.toString", + "href": "reexport_two/SomeClass/toString.html", + "type": "method", + "overriddenDepth": 0, + "enclosedBy": { + "name": "SomeClass", + "type": "class" + } + }, + { + "name": "YetAnotherClass", + "qualifiedName": "reexport_two.YetAnotherClass", + "href": "reexport_two/YetAnotherClass-class.html", + "type": "class", + "overriddenDepth": 0, + "enclosedBy": { + "name": "reexport_two", + "type": "library" + } + }, + { + "name": "YetAnotherClass", + "qualifiedName": "reexport_two.YetAnotherClass", + "href": "reexport_two/YetAnotherClass/YetAnotherClass.html", + "type": "constructor", + "overriddenDepth": 0, + "enclosedBy": { + "name": "YetAnotherClass", + "type": "class" + } + }, + { + "name": "operator ==", + "qualifiedName": "reexport_two.YetAnotherClass.==", + "href": "reexport_two/YetAnotherClass/operator_equals.html", + "type": "method", + "overriddenDepth": 0, + "enclosedBy": { + "name": "YetAnotherClass", + "type": "class" + } + }, + { + "name": "hashCode", + "qualifiedName": "reexport_two.YetAnotherClass.hashCode", + "href": "reexport_two/YetAnotherClass/hashCode.html", + "type": "property", + "overriddenDepth": 0, + "enclosedBy": { + "name": "YetAnotherClass", + "type": "class" + } + }, + { + "name": "noSuchMethod", + "qualifiedName": "reexport_two.YetAnotherClass.noSuchMethod", + "href": "reexport_two/YetAnotherClass/noSuchMethod.html", + "type": "method", + "overriddenDepth": 0, + "enclosedBy": { + "name": "YetAnotherClass", + "type": "class" + } + }, + { + "name": "runtimeType", + "qualifiedName": "reexport_two.YetAnotherClass.runtimeType", + "href": "reexport_two/YetAnotherClass/runtimeType.html", + "type": "property", + "overriddenDepth": 0, + "enclosedBy": { + "name": "YetAnotherClass", + "type": "class" + } + }, + { + "name": "toString", + "qualifiedName": "reexport_two.YetAnotherClass.toString", + "href": "reexport_two/YetAnotherClass/toString.html", + "type": "method", + "overriddenDepth": 0, + "enclosedBy": { + "name": "YetAnotherClass", + "type": "class" + } + }, + { + "name": "src.mylib", + "qualifiedName": "src.mylib", + "href": "src.mylib/src.mylib-library.html", + "type": "library", + "overriddenDepth": 0 + }, + { + "name": "Helper", + "qualifiedName": "src.mylib.Helper", + "href": "src.mylib/Helper-class.html", + "type": "class", + "overriddenDepth": 0, + "enclosedBy": { + "name": "src.mylib", + "type": "library" + } + }, + { + "name": "Helper", + "qualifiedName": "src.mylib.Helper", + "href": "src.mylib/Helper/Helper.html", + "type": "constructor", + "overriddenDepth": 0, + "enclosedBy": { + "name": "Helper", + "type": "class" + } + }, + { + "name": "operator ==", + "qualifiedName": "src.mylib.Helper.==", + "href": "src.mylib/Helper/operator_equals.html", + "type": "method", + "overriddenDepth": 0, + "enclosedBy": { + "name": "Helper", + "type": "class" + } + }, + { + "name": "getContents", + "qualifiedName": "src.mylib.Helper.getContents", + "href": "src.mylib/Helper/getContents.html", + "type": "method", + "overriddenDepth": 0, + "enclosedBy": { + "name": "Helper", + "type": "class" + } + }, + { + "name": "hashCode", + "qualifiedName": "src.mylib.Helper.hashCode", + "href": "src.mylib/Helper/hashCode.html", + "type": "property", + "overriddenDepth": 0, + "enclosedBy": { + "name": "Helper", + "type": "class" + } + }, + { + "name": "noSuchMethod", + "qualifiedName": "src.mylib.Helper.noSuchMethod", + "href": "src.mylib/Helper/noSuchMethod.html", + "type": "method", + "overriddenDepth": 0, + "enclosedBy": { + "name": "Helper", + "type": "class" + } + }, + { + "name": "runtimeType", + "qualifiedName": "src.mylib.Helper.runtimeType", + "href": "src.mylib/Helper/runtimeType.html", + "type": "property", + "overriddenDepth": 0, + "enclosedBy": { + "name": "Helper", + "type": "class" + } + }, + { + "name": "toString", + "qualifiedName": "src.mylib.Helper.toString", + "href": "src.mylib/Helper/toString.html", + "type": "method", + "overriddenDepth": 0, + "enclosedBy": { + "name": "Helper", + "type": "class" + } + }, + { + "name": "helperFunction", + "qualifiedName": "src.mylib.helperFunction", + "href": "src.mylib/helperFunction.html", + "type": "function", + "overriddenDepth": 0, + "enclosedBy": { + "name": "src.mylib", + "type": "library" + } + }, { "name": "test_package_imported.main", "qualifiedName": "test_package_imported.main", diff --git a/testing/test_package_docs/is_deprecated/is_deprecated-library.html b/testing/test_package_docs/is_deprecated/is_deprecated-library.html index eb6271a648..92ed7bffc3 100644 --- a/testing/test_package_docs/is_deprecated/is_deprecated-library.html +++ b/testing/test_package_docs/is_deprecated/is_deprecated-library.html @@ -56,6 +56,9 @@
    package test_package
  • ex
  • fake
  • is_deprecated
  • +
  • reexport_one
  • +
  • reexport_two
  • +
  • src.mylib
  • test_package_imported.main
  • two_exports
  • diff --git a/testing/test_package_docs/test_package_imported.main/test_package_imported.main-library.html b/testing/test_package_docs/test_package_imported.main/test_package_imported.main-library.html index 66f65a1835..71f31d1bb3 100644 --- a/testing/test_package_docs/test_package_imported.main/test_package_imported.main-library.html +++ b/testing/test_package_docs/test_package_imported.main/test_package_imported.main-library.html @@ -56,6 +56,9 @@
    package test_package
  • ex
  • fake
  • is_deprecated
  • +
  • reexport_one
  • +
  • reexport_two
  • +
  • src.mylib
  • test_package_imported.main
  • two_exports
  • diff --git a/testing/test_package_docs/two_exports/two_exports-library.html b/testing/test_package_docs/two_exports/two_exports-library.html index e9a9b4a845..5d420ca4d8 100644 --- a/testing/test_package_docs/two_exports/two_exports-library.html +++ b/testing/test_package_docs/two_exports/two_exports-library.html @@ -56,6 +56,9 @@
    package test_package
  • ex
  • fake
  • is_deprecated
  • +
  • reexport_one
  • +
  • reexport_two
  • +
  • src.mylib
  • test_package_imported.main
  • two_exports
  • From 7fa12091d5e873f7135f49c902644c8a41001b19 Mon Sep 17 00:00:00 2001 From: Janice Collins Date: Fri, 2 Jun 2017 15:02:07 -0700 Subject: [PATCH 09/19] Add new test doc directories --- .../reexport_one/SomeOtherClass-class.html | 206 ++++++++++++++++ .../SomeOtherClass/SomeOtherClass.html | 121 ++++++++++ .../reexport_one/SomeOtherClass/hashCode.html | 149 ++++++++++++ .../SomeOtherClass/noSuchMethod.html | 126 ++++++++++ .../SomeOtherClass/operator_equals.html | 140 +++++++++++ .../SomeOtherClass/runtimeType.html | 128 ++++++++++ .../reexport_one/SomeOtherClass/toString.html | 123 ++++++++++ .../reexport_one/reexport_one-library.html | 162 +++++++++++++ .../reexport_two/AUnicornClass-class.html | 206 ++++++++++++++++ .../AUnicornClass/AUnicornClass.html | 121 ++++++++++ .../reexport_two/AUnicornClass/hashCode.html | 149 ++++++++++++ .../AUnicornClass/noSuchMethod.html | 126 ++++++++++ .../AUnicornClass/operator_equals.html | 140 +++++++++++ .../AUnicornClass/runtimeType.html | 128 ++++++++++ .../reexport_two/AUnicornClass/toString.html | 123 ++++++++++ .../reexport_two/SomeClass-class.html | 206 ++++++++++++++++ .../reexport_two/SomeClass/SomeClass.html | 121 ++++++++++ .../reexport_two/SomeClass/hashCode.html | 149 ++++++++++++ .../reexport_two/SomeClass/noSuchMethod.html | 126 ++++++++++ .../SomeClass/operator_equals.html | 140 +++++++++++ .../reexport_two/SomeClass/runtimeType.html | 128 ++++++++++ .../reexport_two/SomeClass/toString.html | 123 ++++++++++ .../reexport_two/YetAnotherClass-class.html | 206 ++++++++++++++++ .../YetAnotherClass/YetAnotherClass.html | 121 ++++++++++ .../YetAnotherClass/hashCode.html | 149 ++++++++++++ .../YetAnotherClass/noSuchMethod.html | 126 ++++++++++ .../YetAnotherClass/operator_equals.html | 140 +++++++++++ .../YetAnotherClass/runtimeType.html | 128 ++++++++++ .../YetAnotherClass/toString.html | 123 ++++++++++ .../reexport_two/reexport_two-library.html | 162 +++++++++++++ .../src.mylib/Helper-class.html | 220 ++++++++++++++++++ .../src.mylib/Helper/Helper.html | 122 ++++++++++ .../src.mylib/Helper/getContents.html | 121 ++++++++++ .../src.mylib/Helper/hashCode.html | 150 ++++++++++++ .../src.mylib/Helper/noSuchMethod.html | 127 ++++++++++ .../src.mylib/Helper/operator_equals.html | 141 +++++++++++ .../src.mylib/Helper/runtimeType.html | 129 ++++++++++ .../src.mylib/Helper/toString.html | 124 ++++++++++ .../src.mylib/helperFunction.html | 112 +++++++++ .../src.mylib/src.mylib-library.html | 157 +++++++++++++ 40 files changed, 5699 insertions(+) create mode 100644 testing/test_package_docs/reexport_one/SomeOtherClass-class.html create mode 100644 testing/test_package_docs/reexport_one/SomeOtherClass/SomeOtherClass.html create mode 100644 testing/test_package_docs/reexport_one/SomeOtherClass/hashCode.html create mode 100644 testing/test_package_docs/reexport_one/SomeOtherClass/noSuchMethod.html create mode 100644 testing/test_package_docs/reexport_one/SomeOtherClass/operator_equals.html create mode 100644 testing/test_package_docs/reexport_one/SomeOtherClass/runtimeType.html create mode 100644 testing/test_package_docs/reexport_one/SomeOtherClass/toString.html create mode 100644 testing/test_package_docs/reexport_one/reexport_one-library.html create mode 100644 testing/test_package_docs/reexport_two/AUnicornClass-class.html create mode 100644 testing/test_package_docs/reexport_two/AUnicornClass/AUnicornClass.html create mode 100644 testing/test_package_docs/reexport_two/AUnicornClass/hashCode.html create mode 100644 testing/test_package_docs/reexport_two/AUnicornClass/noSuchMethod.html create mode 100644 testing/test_package_docs/reexport_two/AUnicornClass/operator_equals.html create mode 100644 testing/test_package_docs/reexport_two/AUnicornClass/runtimeType.html create mode 100644 testing/test_package_docs/reexport_two/AUnicornClass/toString.html create mode 100644 testing/test_package_docs/reexport_two/SomeClass-class.html create mode 100644 testing/test_package_docs/reexport_two/SomeClass/SomeClass.html create mode 100644 testing/test_package_docs/reexport_two/SomeClass/hashCode.html create mode 100644 testing/test_package_docs/reexport_two/SomeClass/noSuchMethod.html create mode 100644 testing/test_package_docs/reexport_two/SomeClass/operator_equals.html create mode 100644 testing/test_package_docs/reexport_two/SomeClass/runtimeType.html create mode 100644 testing/test_package_docs/reexport_two/SomeClass/toString.html create mode 100644 testing/test_package_docs/reexport_two/YetAnotherClass-class.html create mode 100644 testing/test_package_docs/reexport_two/YetAnotherClass/YetAnotherClass.html create mode 100644 testing/test_package_docs/reexport_two/YetAnotherClass/hashCode.html create mode 100644 testing/test_package_docs/reexport_two/YetAnotherClass/noSuchMethod.html create mode 100644 testing/test_package_docs/reexport_two/YetAnotherClass/operator_equals.html create mode 100644 testing/test_package_docs/reexport_two/YetAnotherClass/runtimeType.html create mode 100644 testing/test_package_docs/reexport_two/YetAnotherClass/toString.html create mode 100644 testing/test_package_docs/reexport_two/reexport_two-library.html create mode 100644 testing/test_package_docs/src.mylib/Helper-class.html create mode 100644 testing/test_package_docs/src.mylib/Helper/Helper.html create mode 100644 testing/test_package_docs/src.mylib/Helper/getContents.html create mode 100644 testing/test_package_docs/src.mylib/Helper/hashCode.html create mode 100644 testing/test_package_docs/src.mylib/Helper/noSuchMethod.html create mode 100644 testing/test_package_docs/src.mylib/Helper/operator_equals.html create mode 100644 testing/test_package_docs/src.mylib/Helper/runtimeType.html create mode 100644 testing/test_package_docs/src.mylib/Helper/toString.html create mode 100644 testing/test_package_docs/src.mylib/helperFunction.html create mode 100644 testing/test_package_docs/src.mylib/src.mylib-library.html diff --git a/testing/test_package_docs/reexport_one/SomeOtherClass-class.html b/testing/test_package_docs/reexport_one/SomeOtherClass-class.html new file mode 100644 index 0000000000..9c957e75d5 --- /dev/null +++ b/testing/test_package_docs/reexport_one/SomeOtherClass-class.html @@ -0,0 +1,206 @@ + + + + + + + + SomeOtherClass class - reexport_one library - Dart API + + + + + + + + + + + + + +
    + +
    + +
    + +
    +
    + + + +
    + + + +
    +

    Constructors

    + +
    +
    + SomeOtherClass() +
    +
    + +
    +
    +
    + +
    +

    Properties

    + +
    +
    + hashCode + → int +
    +
    + The hash code for this object. +
    read-only, inherited
    +
    +
    + runtimeType + → Type +
    +
    + A representation of the runtime type of the object. +
    read-only, inherited
    +
    +
    +
    + +
    +

    Methods

    +
    +
    + noSuchMethod(Invocation invocation) + → dynamic + +
    +
    + Invoked when a non-existent method or property is accessed. +
    inherited
    +
    +
    + toString() + → String + +
    +
    + Returns a string representation of this object. +
    inherited
    +
    +
    +
    + +
    +

    Operators

    +
    +
    + operator ==(other) + → bool + +
    +
    + The equality operator. +
    inherited
    +
    +
    +
    + + + + +
    + + + +
    +
    + +
    +
    +
    +

    + + test_package 0.0.1 + + • + + Dart + + • + + cc license + + +

    +
    +
    +
    + + + + + + + + + + + diff --git a/testing/test_package_docs/reexport_one/SomeOtherClass/SomeOtherClass.html b/testing/test_package_docs/reexport_one/SomeOtherClass/SomeOtherClass.html new file mode 100644 index 0000000000..db31058680 --- /dev/null +++ b/testing/test_package_docs/reexport_one/SomeOtherClass/SomeOtherClass.html @@ -0,0 +1,121 @@ + + + + + + + + SomeOtherClass constructor - SomeOtherClass class - reexport_one library - Dart API + + + + + + + + + + + + + +
    + +
    + +
    + +
    +
    + + + +
    +
    + + SomeOtherClass() +
    + + + + +
    + + + +
    +
    + +
    +
    +
    +

    + + test_package 0.0.1 + + • + + Dart + + • + + cc license + + +

    +
    +
    +
    + + + + + + + + + + + diff --git a/testing/test_package_docs/reexport_one/SomeOtherClass/hashCode.html b/testing/test_package_docs/reexport_one/SomeOtherClass/hashCode.html new file mode 100644 index 0000000000..e26e8a2226 --- /dev/null +++ b/testing/test_package_docs/reexport_one/SomeOtherClass/hashCode.html @@ -0,0 +1,149 @@ + + + + + + + + hashCode property - SomeOtherClass class - reexport_one library - Dart API + + + + + + + + + + + + + +
    + +
    + +
    + +
    +
    + + + +
    + + +
    + +
    + int + hashCode
    + +
    +

    The hash code for this object.

    +

    A hash code is a single integer which represents the state of the object +that affects == comparisons.

    +

    All objects have hash codes. +The default hash code represents only the identity of the object, +the same way as the default == implementation only considers objects +equal if they are identical (see identityHashCode).

    +

    If == is overridden to use the object state instead, +the hash code must also be changed to represent that state.

    +

    Hash codes must be the same for objects that are equal to each other +according to ==. +The hash code of an object should only change if the object changes +in a way that affects equality. +There are no further requirements for the hash codes. +They need not be consistent between executions of the same program +and there are no distribution guarantees.

    +

    Objects that are not equal are allowed to have the same hash code, +it is even technically allowed that all instances have the same hash code, +but if clashes happen too often, it may reduce the efficiency of hash-based +data structures like HashSet or HashMap.

    +

    If a subclass overrides hashCode, it should override the +== operator as well to maintain consistency.

    +
    +
    + + + +
    + + + +
    +
    + +
    +
    +
    +

    + + test_package 0.0.1 + + • + + Dart + + • + + cc license + + +

    +
    +
    +
    + + + + + + + + + + + diff --git a/testing/test_package_docs/reexport_one/SomeOtherClass/noSuchMethod.html b/testing/test_package_docs/reexport_one/SomeOtherClass/noSuchMethod.html new file mode 100644 index 0000000000..ceec6b5143 --- /dev/null +++ b/testing/test_package_docs/reexport_one/SomeOtherClass/noSuchMethod.html @@ -0,0 +1,126 @@ + + + + + + + + noSuchMethod method - SomeOtherClass class - reexport_one library - Dart API + + + + + + + + + + + + + +
    + +
    + +
    + +
    +
    + + + +
    +
    + dynamic + noSuchMethod(Invocation invocation) +
    +
    +

    Invoked when a non-existent method or property is accessed.

    +

    Classes can override noSuchMethod to provide custom behavior.

    +

    If a value is returned, it becomes the result of the original invocation.

    +

    The default behavior is to throw a NoSuchMethodError.

    +
    + + + +
    + + + +
    +
    + +
    +
    +
    +

    + + test_package 0.0.1 + + • + + Dart + + • + + cc license + + +

    +
    +
    +
    + + + + + + + + + + + diff --git a/testing/test_package_docs/reexport_one/SomeOtherClass/operator_equals.html b/testing/test_package_docs/reexport_one/SomeOtherClass/operator_equals.html new file mode 100644 index 0000000000..0dfe1c74b9 --- /dev/null +++ b/testing/test_package_docs/reexport_one/SomeOtherClass/operator_equals.html @@ -0,0 +1,140 @@ + + + + + + + + operator == method - SomeOtherClass class - reexport_one library - Dart API + + + + + + + + + + + + + +
    + +
    + +
    + +
    +
    + + + +
    +
    + bool + operator ==(other) +
    +
    +

    The equality operator.

    +

    The default behavior for all Objects is to return true if and +only if this and other are the same object.

    +

    Override this method to specify a different equality relation on +a class. The overriding method must still be an equivalence relation. +That is, it must be:

    • +

      Total: It must return a boolean for all arguments. It should never throw +or return null.

    • +

      Reflexive: For all objects o, o == o must be true.

    • +

      Symmetric: For all objects o1 and o2, o1 == o2 and o2 == o1 must +either both be true, or both be false.

    • +

      Transitive: For all objects o1, o2, and o3, if o1 == o2 and +o2 == o3 are true, then o1 == o3 must be true.

    +

    The method should also be consistent over time, +so whether two objects are equal should only change +if at least one of the objects was modified.

    +

    If a subclass overrides the equality operator it should override +the hashCode method as well to maintain consistency.

    +
    + + + +
    + + + +
    +
    + +
    +
    +
    +

    + + test_package 0.0.1 + + • + + Dart + + • + + cc license + + +

    +
    +
    +
    + + + + + + + + + + + diff --git a/testing/test_package_docs/reexport_one/SomeOtherClass/runtimeType.html b/testing/test_package_docs/reexport_one/SomeOtherClass/runtimeType.html new file mode 100644 index 0000000000..4bd7bd57ed --- /dev/null +++ b/testing/test_package_docs/reexport_one/SomeOtherClass/runtimeType.html @@ -0,0 +1,128 @@ + + + + + + + + runtimeType property - SomeOtherClass class - reexport_one library - Dart API + + + + + + + + + + + + + +
    + +
    + +
    + +
    +
    + + + +
    + + +
    + +
    + Type + runtimeType
    + +
    +

    A representation of the runtime type of the object.

    +
    +
    + + + +
    + + + +
    +
    + +
    +
    +
    +

    + + test_package 0.0.1 + + • + + Dart + + • + + cc license + + +

    +
    +
    +
    + + + + + + + + + + + diff --git a/testing/test_package_docs/reexport_one/SomeOtherClass/toString.html b/testing/test_package_docs/reexport_one/SomeOtherClass/toString.html new file mode 100644 index 0000000000..ded10739db --- /dev/null +++ b/testing/test_package_docs/reexport_one/SomeOtherClass/toString.html @@ -0,0 +1,123 @@ + + + + + + + + toString method - SomeOtherClass class - reexport_one library - Dart API + + + + + + + + + + + + + +
    + +
    + +
    + +
    +
    + + + +
    +
    + String + toString() +
    +
    +

    Returns a string representation of this object.

    +
    + + + +
    + + + +
    +
    + +
    +
    +
    +

    + + test_package 0.0.1 + + • + + Dart + + • + + cc license + + +

    +
    +
    +
    + + + + + + + + + + + diff --git a/testing/test_package_docs/reexport_one/reexport_one-library.html b/testing/test_package_docs/reexport_one/reexport_one-library.html new file mode 100644 index 0000000000..468762deff --- /dev/null +++ b/testing/test_package_docs/reexport_one/reexport_one-library.html @@ -0,0 +1,162 @@ + + + + + + + + reexport_one library - Dart API + + + + + + + + + + + + + +
    + +
    + +
    + +
    +
    + + + +
    + +
    + +
    + +
    +

    Classes

    + +
    +
    + AUnicornClass +
    +
    + +
    +
    + SomeClass +
    +
    + +
    +
    + SomeOtherClass +
    +
    + +
    +
    + YetAnotherClass +
    +
    + +
    +
    +
    + + + + + + + +
    + + + +
    +
    + +
    +
    +
    +

    + + test_package 0.0.1 + + • + + Dart + + • + + cc license + + +

    +
    +
    +
    + + + + + + + + + + + diff --git a/testing/test_package_docs/reexport_two/AUnicornClass-class.html b/testing/test_package_docs/reexport_two/AUnicornClass-class.html new file mode 100644 index 0000000000..3063cb03fe --- /dev/null +++ b/testing/test_package_docs/reexport_two/AUnicornClass-class.html @@ -0,0 +1,206 @@ + + + + + + + + AUnicornClass class - reexport_two library - Dart API + + + + + + + + + + + + + +
    + +
    + +
    + +
    +
    + + + +
    + + + +
    +

    Constructors

    + +
    +
    + AUnicornClass() +
    +
    + +
    +
    +
    + +
    +

    Properties

    + +
    +
    + hashCode + → int +
    +
    + The hash code for this object. +
    read-only, inherited
    +
    +
    + runtimeType + → Type +
    +
    + A representation of the runtime type of the object. +
    read-only, inherited
    +
    +
    +
    + +
    +

    Methods

    +
    +
    + noSuchMethod(Invocation invocation) + → dynamic + +
    +
    + Invoked when a non-existent method or property is accessed. +
    inherited
    +
    +
    + toString() + → String + +
    +
    + Returns a string representation of this object. +
    inherited
    +
    +
    +
    + +
    +

    Operators

    +
    +
    + operator ==(other) + → bool + +
    +
    + The equality operator. +
    inherited
    +
    +
    +
    + + + + +
    + + + +
    +
    + +
    +
    +
    +

    + + test_package 0.0.1 + + • + + Dart + + • + + cc license + + +

    +
    +
    +
    + + + + + + + + + + + diff --git a/testing/test_package_docs/reexport_two/AUnicornClass/AUnicornClass.html b/testing/test_package_docs/reexport_two/AUnicornClass/AUnicornClass.html new file mode 100644 index 0000000000..2258febe51 --- /dev/null +++ b/testing/test_package_docs/reexport_two/AUnicornClass/AUnicornClass.html @@ -0,0 +1,121 @@ + + + + + + + + AUnicornClass constructor - AUnicornClass class - reexport_two library - Dart API + + + + + + + + + + + + + +
    + +
    + +
    + +
    +
    + + + +
    +
    + + AUnicornClass() +
    + + + + +
    + + + +
    +
    + +
    +
    +
    +

    + + test_package 0.0.1 + + • + + Dart + + • + + cc license + + +

    +
    +
    +
    + + + + + + + + + + + diff --git a/testing/test_package_docs/reexport_two/AUnicornClass/hashCode.html b/testing/test_package_docs/reexport_two/AUnicornClass/hashCode.html new file mode 100644 index 0000000000..f3644a3f44 --- /dev/null +++ b/testing/test_package_docs/reexport_two/AUnicornClass/hashCode.html @@ -0,0 +1,149 @@ + + + + + + + + hashCode property - AUnicornClass class - reexport_two library - Dart API + + + + + + + + + + + + + +
    + +
    + +
    + +
    +
    + + + +
    + + +
    + +
    + int + hashCode
    + +
    +

    The hash code for this object.

    +

    A hash code is a single integer which represents the state of the object +that affects == comparisons.

    +

    All objects have hash codes. +The default hash code represents only the identity of the object, +the same way as the default == implementation only considers objects +equal if they are identical (see identityHashCode).

    +

    If == is overridden to use the object state instead, +the hash code must also be changed to represent that state.

    +

    Hash codes must be the same for objects that are equal to each other +according to ==. +The hash code of an object should only change if the object changes +in a way that affects equality. +There are no further requirements for the hash codes. +They need not be consistent between executions of the same program +and there are no distribution guarantees.

    +

    Objects that are not equal are allowed to have the same hash code, +it is even technically allowed that all instances have the same hash code, +but if clashes happen too often, it may reduce the efficiency of hash-based +data structures like HashSet or HashMap.

    +

    If a subclass overrides hashCode, it should override the +== operator as well to maintain consistency.

    +
    +
    + + + +
    + + + +
    +
    + +
    +
    +
    +

    + + test_package 0.0.1 + + • + + Dart + + • + + cc license + + +

    +
    +
    +
    + + + + + + + + + + + diff --git a/testing/test_package_docs/reexport_two/AUnicornClass/noSuchMethod.html b/testing/test_package_docs/reexport_two/AUnicornClass/noSuchMethod.html new file mode 100644 index 0000000000..361411c968 --- /dev/null +++ b/testing/test_package_docs/reexport_two/AUnicornClass/noSuchMethod.html @@ -0,0 +1,126 @@ + + + + + + + + noSuchMethod method - AUnicornClass class - reexport_two library - Dart API + + + + + + + + + + + + + +
    + +
    + +
    + +
    +
    + + + +
    +
    + dynamic + noSuchMethod(Invocation invocation) +
    +
    +

    Invoked when a non-existent method or property is accessed.

    +

    Classes can override noSuchMethod to provide custom behavior.

    +

    If a value is returned, it becomes the result of the original invocation.

    +

    The default behavior is to throw a NoSuchMethodError.

    +
    + + + +
    + + + +
    +
    + +
    +
    +
    +

    + + test_package 0.0.1 + + • + + Dart + + • + + cc license + + +

    +
    +
    +
    + + + + + + + + + + + diff --git a/testing/test_package_docs/reexport_two/AUnicornClass/operator_equals.html b/testing/test_package_docs/reexport_two/AUnicornClass/operator_equals.html new file mode 100644 index 0000000000..975be86a3b --- /dev/null +++ b/testing/test_package_docs/reexport_two/AUnicornClass/operator_equals.html @@ -0,0 +1,140 @@ + + + + + + + + operator == method - AUnicornClass class - reexport_two library - Dart API + + + + + + + + + + + + + +
    + +
    + +
    + +
    +
    + + + +
    +
    + bool + operator ==(other) +
    +
    +

    The equality operator.

    +

    The default behavior for all Objects is to return true if and +only if this and other are the same object.

    +

    Override this method to specify a different equality relation on +a class. The overriding method must still be an equivalence relation. +That is, it must be:

    • +

      Total: It must return a boolean for all arguments. It should never throw +or return null.

    • +

      Reflexive: For all objects o, o == o must be true.

    • +

      Symmetric: For all objects o1 and o2, o1 == o2 and o2 == o1 must +either both be true, or both be false.

    • +

      Transitive: For all objects o1, o2, and o3, if o1 == o2 and +o2 == o3 are true, then o1 == o3 must be true.

    +

    The method should also be consistent over time, +so whether two objects are equal should only change +if at least one of the objects was modified.

    +

    If a subclass overrides the equality operator it should override +the hashCode method as well to maintain consistency.

    +
    + + + +
    + + + +
    +
    + +
    +
    +
    +

    + + test_package 0.0.1 + + • + + Dart + + • + + cc license + + +

    +
    +
    +
    + + + + + + + + + + + diff --git a/testing/test_package_docs/reexport_two/AUnicornClass/runtimeType.html b/testing/test_package_docs/reexport_two/AUnicornClass/runtimeType.html new file mode 100644 index 0000000000..c3b089b267 --- /dev/null +++ b/testing/test_package_docs/reexport_two/AUnicornClass/runtimeType.html @@ -0,0 +1,128 @@ + + + + + + + + runtimeType property - AUnicornClass class - reexport_two library - Dart API + + + + + + + + + + + + + +
    + +
    + +
    + +
    +
    + + + +
    + + +
    + +
    + Type + runtimeType
    + +
    +

    A representation of the runtime type of the object.

    +
    +
    + + + +
    + + + +
    +
    + +
    +
    +
    +

    + + test_package 0.0.1 + + • + + Dart + + • + + cc license + + +

    +
    +
    +
    + + + + + + + + + + + diff --git a/testing/test_package_docs/reexport_two/AUnicornClass/toString.html b/testing/test_package_docs/reexport_two/AUnicornClass/toString.html new file mode 100644 index 0000000000..e4cec730d8 --- /dev/null +++ b/testing/test_package_docs/reexport_two/AUnicornClass/toString.html @@ -0,0 +1,123 @@ + + + + + + + + toString method - AUnicornClass class - reexport_two library - Dart API + + + + + + + + + + + + + +
    + +
    + +
    + +
    +
    + + + +
    +
    + String + toString() +
    +
    +

    Returns a string representation of this object.

    +
    + + + +
    + + + +
    +
    + +
    +
    +
    +

    + + test_package 0.0.1 + + • + + Dart + + • + + cc license + + +

    +
    +
    +
    + + + + + + + + + + + diff --git a/testing/test_package_docs/reexport_two/SomeClass-class.html b/testing/test_package_docs/reexport_two/SomeClass-class.html new file mode 100644 index 0000000000..b22bf111e0 --- /dev/null +++ b/testing/test_package_docs/reexport_two/SomeClass-class.html @@ -0,0 +1,206 @@ + + + + + + + + SomeClass class - reexport_two library - Dart API + + + + + + + + + + + + + +
    + +
    + +
    + +
    +
    + + + +
    + + + +
    +

    Constructors

    + +
    +
    + SomeClass() +
    +
    + +
    +
    +
    + +
    +

    Properties

    + +
    +
    + hashCode + → int +
    +
    + The hash code for this object. +
    read-only, inherited
    +
    +
    + runtimeType + → Type +
    +
    + A representation of the runtime type of the object. +
    read-only, inherited
    +
    +
    +
    + +
    +

    Methods

    +
    +
    + noSuchMethod(Invocation invocation) + → dynamic + +
    +
    + Invoked when a non-existent method or property is accessed. +
    inherited
    +
    +
    + toString() + → String + +
    +
    + Returns a string representation of this object. +
    inherited
    +
    +
    +
    + +
    +

    Operators

    +
    +
    + operator ==(other) + → bool + +
    +
    + The equality operator. +
    inherited
    +
    +
    +
    + + + + +
    + + + +
    +
    + +
    +
    +
    +

    + + test_package 0.0.1 + + • + + Dart + + • + + cc license + + +

    +
    +
    +
    + + + + + + + + + + + diff --git a/testing/test_package_docs/reexport_two/SomeClass/SomeClass.html b/testing/test_package_docs/reexport_two/SomeClass/SomeClass.html new file mode 100644 index 0000000000..9f994dbbe7 --- /dev/null +++ b/testing/test_package_docs/reexport_two/SomeClass/SomeClass.html @@ -0,0 +1,121 @@ + + + + + + + + SomeClass constructor - SomeClass class - reexport_two library - Dart API + + + + + + + + + + + + + +
    + +
    + +
    + +
    +
    + + + +
    +
    + + SomeClass() +
    + + + + +
    + + + +
    +
    + +
    +
    +
    +

    + + test_package 0.0.1 + + • + + Dart + + • + + cc license + + +

    +
    +
    +
    + + + + + + + + + + + diff --git a/testing/test_package_docs/reexport_two/SomeClass/hashCode.html b/testing/test_package_docs/reexport_two/SomeClass/hashCode.html new file mode 100644 index 0000000000..211f005d85 --- /dev/null +++ b/testing/test_package_docs/reexport_two/SomeClass/hashCode.html @@ -0,0 +1,149 @@ + + + + + + + + hashCode property - SomeClass class - reexport_two library - Dart API + + + + + + + + + + + + + +
    + +
    + +
    + +
    +
    + + + +
    + + +
    + +
    + int + hashCode
    + +
    +

    The hash code for this object.

    +

    A hash code is a single integer which represents the state of the object +that affects == comparisons.

    +

    All objects have hash codes. +The default hash code represents only the identity of the object, +the same way as the default == implementation only considers objects +equal if they are identical (see identityHashCode).

    +

    If == is overridden to use the object state instead, +the hash code must also be changed to represent that state.

    +

    Hash codes must be the same for objects that are equal to each other +according to ==. +The hash code of an object should only change if the object changes +in a way that affects equality. +There are no further requirements for the hash codes. +They need not be consistent between executions of the same program +and there are no distribution guarantees.

    +

    Objects that are not equal are allowed to have the same hash code, +it is even technically allowed that all instances have the same hash code, +but if clashes happen too often, it may reduce the efficiency of hash-based +data structures like HashSet or HashMap.

    +

    If a subclass overrides hashCode, it should override the +== operator as well to maintain consistency.

    +
    +
    + + + +
    + + + +
    +
    + +
    +
    +
    +

    + + test_package 0.0.1 + + • + + Dart + + • + + cc license + + +

    +
    +
    +
    + + + + + + + + + + + diff --git a/testing/test_package_docs/reexport_two/SomeClass/noSuchMethod.html b/testing/test_package_docs/reexport_two/SomeClass/noSuchMethod.html new file mode 100644 index 0000000000..1edeec596b --- /dev/null +++ b/testing/test_package_docs/reexport_two/SomeClass/noSuchMethod.html @@ -0,0 +1,126 @@ + + + + + + + + noSuchMethod method - SomeClass class - reexport_two library - Dart API + + + + + + + + + + + + + +
    + +
    + +
    + +
    +
    + + + +
    +
    + dynamic + noSuchMethod(Invocation invocation) +
    +
    +

    Invoked when a non-existent method or property is accessed.

    +

    Classes can override noSuchMethod to provide custom behavior.

    +

    If a value is returned, it becomes the result of the original invocation.

    +

    The default behavior is to throw a NoSuchMethodError.

    +
    + + + +
    + + + +
    +
    + +
    +
    +
    +

    + + test_package 0.0.1 + + • + + Dart + + • + + cc license + + +

    +
    +
    +
    + + + + + + + + + + + diff --git a/testing/test_package_docs/reexport_two/SomeClass/operator_equals.html b/testing/test_package_docs/reexport_two/SomeClass/operator_equals.html new file mode 100644 index 0000000000..75e6460c62 --- /dev/null +++ b/testing/test_package_docs/reexport_two/SomeClass/operator_equals.html @@ -0,0 +1,140 @@ + + + + + + + + operator == method - SomeClass class - reexport_two library - Dart API + + + + + + + + + + + + + +
    + +
    + +
    + +
    +
    + + + +
    +
    + bool + operator ==(other) +
    +
    +

    The equality operator.

    +

    The default behavior for all Objects is to return true if and +only if this and other are the same object.

    +

    Override this method to specify a different equality relation on +a class. The overriding method must still be an equivalence relation. +That is, it must be:

    • +

      Total: It must return a boolean for all arguments. It should never throw +or return null.

    • +

      Reflexive: For all objects o, o == o must be true.

    • +

      Symmetric: For all objects o1 and o2, o1 == o2 and o2 == o1 must +either both be true, or both be false.

    • +

      Transitive: For all objects o1, o2, and o3, if o1 == o2 and +o2 == o3 are true, then o1 == o3 must be true.

    +

    The method should also be consistent over time, +so whether two objects are equal should only change +if at least one of the objects was modified.

    +

    If a subclass overrides the equality operator it should override +the hashCode method as well to maintain consistency.

    +
    + + + +
    + + + +
    +
    + +
    +
    +
    +

    + + test_package 0.0.1 + + • + + Dart + + • + + cc license + + +

    +
    +
    +
    + + + + + + + + + + + diff --git a/testing/test_package_docs/reexport_two/SomeClass/runtimeType.html b/testing/test_package_docs/reexport_two/SomeClass/runtimeType.html new file mode 100644 index 0000000000..4188c08c13 --- /dev/null +++ b/testing/test_package_docs/reexport_two/SomeClass/runtimeType.html @@ -0,0 +1,128 @@ + + + + + + + + runtimeType property - SomeClass class - reexport_two library - Dart API + + + + + + + + + + + + + +
    + +
    + +
    + +
    +
    + + + +
    + + +
    + +
    + Type + runtimeType
    + +
    +

    A representation of the runtime type of the object.

    +
    +
    + + + +
    + + + +
    +
    + +
    +
    +
    +

    + + test_package 0.0.1 + + • + + Dart + + • + + cc license + + +

    +
    +
    +
    + + + + + + + + + + + diff --git a/testing/test_package_docs/reexport_two/SomeClass/toString.html b/testing/test_package_docs/reexport_two/SomeClass/toString.html new file mode 100644 index 0000000000..d8cf559add --- /dev/null +++ b/testing/test_package_docs/reexport_two/SomeClass/toString.html @@ -0,0 +1,123 @@ + + + + + + + + toString method - SomeClass class - reexport_two library - Dart API + + + + + + + + + + + + + +
    + +
    + +
    + +
    +
    + + + +
    +
    + String + toString() +
    +
    +

    Returns a string representation of this object.

    +
    + + + +
    + + + +
    +
    + +
    +
    +
    +

    + + test_package 0.0.1 + + • + + Dart + + • + + cc license + + +

    +
    +
    +
    + + + + + + + + + + + diff --git a/testing/test_package_docs/reexport_two/YetAnotherClass-class.html b/testing/test_package_docs/reexport_two/YetAnotherClass-class.html new file mode 100644 index 0000000000..3263e1a49c --- /dev/null +++ b/testing/test_package_docs/reexport_two/YetAnotherClass-class.html @@ -0,0 +1,206 @@ + + + + + + + + YetAnotherClass class - reexport_two library - Dart API + + + + + + + + + + + + + +
    + +
    + +
    + +
    +
    + + + +
    + + + +
    +

    Constructors

    + +
    +
    + YetAnotherClass() +
    +
    + +
    +
    +
    + +
    +

    Properties

    + +
    +
    + hashCode + → int +
    +
    + The hash code for this object. +
    read-only, inherited
    +
    +
    + runtimeType + → Type +
    +
    + A representation of the runtime type of the object. +
    read-only, inherited
    +
    +
    +
    + +
    +

    Methods

    +
    +
    + noSuchMethod(Invocation invocation) + → dynamic + +
    +
    + Invoked when a non-existent method or property is accessed. +
    inherited
    +
    +
    + toString() + → String + +
    +
    + Returns a string representation of this object. +
    inherited
    +
    +
    +
    + +
    +

    Operators

    +
    +
    + operator ==(other) + → bool + +
    +
    + The equality operator. +
    inherited
    +
    +
    +
    + + + + +
    + + + +
    +
    + +
    +
    +
    +

    + + test_package 0.0.1 + + • + + Dart + + • + + cc license + + +

    +
    +
    +
    + + + + + + + + + + + diff --git a/testing/test_package_docs/reexport_two/YetAnotherClass/YetAnotherClass.html b/testing/test_package_docs/reexport_two/YetAnotherClass/YetAnotherClass.html new file mode 100644 index 0000000000..4fb678fd36 --- /dev/null +++ b/testing/test_package_docs/reexport_two/YetAnotherClass/YetAnotherClass.html @@ -0,0 +1,121 @@ + + + + + + + + YetAnotherClass constructor - YetAnotherClass class - reexport_two library - Dart API + + + + + + + + + + + + + +
    + +
    + +
    + +
    +
    + + + +
    +
    + + YetAnotherClass() +
    + + + + +
    + + + +
    +
    + +
    +
    +
    +

    + + test_package 0.0.1 + + • + + Dart + + • + + cc license + + +

    +
    +
    +
    + + + + + + + + + + + diff --git a/testing/test_package_docs/reexport_two/YetAnotherClass/hashCode.html b/testing/test_package_docs/reexport_two/YetAnotherClass/hashCode.html new file mode 100644 index 0000000000..c30ee994d6 --- /dev/null +++ b/testing/test_package_docs/reexport_two/YetAnotherClass/hashCode.html @@ -0,0 +1,149 @@ + + + + + + + + hashCode property - YetAnotherClass class - reexport_two library - Dart API + + + + + + + + + + + + + +
    + +
    + +
    + +
    +
    + + + +
    + + +
    + +
    + int + hashCode
    + +
    +

    The hash code for this object.

    +

    A hash code is a single integer which represents the state of the object +that affects == comparisons.

    +

    All objects have hash codes. +The default hash code represents only the identity of the object, +the same way as the default == implementation only considers objects +equal if they are identical (see identityHashCode).

    +

    If == is overridden to use the object state instead, +the hash code must also be changed to represent that state.

    +

    Hash codes must be the same for objects that are equal to each other +according to ==. +The hash code of an object should only change if the object changes +in a way that affects equality. +There are no further requirements for the hash codes. +They need not be consistent between executions of the same program +and there are no distribution guarantees.

    +

    Objects that are not equal are allowed to have the same hash code, +it is even technically allowed that all instances have the same hash code, +but if clashes happen too often, it may reduce the efficiency of hash-based +data structures like HashSet or HashMap.

    +

    If a subclass overrides hashCode, it should override the +== operator as well to maintain consistency.

    +
    +
    + + + +
    + + + +
    +
    + +
    +
    +
    +

    + + test_package 0.0.1 + + • + + Dart + + • + + cc license + + +

    +
    +
    +
    + + + + + + + + + + + diff --git a/testing/test_package_docs/reexport_two/YetAnotherClass/noSuchMethod.html b/testing/test_package_docs/reexport_two/YetAnotherClass/noSuchMethod.html new file mode 100644 index 0000000000..037e296b98 --- /dev/null +++ b/testing/test_package_docs/reexport_two/YetAnotherClass/noSuchMethod.html @@ -0,0 +1,126 @@ + + + + + + + + noSuchMethod method - YetAnotherClass class - reexport_two library - Dart API + + + + + + + + + + + + + +
    + +
    + +
    + +
    +
    + + + +
    +
    + dynamic + noSuchMethod(Invocation invocation) +
    +
    +

    Invoked when a non-existent method or property is accessed.

    +

    Classes can override noSuchMethod to provide custom behavior.

    +

    If a value is returned, it becomes the result of the original invocation.

    +

    The default behavior is to throw a NoSuchMethodError.

    +
    + + + +
    + + + +
    +
    + +
    +
    +
    +

    + + test_package 0.0.1 + + • + + Dart + + • + + cc license + + +

    +
    +
    +
    + + + + + + + + + + + diff --git a/testing/test_package_docs/reexport_two/YetAnotherClass/operator_equals.html b/testing/test_package_docs/reexport_two/YetAnotherClass/operator_equals.html new file mode 100644 index 0000000000..0e81e86322 --- /dev/null +++ b/testing/test_package_docs/reexport_two/YetAnotherClass/operator_equals.html @@ -0,0 +1,140 @@ + + + + + + + + operator == method - YetAnotherClass class - reexport_two library - Dart API + + + + + + + + + + + + + +
    + +
    + +
    + +
    +
    + + + +
    +
    + bool + operator ==(other) +
    +
    +

    The equality operator.

    +

    The default behavior for all Objects is to return true if and +only if this and other are the same object.

    +

    Override this method to specify a different equality relation on +a class. The overriding method must still be an equivalence relation. +That is, it must be:

    • +

      Total: It must return a boolean for all arguments. It should never throw +or return null.

    • +

      Reflexive: For all objects o, o == o must be true.

    • +

      Symmetric: For all objects o1 and o2, o1 == o2 and o2 == o1 must +either both be true, or both be false.

    • +

      Transitive: For all objects o1, o2, and o3, if o1 == o2 and +o2 == o3 are true, then o1 == o3 must be true.

    +

    The method should also be consistent over time, +so whether two objects are equal should only change +if at least one of the objects was modified.

    +

    If a subclass overrides the equality operator it should override +the hashCode method as well to maintain consistency.

    +
    + + + +
    + + + +
    +
    + +
    +
    +
    +

    + + test_package 0.0.1 + + • + + Dart + + • + + cc license + + +

    +
    +
    +
    + + + + + + + + + + + diff --git a/testing/test_package_docs/reexport_two/YetAnotherClass/runtimeType.html b/testing/test_package_docs/reexport_two/YetAnotherClass/runtimeType.html new file mode 100644 index 0000000000..11cd546c47 --- /dev/null +++ b/testing/test_package_docs/reexport_two/YetAnotherClass/runtimeType.html @@ -0,0 +1,128 @@ + + + + + + + + runtimeType property - YetAnotherClass class - reexport_two library - Dart API + + + + + + + + + + + + + +
    + +
    + +
    + +
    +
    + + + +
    + + +
    + +
    + Type + runtimeType
    + +
    +

    A representation of the runtime type of the object.

    +
    +
    + + + +
    + + + +
    +
    + +
    +
    +
    +

    + + test_package 0.0.1 + + • + + Dart + + • + + cc license + + +

    +
    +
    +
    + + + + + + + + + + + diff --git a/testing/test_package_docs/reexport_two/YetAnotherClass/toString.html b/testing/test_package_docs/reexport_two/YetAnotherClass/toString.html new file mode 100644 index 0000000000..2cc8070577 --- /dev/null +++ b/testing/test_package_docs/reexport_two/YetAnotherClass/toString.html @@ -0,0 +1,123 @@ + + + + + + + + toString method - YetAnotherClass class - reexport_two library - Dart API + + + + + + + + + + + + + +
    + +
    + +
    + +
    +
    + + + +
    +
    + String + toString() +
    +
    +

    Returns a string representation of this object.

    +
    + + + +
    + + + +
    +
    + +
    +
    +
    +

    + + test_package 0.0.1 + + • + + Dart + + • + + cc license + + +

    +
    +
    +
    + + + + + + + + + + + diff --git a/testing/test_package_docs/reexport_two/reexport_two-library.html b/testing/test_package_docs/reexport_two/reexport_two-library.html new file mode 100644 index 0000000000..bbad81a6d2 --- /dev/null +++ b/testing/test_package_docs/reexport_two/reexport_two-library.html @@ -0,0 +1,162 @@ + + + + + + + + reexport_two library - Dart API + + + + + + + + + + + + + +
    + +
    + +
    + +
    +
    + + + +
    + +
    + +
    + +
    +

    Classes

    + +
    +
    + AUnicornClass +
    +
    + +
    +
    + SomeClass +
    +
    + +
    +
    + SomeOtherClass +
    +
    + +
    +
    + YetAnotherClass +
    +
    + +
    +
    +
    + + + + + + + +
    + + + +
    +
    + +
    +
    +
    +

    + + test_package 0.0.1 + + • + + Dart + + • + + cc license + + +

    +
    +
    +
    + + + + + + + + + + + diff --git a/testing/test_package_docs/src.mylib/Helper-class.html b/testing/test_package_docs/src.mylib/Helper-class.html new file mode 100644 index 0000000000..53d94c3df4 --- /dev/null +++ b/testing/test_package_docs/src.mylib/Helper-class.html @@ -0,0 +1,220 @@ + + + + + + + + Helper class - src.mylib library - Dart API + + + + + + + + + + + + + +
    + +
    + +
    + +
    +
    + + + +
    + +
    +

    Even unresolved references in the same library should be resolved +Apple +ex.B

    +
    + + +
    +

    Constructors

    + +
    +
    + Helper() +
    +
    + +
    +
    +
    + +
    +

    Properties

    + +
    +
    + hashCode + → int +
    +
    + The hash code for this object. +
    read-only, inherited
    +
    +
    + runtimeType + → Type +
    +
    + A representation of the runtime type of the object. +
    read-only, inherited
    +
    +
    +
    + +
    +

    Methods

    +
    +
    + getContents() + → String + +
    +
    + + +
    +
    + noSuchMethod(Invocation invocation) + → dynamic + +
    +
    + Invoked when a non-existent method or property is accessed. +
    inherited
    +
    +
    + toString() + → String + +
    +
    + Returns a string representation of this object. +
    inherited
    +
    +
    +
    + +
    +

    Operators

    +
    +
    + operator ==(other) + → bool + +
    +
    + The equality operator. +
    inherited
    +
    +
    +
    + + + + +
    + + + +
    +
    + +
    +
    +
    +

    + + test_package 0.0.1 + + • + + Dart + + • + + cc license + + +

    +
    +
    +
    + + + + + + + + + + + diff --git a/testing/test_package_docs/src.mylib/Helper/Helper.html b/testing/test_package_docs/src.mylib/Helper/Helper.html new file mode 100644 index 0000000000..94632119bb --- /dev/null +++ b/testing/test_package_docs/src.mylib/Helper/Helper.html @@ -0,0 +1,122 @@ + + + + + + + + Helper constructor - Helper class - src.mylib library - Dart API + + + + + + + + + + + + + +
    + +
    + +
    + +
    +
    + + + +
    +
    + + Helper() +
    + + + + +
    + + + +
    +
    + +
    +
    +
    +

    + + test_package 0.0.1 + + • + + Dart + + • + + cc license + + +

    +
    +
    +
    + + + + + + + + + + + diff --git a/testing/test_package_docs/src.mylib/Helper/getContents.html b/testing/test_package_docs/src.mylib/Helper/getContents.html new file mode 100644 index 0000000000..2eedc4812f --- /dev/null +++ b/testing/test_package_docs/src.mylib/Helper/getContents.html @@ -0,0 +1,121 @@ + + + + + + + + getContents method - Helper class - src.mylib library - Dart API + + + + + + + + + + + + + +
    + +
    + +
    + +
    +
    + + + +
    +
    + String + getContents() +
    + + + +
    + + + +
    +
    + +
    +
    +
    +

    + + test_package 0.0.1 + + • + + Dart + + • + + cc license + + +

    +
    +
    +
    + + + + + + + + + + + diff --git a/testing/test_package_docs/src.mylib/Helper/hashCode.html b/testing/test_package_docs/src.mylib/Helper/hashCode.html new file mode 100644 index 0000000000..50d3b8d41e --- /dev/null +++ b/testing/test_package_docs/src.mylib/Helper/hashCode.html @@ -0,0 +1,150 @@ + + + + + + + + hashCode property - Helper class - src.mylib library - Dart API + + + + + + + + + + + + + +
    + +
    + +
    + +
    +
    + + + +
    + + +
    + +
    + int + hashCode
    + +
    +

    The hash code for this object.

    +

    A hash code is a single integer which represents the state of the object +that affects == comparisons.

    +

    All objects have hash codes. +The default hash code represents only the identity of the object, +the same way as the default == implementation only considers objects +equal if they are identical (see identityHashCode).

    +

    If == is overridden to use the object state instead, +the hash code must also be changed to represent that state.

    +

    Hash codes must be the same for objects that are equal to each other +according to ==. +The hash code of an object should only change if the object changes +in a way that affects equality. +There are no further requirements for the hash codes. +They need not be consistent between executions of the same program +and there are no distribution guarantees.

    +

    Objects that are not equal are allowed to have the same hash code, +it is even technically allowed that all instances have the same hash code, +but if clashes happen too often, it may reduce the efficiency of hash-based +data structures like HashSet or HashMap.

    +

    If a subclass overrides hashCode, it should override the +== operator as well to maintain consistency.

    +
    +
    + + + +
    + + + +
    +
    + +
    +
    +
    +

    + + test_package 0.0.1 + + • + + Dart + + • + + cc license + + +

    +
    +
    +
    + + + + + + + + + + + diff --git a/testing/test_package_docs/src.mylib/Helper/noSuchMethod.html b/testing/test_package_docs/src.mylib/Helper/noSuchMethod.html new file mode 100644 index 0000000000..22170a9b8a --- /dev/null +++ b/testing/test_package_docs/src.mylib/Helper/noSuchMethod.html @@ -0,0 +1,127 @@ + + + + + + + + noSuchMethod method - Helper class - src.mylib library - Dart API + + + + + + + + + + + + + +
    + +
    + +
    + +
    +
    + + + +
    +
    + dynamic + noSuchMethod(Invocation invocation) +
    +
    +

    Invoked when a non-existent method or property is accessed.

    +

    Classes can override noSuchMethod to provide custom behavior.

    +

    If a value is returned, it becomes the result of the original invocation.

    +

    The default behavior is to throw a NoSuchMethodError.

    +
    + + + +
    + + + +
    +
    + +
    +
    +
    +

    + + test_package 0.0.1 + + • + + Dart + + • + + cc license + + +

    +
    +
    +
    + + + + + + + + + + + diff --git a/testing/test_package_docs/src.mylib/Helper/operator_equals.html b/testing/test_package_docs/src.mylib/Helper/operator_equals.html new file mode 100644 index 0000000000..03e44dc1ac --- /dev/null +++ b/testing/test_package_docs/src.mylib/Helper/operator_equals.html @@ -0,0 +1,141 @@ + + + + + + + + operator == method - Helper class - src.mylib library - Dart API + + + + + + + + + + + + + +
    + +
    + +
    + +
    +
    + + + +
    +
    + bool + operator ==(other) +
    +
    +

    The equality operator.

    +

    The default behavior for all Objects is to return true if and +only if this and other are the same object.

    +

    Override this method to specify a different equality relation on +a class. The overriding method must still be an equivalence relation. +That is, it must be:

    • +

      Total: It must return a boolean for all arguments. It should never throw +or return null.

    • +

      Reflexive: For all objects o, o == o must be true.

    • +

      Symmetric: For all objects o1 and o2, o1 == o2 and o2 == o1 must +either both be true, or both be false.

    • +

      Transitive: For all objects o1, o2, and o3, if o1 == o2 and +o2 == o3 are true, then o1 == o3 must be true.

    +

    The method should also be consistent over time, +so whether two objects are equal should only change +if at least one of the objects was modified.

    +

    If a subclass overrides the equality operator it should override +the hashCode method as well to maintain consistency.

    +
    + + + +
    + + + +
    +
    + +
    +
    +
    +

    + + test_package 0.0.1 + + • + + Dart + + • + + cc license + + +

    +
    +
    +
    + + + + + + + + + + + diff --git a/testing/test_package_docs/src.mylib/Helper/runtimeType.html b/testing/test_package_docs/src.mylib/Helper/runtimeType.html new file mode 100644 index 0000000000..5ea44c1640 --- /dev/null +++ b/testing/test_package_docs/src.mylib/Helper/runtimeType.html @@ -0,0 +1,129 @@ + + + + + + + + runtimeType property - Helper class - src.mylib library - Dart API + + + + + + + + + + + + + +
    + +
    + +
    + +
    +
    + + + +
    + + +
    + +
    + Type + runtimeType
    + +
    +

    A representation of the runtime type of the object.

    +
    +
    + + + +
    + + + +
    +
    + +
    +
    +
    +

    + + test_package 0.0.1 + + • + + Dart + + • + + cc license + + +

    +
    +
    +
    + + + + + + + + + + + diff --git a/testing/test_package_docs/src.mylib/Helper/toString.html b/testing/test_package_docs/src.mylib/Helper/toString.html new file mode 100644 index 0000000000..a28f728fe4 --- /dev/null +++ b/testing/test_package_docs/src.mylib/Helper/toString.html @@ -0,0 +1,124 @@ + + + + + + + + toString method - Helper class - src.mylib library - Dart API + + + + + + + + + + + + + +
    + +
    + +
    + +
    +
    + + + +
    +
    + String + toString() +
    +
    +

    Returns a string representation of this object.

    +
    + + + +
    + + + +
    +
    + +
    +
    +
    +

    + + test_package 0.0.1 + + • + + Dart + + • + + cc license + + +

    +
    +
    +
    + + + + + + + + + + + diff --git a/testing/test_package_docs/src.mylib/helperFunction.html b/testing/test_package_docs/src.mylib/helperFunction.html new file mode 100644 index 0000000000..b91f8328a7 --- /dev/null +++ b/testing/test_package_docs/src.mylib/helperFunction.html @@ -0,0 +1,112 @@ + + + + + + + + helperFunction function - src.mylib library - Dart API + + + + + + + + + + + + + +
    + +
    + +
    + +
    +
    + + + +
    + +
    + void + helperFunction(String message) +
    + + + +
    + + + +
    +
    + +
    +
    +
    +

    + + test_package 0.0.1 + + • + + Dart + + • + + cc license + + +

    +
    +
    +
    + + + + + + + + + + + diff --git a/testing/test_package_docs/src.mylib/src.mylib-library.html b/testing/test_package_docs/src.mylib/src.mylib-library.html new file mode 100644 index 0000000000..163031d6d8 --- /dev/null +++ b/testing/test_package_docs/src.mylib/src.mylib-library.html @@ -0,0 +1,157 @@ + + + + + + + + src.mylib library - Dart API + + + + + + + + + + + + + +
    + +
    + +
    + +
    +
    + + + +
    + + +
    +

    Classes

    + +
    +
    + Helper +
    +
    + Even unresolved references in the same library should be resolved +Apple +ex.B +
    +
    +
    + + + +
    +

    Functions

    + +
    +
    + helperFunction(String message) + → void + +
    +
    + + +
    +
    +
    + + + + +
    + + + +
    +
    + +
    +
    +
    +

    + + test_package 0.0.1 + + • + + Dart + + • + + cc license + + +

    +
    +
    +
    + + + + + + + + + + + From 24e883ffed6e3fd1b15bfa98cb88aab04268c9ef Mon Sep 17 00:00:00 2001 From: Janice Collins Date: Fri, 2 Jun 2017 15:02:51 -0700 Subject: [PATCH 10/19] dartfmt --- bin/dartdoc.dart | 6 +- lib/src/model.dart | 135 ++++++++++++++-------- test/model_test.dart | 58 +++++----- testing/test_package/lib/src/somelib.dart | 3 + 4 files changed, 125 insertions(+), 77 deletions(-) diff --git a/bin/dartdoc.dart b/bin/dartdoc.dart index a5f4884624..fdc111831e 100644 --- a/bin/dartdoc.dart +++ b/bin/dartdoc.dart @@ -164,7 +164,8 @@ main(List arguments) async { sdkVersion: sdk.sdkVersion, autoIncludeDependencies: args['auto-include-dependencies'], categoryOrder: args['category-order'], - reexportMinConfidence: double.parse(args['ambiguous-reexport-scorer-min-confidence']), + reexportMinConfidence: + double.parse(args['ambiguous-reexport-scorer-min-confidence']), verboseWarnings: args['verbose-warnings'] as bool); DartDoc dartdoc = new DartDoc(inputDir, excludeLibraries, sdkDir, generators, @@ -270,8 +271,7 @@ ArgParser _createArgsParser() { 'Minimum scorer confidence to suppress warning on ambiguous reexport.', defaultsTo: "0.1"); parser.addFlag('verbose-warnings', - help: - 'Display extra debugging information and help with warnings.', + help: 'Display extra debugging information and help with warnings.', negatable: true, defaultsTo: true); return parser; diff --git a/lib/src/model.dart b/lib/src/model.dart index 86d5f04594..bfd4a4d66b 100644 --- a/lib/src/model.dart +++ b/lib/src/model.dart @@ -185,11 +185,18 @@ class Accessor extends ModelElement bool get isCanonical => enclosingCombo.isCanonical; @override - void warn(PackageWarning kind, {String message, Locatable referredFrom, List extendedDebug}) { + void warn(PackageWarning kind, + {String message, Locatable referredFrom, List extendedDebug}) { if (enclosingCombo != null) { - enclosingCombo.warn(kind, message: message, referredFrom: referredFrom, extendedDebug: extendedDebug); + enclosingCombo.warn(kind, + message: message, + referredFrom: referredFrom, + extendedDebug: extendedDebug); } else { - super.warn(kind, message: message, referredFrom: referredFrom, extendedDebug: extendedDebug); + super.warn(kind, + message: message, + referredFrom: referredFrom, + extendedDebug: extendedDebug); } } @@ -1303,6 +1310,7 @@ class Library extends ModelElement { } List _allOriginalModelElementNames; + /// [allModelElements] resolved to their original names. /// /// A collection of [ModelElement.fullyQualifiedNames] for [ModelElement]s @@ -1313,7 +1321,8 @@ class Library extends ModelElement { if (_allOriginalModelElementNames == null) { _allOriginalModelElementNames = allModelElements.map((e) { return new ModelElement.from( - e.element, package.findOrCreateLibraryFor(e.element)).fullyQualifiedName; + e.element, package.findOrCreateLibraryFor(e.element)) + .fullyQualifiedName; }).toList(); } return _allOriginalModelElementNames; @@ -1344,7 +1353,6 @@ class Library extends ModelElement { return _canonicalFor; } - /// Hide canonicalFor from doc while leaving a note to ourselves to /// help with ambiguous canonicalization determination. /// @@ -1670,7 +1678,8 @@ class Library extends ModelElement { allModelElements.where((e) => e.isCanonical).toList()); } - final Map_isReexportedBy = {}; + final Map _isReexportedBy = {}; + /// Heuristic that tries to guess if this library is actually largely /// reexported by some other library. We guess this by comparing the elements /// inside each of allModelElements for both libraries. Don't use this @@ -1684,13 +1693,17 @@ class Library extends ModelElement { /// If not, then the situation is either ambiguous, or the reverse is true. /// Computing this is expensive, so cache it. bool isReexportedBy(Library library) { - assert (package.allLibrariesAdded); + assert(package.allLibrariesAdded); if (_isReexportedBy.containsKey(library)) return _isReexportedBy[library]; - Set otherElements = new Set()..addAll(library.allModelElements.map((l) => l.element)); - Set ourElements = new Set()..addAll(allModelElements.map((l) => l.element)); - if (ourElements.difference(otherElements).length <= ourElements.length / 2) { + Set otherElements = new Set() + ..addAll(library.allModelElements.map((l) => l.element)); + Set ourElements = new Set() + ..addAll(allModelElements.map((l) => l.element)); + if (ourElements.difference(otherElements).length <= + ourElements.length / 2) { // Less than half of our elements are unique to us. - if (otherElements.difference(ourElements).length <= otherElements.length / 2) { + if (otherElements.difference(ourElements).length <= + otherElements.length / 2) { // ... but the same is true for the other library. Reexporting // is ambiguous. _isReexportedBy[library] = false; @@ -1810,9 +1823,11 @@ class Method extends ModelElement /// it is that this is the canonical element. class ScoredCandidate implements Comparable { final List reasons = []; + /// The ModelElement being scored. final ModelElement element; final Library library; + /// The score accumulated so far. Higher means it is more likely that this /// is is the double score = 0.0; @@ -1822,7 +1837,8 @@ class ScoredCandidate implements Comparable { void alterScore(double scoreDelta, String reason) { score += scoreDelta; if (scoreDelta != 0) { - reasons.add("${reason} (${scoreDelta >= 0 ? '+' : ''}${scoreDelta.toStringAsPrecision(4)})"); + reasons.add( + "${reason} (${scoreDelta >= 0 ? '+' : ''}${scoreDelta.toStringAsPrecision(4)})"); } } @@ -1838,7 +1854,6 @@ class ScoredCandidate implements Comparable { } } - /// This class is the foundation of Dartdoc's model for source code. /// All ModelElements are contained within a [Package], and laid out in a /// structure that mirrors the availability of identifiers in the various @@ -2000,13 +2015,16 @@ abstract class ModelElement implements Comparable, Nameable, Documentable { } Set get locationPieces { - return new Set()..addAll( - element.location.toString().split(_locationSplitter).where((s) => s.isNotEmpty)); + return new Set() + ..addAll(element.location + .toString() + .split(_locationSplitter) + .where((s) => s.isNotEmpty)); } Set get namePieces { - return new Set()..addAll( - name.split(_locationSplitter).where((s) => s.isNotEmpty)); + return new Set() + ..addAll(name.split(_locationSplitter).where((s) => s.isNotEmpty)); } // Use components of this element's location to return a score for library @@ -2020,6 +2038,7 @@ abstract class ModelElement implements Comparable, Nameable, Documentable { } } } + // Large boost for @canonicalFor, essentially overriding all other concerns. if (lib.canonicalFor.contains(fullyQualifiedName)) { scoredCandidate.alterScore(5.0, 'marked @canonicalFor'); @@ -2038,7 +2057,10 @@ abstract class ModelElement implements Comparable, Nameable, Documentable { assert(!locationPieces.isEmpty); if (locationPieces.isEmpty) return scoredCandidate; // The more pieces we have of the location in our library name, the more we should boost our score. - scoredCandidate.alterScore(lib.namePieces.intersection(locationPieces).length.toDouble() / locationPieces.length.toDouble(), 'element location shares parts with name'); + scoredCandidate.alterScore( + lib.namePieces.intersection(locationPieces).length.toDouble() / + locationPieces.length.toDouble(), + 'element location shares parts with name'); // If pieces of location at least start with elements of our library name, boost the score a little bit. double scoreBoost = 0.0; for (String piece in resplit(locationPieces)) { @@ -2048,7 +2070,8 @@ abstract class ModelElement implements Comparable, Nameable, Documentable { } } } - scoredCandidate.alterScore(scoreBoost, 'element location parts start with parts of name'); + scoredCandidate.alterScore( + scoreBoost, 'element location parts start with parts of name'); return scoredCandidate; } @@ -2115,7 +2138,6 @@ abstract class ModelElement implements Comparable, Nameable, Documentable { bool get canHaveParameters => element is ExecutableElement || element is FunctionTypeAliasElement; - /// Returns the docs, stripped of their leading comments syntax. ModelElement _documentationFrom; @@ -2169,7 +2191,8 @@ abstract class ModelElement implements Comparable, Nameable, Documentable { // Since we're looking for a library, find the [Element] immediately // contained by a [CompilationUnitElement] in the tree. Element topLevelElement = element; - while (topLevelElement != null && topLevelElement is! LibraryElement && + while (topLevelElement != null && + topLevelElement is! LibraryElement && topLevelElement.enclosingElement is! CompilationUnitElement) { topLevelElement = topLevelElement.enclosingElement; } @@ -2196,17 +2219,22 @@ abstract class ModelElement implements Comparable, Nameable, Documentable { // Heuristic scoring to determine which library a human likely // considers this element to be primarily 'from', and therefore, // canonical. Still warn if the heuristic isn't that confident. - List scoredCandidates = warnable.scoreCanonicalCandidates(candidateLibraries); - candidateLibraries = scoredCandidates.map((s) => s.library).toList(); - double secondHighestScore = scoredCandidates[scoredCandidates.length - 2].score; + List scoredCandidates = + warnable.scoreCanonicalCandidates(candidateLibraries); + candidateLibraries = + scoredCandidates.map((s) => s.library).toList(); + double secondHighestScore = + scoredCandidates[scoredCandidates.length - 2].score; double highestScore = scoredCandidates.last.score; double confidence = highestScore - secondHighestScore; - String message = "${candidateLibraries.map((l) => l.name)} -> ${candidateLibraries.last.name} (confidence ${confidence.toStringAsPrecision(4)})"; + String message = + "${candidateLibraries.map((l) => l.name)} -> ${candidateLibraries.last.name} (confidence ${confidence.toStringAsPrecision(4)})"; List debugLines = []; debugLines.addAll(scoredCandidates.map((s) => '${s.toString()}')); if (config == null || confidence < config.reexportMinConfidence) { - warnable.warn(PackageWarning.ambiguousReexport, message: message, extendedDebug: debugLines); + warnable.warn(PackageWarning.ambiguousReexport, + message: message, extendedDebug: debugLines); } } if (candidateLibraries.isNotEmpty) @@ -2487,9 +2515,12 @@ abstract class ModelElement implements Comparable, Nameable, Documentable { } @override - void warn(PackageWarning kind, {String message, Locatable referredFrom, List extendedDebug}) { + void warn(PackageWarning kind, + {String message, Locatable referredFrom, List extendedDebug}) { package.warnOnElement(this, kind, - message: message, referredFrom: referredFrom, extendedDebug: extendedDebug); + message: message, + referredFrom: referredFrom, + extendedDebug: extendedDebug); } String get _computeDocumentationComment => element.documentationComment; @@ -2973,7 +3004,8 @@ class PackageWarningHelpText { List longHelp; final PackageWarning warning; - PackageWarningHelpText(this.warning, this.warningName, this.shortHelp, [this.longHelp]) { + PackageWarningHelpText(this.warning, this.warningName, this.shortHelp, + [this.longHelp]) { if (this.longHelp == null) this.longHelp = []; } } @@ -2989,13 +3021,15 @@ Map packageWarningText = { PackageWarning.ambiguousReexport, "ambiguous-reexport", "A symbol is exported from private to public in more than one library and dartdoc can not determine which one is canonical", - ["Use {@canonicalFor @@name@@} in the desired library's documentation to resolve", - "the ambiguity and/or override dartdoc's decision, or structure your package ", - "so the reexport is less ambiguous. The symbol will still be referenced in ", - "all candidates -- this only controls the location where it will be written ", - "and which library will be displayed in navigation for the relevant pages.", - "The flag --ambiguous-reexport-scorer-min-confidence allows you to set the", - "threshold at which this warning will appear."]), + [ + "Use {@canonicalFor @@name@@} in the desired library's documentation to resolve", + "the ambiguity and/or override dartdoc's decision, or structure your package ", + "so the reexport is less ambiguous. The symbol will still be referenced in ", + "all candidates -- this only controls the location where it will be written ", + "and which library will be displayed in navigation for the relevant pages.", + "The flag --ambiguous-reexport-scorer-min-confidence allows you to set the", + "threshold at which this warning will appear." + ]), PackageWarning.ignoredCanonicalFor: new PackageWarningHelpText( PackageWarning.ignoredCanonicalFor, "ignored-canonical-for", @@ -3138,11 +3172,14 @@ class PackageWarningCounter { } if (toWrite != null) { buffer.write("\n ${toWrite}"); - if (_warningCounts[kind] == 1 && config.verboseWarnings && packageWarningText[kind].longHelp.isNotEmpty) { + if (_warningCounts[kind] == 1 && + config.verboseWarnings && + packageWarningText[kind].longHelp.isNotEmpty) { // First time we've seen this warning. Give a little extra info. final String separator = '\n '; final String nameSub = r'@@name@@'; - String verboseOut = '$separator${packageWarningText[kind].longHelp.join(separator)}'; + String verboseOut = + '$separator${packageWarningText[kind].longHelp.join(separator)}'; verboseOut = verboseOut.replaceAll(nameSub, name); buffer.write(verboseOut); } @@ -3288,8 +3325,12 @@ class Package implements Nameable, Documentable { PackageWarningCounter get packageWarningCounter => _packageWarningCounter; @override - void warn(PackageWarning kind, {String message, Locatable referredFrom, List extendedDebug}) { - warnOnElement(this, kind, message: message, referredFrom: referredFrom, extendedDebug: extendedDebug); + void warn(PackageWarning kind, + {String message, Locatable referredFrom, List extendedDebug}) { + warnOnElement(this, kind, + message: message, + referredFrom: referredFrom, + extendedDebug: extendedDebug); } /// Returns colon-stripped name and location of the given locatable. @@ -3410,13 +3451,12 @@ class Package implements Nameable, Documentable { fullMessage = messageParts.join('\n '); } - packageWarningCounter.addWarning( - warnable, kind, message, fullMessage); + packageWarningCounter.addWarning(warnable, kind, message, fullMessage); } Set get namePieces { - return new Set()..addAll( - name.split(_locationSplitter).where((s) => s.isNotEmpty)); + return new Set() + ..addAll(name.split(_locationSplitter).where((s) => s.isNotEmpty)); } static Package _withAutoIncludedDependencies( @@ -3445,8 +3485,8 @@ class Package implements Nameable, Documentable { }); if (libraryElements.length > startLength) - package = _withAutoIncludedDependencies( - libraryElements, packageMeta, options); + package = + _withAutoIncludedDependencies(libraryElements, packageMeta, options); options.autoFlush = true; package.flushWarnings; return package; @@ -3766,8 +3806,7 @@ class Package implements Nameable, Documentable { /// a documentation entry point (for elements that have no Library within the /// set of canonical Libraries). Library findOrCreateLibraryFor(Element e) { - if (e == null) - 1+1; + if (e == null) 1 + 1; // This is just a cache to avoid creating lots of libraries over and over. if (allLibraries.containsKey(e.library)) { return allLibraries[e.library]; diff --git a/test/model_test.dart b/test/model_test.dart index 06b09e388a..38baeb2cb3 100644 --- a/test/model_test.dart +++ b/test/model_test.dart @@ -125,7 +125,12 @@ void main() { }); group('Library', () { - Library dartAsyncLib, anonLib, isDeprecated, someLib, reexportOneLib, reexportTwoLib; + Library dartAsyncLib, + anonLib, + isDeprecated, + someLib, + reexportOneLib, + reexportTwoLib; Class SomeClass, SomeOtherClass, YetAnotherClass, AUnicornClass; setUp(() { @@ -139,10 +144,10 @@ void main() { someLib = package.allLibraries.values .firstWhere((lib) => lib.name == 'reexport.somelib'); - reexportOneLib = package.libraries - .firstWhere((lib) => lib.name == 'reexport_one'); - reexportTwoLib = package.libraries - .firstWhere((lib) => lib.name == 'reexport_two'); + reexportOneLib = + package.libraries.firstWhere((lib) => lib.name == 'reexport_one'); + reexportTwoLib = + package.libraries.firstWhere((lib) => lib.name == 'reexport_two'); SomeClass = someLib.getClassByName('SomeClass'); SomeOtherClass = someLib.getClassByName('SomeOtherClass'); YetAnotherClass = someLib.getClassByName('YetAnotherClass'); @@ -232,31 +237,32 @@ void main() { }); test('with ambiguous reexport warnings', () { - final warningMsg = '(reexport_one, reexport_two) -> reexport_two (confidence 0.000)'; + final warningMsg = + '(reexport_one, reexport_two) -> reexport_two (confidence 0.000)'; // Unicorn class has a warning because two @canonicalFors cancel each other out. - expect(package.packageWarningCounter.hasWarning( - AUnicornClass, - PackageWarning.ambiguousReexport, - warningMsg), isTrue); + expect( + package.packageWarningCounter.hasWarning( + AUnicornClass, PackageWarning.ambiguousReexport, warningMsg), + isTrue); // This class is ambiguous without a @canonicalFor - expect(package.packageWarningCounter.hasWarning( - YetAnotherClass, - PackageWarning.ambiguousReexport, - warningMsg), isTrue); + expect( + package.packageWarningCounter.hasWarning( + YetAnotherClass, PackageWarning.ambiguousReexport, warningMsg), + isTrue); // These two classes have a @canonicalFor - expect(package.packageWarningCounter.hasWarning( - SomeClass, - PackageWarning.ambiguousReexport, - warningMsg), isFalse); - expect(package.packageWarningCounter.hasWarning( - SomeOtherClass, - PackageWarning.ambiguousReexport, - warningMsg), isFalse); + expect( + package.packageWarningCounter.hasWarning( + SomeClass, PackageWarning.ambiguousReexport, warningMsg), + isFalse); + expect( + package.packageWarningCounter.hasWarning( + SomeOtherClass, PackageWarning.ambiguousReexport, warningMsg), + isFalse); // This library has a canonicalFor with no corresponding item - expect(package.packageWarningCounter.hasWarning( - reexportTwoLib, - PackageWarning.ignoredCanonicalFor, - 'something.ThatDoesntExist'), isTrue); + expect( + package.packageWarningCounter.hasWarning(reexportTwoLib, + PackageWarning.ignoredCanonicalFor, 'something.ThatDoesntExist'), + isTrue); }); test('@canonicalFor directive works', () { diff --git a/testing/test_package/lib/src/somelib.dart b/testing/test_package/lib/src/somelib.dart index e5ab132ef6..c5243040c8 100644 --- a/testing/test_package/lib/src/somelib.dart +++ b/testing/test_package/lib/src/somelib.dart @@ -1,6 +1,9 @@ library reexport.somelib; class SomeClass {} + class SomeOtherClass {} + class YetAnotherClass {} + class AUnicornClass {} From c3de1bd035e9eef61aeca3b70adcff45161fd735 Mon Sep 17 00:00:00 2001 From: Janice Collins Date: Fri, 2 Jun 2017 15:44:40 -0700 Subject: [PATCH 11/19] Comment typo. --- lib/src/model.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/src/model.dart b/lib/src/model.dart index bfd4a4d66b..636a2a9553 100644 --- a/lib/src/model.dart +++ b/lib/src/model.dart @@ -1829,7 +1829,7 @@ class ScoredCandidate implements Comparable { final Library library; /// The score accumulated so far. Higher means it is more likely that this - /// is is the + /// is the intended canonical Library. double score = 0.0; ScoredCandidate(this.element, this.library); From d997568362e36a2e25dd96697bee7ed41449f79e Mon Sep 17 00:00:00 2001 From: Janice Collins Date: Mon, 5 Jun 2017 08:43:06 -0700 Subject: [PATCH 12/19] Fix --auto-include-deps --- lib/src/model.dart | 2 ++ lib/src/model_utils.dart | 22 +++++++++++++++++----- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/lib/src/model.dart b/lib/src/model.dart index 636a2a9553..a2ab0086b1 100644 --- a/lib/src/model.dart +++ b/lib/src/model.dart @@ -3478,6 +3478,8 @@ class Package implements Nameable, Documentable { !isPrivate(modelTypeElement.library.element) && modelTypeElement.library.canonicalLibrary == null && !libraryElements.contains(modelTypeElement.library.element)) { + if (modelTypeElement.library.element.name == 'src.mylib') + 1+1; libraryElements.add(modelTypeElement.library.element); } } diff --git a/lib/src/model_utils.dart b/lib/src/model_utils.dart index 897b2c31cb..43c0723deb 100644 --- a/lib/src/model_utils.dart +++ b/lib/src/model_utils.dart @@ -52,11 +52,23 @@ bool isInExportedLibraries( .any((lib) => lib == library || lib.exportedLibraries.contains(library)); } -bool isPrivate(Element e) => - e.name.startsWith('_') || - (e is LibraryElement && - (e.identifier == 'dart:_internal' || - e.identifier == 'dart:nativewrappers')); + +final RegExp slashes = new RegExp('[\/]'); +bool isPrivate(Element e) { + if (e.name.startsWith('_') || + (e is LibraryElement && + (e.identifier == 'dart:_internal' || + e.identifier == 'dart:nativewrappers'))) { + return true; + } + if (e is LibraryElement) { + List locationParts = e.location.components[0].split(slashes); + // TODO(jcollins-g): Implement real cross package detection + if (locationParts.length >= 2 && locationParts[0].startsWith('package:') && locationParts[1] == 'src') + return true; + } + return false; +} bool isPublic(Element e) { if (isPrivate(e)) return false; From 7ed0790b7056210933fc792efc1b47cb3d73e3e9 Mon Sep 17 00:00:00 2001 From: Janice Collins Date: Mon, 5 Jun 2017 09:38:58 -0700 Subject: [PATCH 13/19] cleanup --- lib/src/model.dart | 2 -- lib/src/model_utils.dart | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/lib/src/model.dart b/lib/src/model.dart index a2ab0086b1..636a2a9553 100644 --- a/lib/src/model.dart +++ b/lib/src/model.dart @@ -3478,8 +3478,6 @@ class Package implements Nameable, Documentable { !isPrivate(modelTypeElement.library.element) && modelTypeElement.library.canonicalLibrary == null && !libraryElements.contains(modelTypeElement.library.element)) { - if (modelTypeElement.library.element.name == 'src.mylib') - 1+1; libraryElements.add(modelTypeElement.library.element); } } diff --git a/lib/src/model_utils.dart b/lib/src/model_utils.dart index 43c0723deb..9fd1df92bd 100644 --- a/lib/src/model_utils.dart +++ b/lib/src/model_utils.dart @@ -52,7 +52,6 @@ bool isInExportedLibraries( .any((lib) => lib == library || lib.exportedLibraries.contains(library)); } - final RegExp slashes = new RegExp('[\/]'); bool isPrivate(Element e) { if (e.name.startsWith('_') || @@ -64,8 +63,9 @@ bool isPrivate(Element e) { if (e is LibraryElement) { List locationParts = e.location.components[0].split(slashes); // TODO(jcollins-g): Implement real cross package detection - if (locationParts.length >= 2 && locationParts[0].startsWith('package:') && locationParts[1] == 'src') - return true; + if (locationParts.length >= 2 && + locationParts[0].startsWith('package:') && + locationParts[1] == 'src') return true; } return false; } From 5bfff119bbb1fa943ce34fb4697ee5123c8b51ce Mon Sep 17 00:00:00 2001 From: Janice Collins Date: Mon, 5 Jun 2017 09:45:19 -0700 Subject: [PATCH 14/19] rebuild docs --- .../anonymous_library-library.html | 1 - .../another_anonymous_lib-library.html | 1 - .../code_in_comments-library.html | 1 - .../test_package_docs/css/css-library.html | 1 - .../test_package_docs/ex/Animal-class.html | 2 +- testing/test_package_docs/ex/Apple-class.html | 4 +- .../ex/Apple/paramFromExportLib.html | 2 +- testing/test_package_docs/ex/B-class.html | 4 +- .../test_package_docs/ex/COLOR-constant.html | 2 +- .../ex/COLOR_GREEN-constant.html | 2 +- .../ex/COLOR_ORANGE-constant.html | 2 +- .../ex/COMPLEX_COLOR-constant.html | 2 +- testing/test_package_docs/ex/Cat-class.html | 2 +- .../test_package_docs/ex/CatString-class.html | 2 +- .../ex/ConstantCat-class.html | 2 +- .../ex/Deprecated-class.html | 2 +- testing/test_package_docs/ex/Dog-class.html | 2 +- testing/test_package_docs/ex/E-class.html | 2 +- testing/test_package_docs/ex/F-class.html | 2 +- .../ex/ForAnnotation-class.html | 2 +- .../ex/HasAnnotation-class.html | 2 +- testing/test_package_docs/ex/Klass-class.html | 2 +- .../test_package_docs/ex/MY_CAT-constant.html | 2 +- .../test_package_docs/ex/MyError-class.html | 2 +- .../ex/MyErrorImplements-class.html | 2 +- .../ex/MyException-class.html | 2 +- .../ex/MyExceptionImplements-class.html | 2 +- .../ex/PRETTY_COLORS-constant.html | 2 +- .../ex/ParameterizedTypedef.html | 2 +- .../PublicClassExtendsPrivateClass-class.html | 2 +- ...ClassImplementsPrivateInterface-class.html | 2 +- .../test_package_docs/ex/ShapeType-class.html | 2 +- .../ex/SpecializedDuration-class.html | 2 +- .../ex/WithGeneric-class.html | 2 +- .../ex/WithGenericSub-class.html | 2 +- .../ex/aThingToDo-class.html | 2 +- .../ex/deprecated-constant.html | 2 +- .../test_package_docs/ex/deprecatedField.html | 2 +- .../ex/deprecatedGetter.html | 2 +- .../ex/deprecatedSetter.html | 2 +- testing/test_package_docs/ex/ex-library.html | 5 +- testing/test_package_docs/ex/function1.html | 2 +- .../test_package_docs/ex/genericFunction.html | 2 +- .../ex/incorrectDocReference-constant.html | 2 +- .../incorrectDocReferenceFromEx-constant.html | 2 +- testing/test_package_docs/ex/number.html | 2 +- .../test_package_docs/ex/processMessage.html | 2 +- testing/test_package_docs/ex/y.html | 2 +- .../test_package_docs/fake/fake-library.html | 1 - testing/test_package_docs/index.html | 7 - testing/test_package_docs/index.json | 194 +++++++-------- .../is_deprecated/is_deprecated-library.html | 1 - .../reexport_one/reexport_one-library.html | 1 - .../reexport_two/reexport_two-library.html | 1 - .../src.mylib/Helper-class.html | 220 ------------------ .../src.mylib/Helper/Helper.html | 122 ---------- .../src.mylib/Helper/getContents.html | 121 ---------- .../src.mylib/Helper/hashCode.html | 150 ------------ .../src.mylib/Helper/noSuchMethod.html | 127 ---------- .../src.mylib/Helper/operator_equals.html | 141 ----------- .../src.mylib/Helper/runtimeType.html | 129 ---------- .../src.mylib/Helper/toString.html | 124 ---------- .../src.mylib/helperFunction.html | 112 --------- .../src.mylib/src.mylib-library.html | 157 ------------- .../test_package_imported.main-library.html | 1 - .../two_exports/two_exports-library.html | 1 - 66 files changed, 135 insertions(+), 1574 deletions(-) delete mode 100644 testing/test_package_docs/src.mylib/Helper-class.html delete mode 100644 testing/test_package_docs/src.mylib/Helper/Helper.html delete mode 100644 testing/test_package_docs/src.mylib/Helper/getContents.html delete mode 100644 testing/test_package_docs/src.mylib/Helper/hashCode.html delete mode 100644 testing/test_package_docs/src.mylib/Helper/noSuchMethod.html delete mode 100644 testing/test_package_docs/src.mylib/Helper/operator_equals.html delete mode 100644 testing/test_package_docs/src.mylib/Helper/runtimeType.html delete mode 100644 testing/test_package_docs/src.mylib/Helper/toString.html delete mode 100644 testing/test_package_docs/src.mylib/helperFunction.html delete mode 100644 testing/test_package_docs/src.mylib/src.mylib-library.html diff --git a/testing/test_package_docs/anonymous_library/anonymous_library-library.html b/testing/test_package_docs/anonymous_library/anonymous_library-library.html index 22a3614894..89a80e679c 100644 --- a/testing/test_package_docs/anonymous_library/anonymous_library-library.html +++ b/testing/test_package_docs/anonymous_library/anonymous_library-library.html @@ -58,7 +58,6 @@
    package test_package
  • is_deprecated
  • reexport_one
  • reexport_two
  • -
  • src.mylib
  • test_package_imported.main
  • two_exports
  • diff --git a/testing/test_package_docs/another_anonymous_lib/another_anonymous_lib-library.html b/testing/test_package_docs/another_anonymous_lib/another_anonymous_lib-library.html index 1e55fdf112..2931344c58 100644 --- a/testing/test_package_docs/another_anonymous_lib/another_anonymous_lib-library.html +++ b/testing/test_package_docs/another_anonymous_lib/another_anonymous_lib-library.html @@ -58,7 +58,6 @@
    package test_package
  • is_deprecated
  • reexport_one
  • reexport_two
  • -
  • src.mylib
  • test_package_imported.main
  • two_exports
  • diff --git a/testing/test_package_docs/code_in_comments/code_in_comments-library.html b/testing/test_package_docs/code_in_comments/code_in_comments-library.html index fddbe82ccb..f1ff434edb 100644 --- a/testing/test_package_docs/code_in_comments/code_in_comments-library.html +++ b/testing/test_package_docs/code_in_comments/code_in_comments-library.html @@ -58,7 +58,6 @@
    package test_package
  • is_deprecated
  • reexport_one
  • reexport_two
  • -
  • src.mylib
  • test_package_imported.main
  • two_exports
  • diff --git a/testing/test_package_docs/css/css-library.html b/testing/test_package_docs/css/css-library.html index 3879d9aa17..8e1df865dd 100644 --- a/testing/test_package_docs/css/css-library.html +++ b/testing/test_package_docs/css/css-library.html @@ -58,7 +58,6 @@
    package test_package
  • is_deprecated
  • reexport_one
  • reexport_two
  • -
  • src.mylib
  • test_package_imported.main
  • two_exports
  • diff --git a/testing/test_package_docs/ex/Animal-class.html b/testing/test_package_docs/ex/Animal-class.html index 0384ed2bf2..771c9365fa 100644 --- a/testing/test_package_docs/ex/Animal-class.html +++ b/testing/test_package_docs/ex/Animal-class.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/Apple-class.html b/testing/test_package_docs/ex/Apple-class.html index 0a9dd798cd..a3590e5b7b 100644 --- a/testing/test_package_docs/ex/Apple-class.html +++ b/testing/test_package_docs/ex/Apple-class.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • @@ -229,7 +229,7 @@

    Methods

    - paramFromExportLib(Helper helper) + paramFromExportLib(Helper helper) → void
    diff --git a/testing/test_package_docs/ex/Apple/paramFromExportLib.html b/testing/test_package_docs/ex/Apple/paramFromExportLib.html index 67dd9ecebe..ca36f453ba 100644 --- a/testing/test_package_docs/ex/Apple/paramFromExportLib.html +++ b/testing/test_package_docs/ex/Apple/paramFromExportLib.html @@ -88,7 +88,7 @@
    class Apple
    void - paramFromExportLib(Helper helper) + paramFromExportLib(Helper helper)
    diff --git a/testing/test_package_docs/ex/B-class.html b/testing/test_package_docs/ex/B-class.html index b359ab2abb..1213936452 100644 --- a/testing/test_package_docs/ex/B-class.html +++ b/testing/test_package_docs/ex/B-class.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • @@ -290,7 +290,7 @@

    Methods

    inherited
    - paramFromExportLib(Helper helper) + paramFromExportLib(Helper helper) → void
    diff --git a/testing/test_package_docs/ex/COLOR-constant.html b/testing/test_package_docs/ex/COLOR-constant.html index 5275e1c36f..95981eb87e 100644 --- a/testing/test_package_docs/ex/COLOR-constant.html +++ b/testing/test_package_docs/ex/COLOR-constant.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/COLOR_GREEN-constant.html b/testing/test_package_docs/ex/COLOR_GREEN-constant.html index ddbc695858..4572b14adb 100644 --- a/testing/test_package_docs/ex/COLOR_GREEN-constant.html +++ b/testing/test_package_docs/ex/COLOR_GREEN-constant.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/COLOR_ORANGE-constant.html b/testing/test_package_docs/ex/COLOR_ORANGE-constant.html index a974c782ed..1fb700b099 100644 --- a/testing/test_package_docs/ex/COLOR_ORANGE-constant.html +++ b/testing/test_package_docs/ex/COLOR_ORANGE-constant.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/COMPLEX_COLOR-constant.html b/testing/test_package_docs/ex/COMPLEX_COLOR-constant.html index 8dfadf35cc..9735b3ec7a 100644 --- a/testing/test_package_docs/ex/COMPLEX_COLOR-constant.html +++ b/testing/test_package_docs/ex/COMPLEX_COLOR-constant.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/Cat-class.html b/testing/test_package_docs/ex/Cat-class.html index 553919e770..573b686196 100644 --- a/testing/test_package_docs/ex/Cat-class.html +++ b/testing/test_package_docs/ex/Cat-class.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/CatString-class.html b/testing/test_package_docs/ex/CatString-class.html index 12df3d3960..f0ceeb50b8 100644 --- a/testing/test_package_docs/ex/CatString-class.html +++ b/testing/test_package_docs/ex/CatString-class.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/ConstantCat-class.html b/testing/test_package_docs/ex/ConstantCat-class.html index 37195654e1..655f9688f4 100644 --- a/testing/test_package_docs/ex/ConstantCat-class.html +++ b/testing/test_package_docs/ex/ConstantCat-class.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/Deprecated-class.html b/testing/test_package_docs/ex/Deprecated-class.html index 489a2c8ab7..4132707cef 100644 --- a/testing/test_package_docs/ex/Deprecated-class.html +++ b/testing/test_package_docs/ex/Deprecated-class.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/Dog-class.html b/testing/test_package_docs/ex/Dog-class.html index 5ccaff36ce..cd4d90951f 100644 --- a/testing/test_package_docs/ex/Dog-class.html +++ b/testing/test_package_docs/ex/Dog-class.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/E-class.html b/testing/test_package_docs/ex/E-class.html index 8f86d78102..3190618016 100644 --- a/testing/test_package_docs/ex/E-class.html +++ b/testing/test_package_docs/ex/E-class.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/F-class.html b/testing/test_package_docs/ex/F-class.html index 6a6de82561..cc2f50dc7f 100644 --- a/testing/test_package_docs/ex/F-class.html +++ b/testing/test_package_docs/ex/F-class.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/ForAnnotation-class.html b/testing/test_package_docs/ex/ForAnnotation-class.html index b4643ccdfa..523cec56e8 100644 --- a/testing/test_package_docs/ex/ForAnnotation-class.html +++ b/testing/test_package_docs/ex/ForAnnotation-class.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/HasAnnotation-class.html b/testing/test_package_docs/ex/HasAnnotation-class.html index 9d825ff805..ce8fde9d84 100644 --- a/testing/test_package_docs/ex/HasAnnotation-class.html +++ b/testing/test_package_docs/ex/HasAnnotation-class.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/Klass-class.html b/testing/test_package_docs/ex/Klass-class.html index e182320196..05b7106fef 100644 --- a/testing/test_package_docs/ex/Klass-class.html +++ b/testing/test_package_docs/ex/Klass-class.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/MY_CAT-constant.html b/testing/test_package_docs/ex/MY_CAT-constant.html index 872355441b..06ca0d2bb6 100644 --- a/testing/test_package_docs/ex/MY_CAT-constant.html +++ b/testing/test_package_docs/ex/MY_CAT-constant.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/MyError-class.html b/testing/test_package_docs/ex/MyError-class.html index b89aeae089..ce1a92e4b3 100644 --- a/testing/test_package_docs/ex/MyError-class.html +++ b/testing/test_package_docs/ex/MyError-class.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/MyErrorImplements-class.html b/testing/test_package_docs/ex/MyErrorImplements-class.html index 877fe2409d..066fc84b61 100644 --- a/testing/test_package_docs/ex/MyErrorImplements-class.html +++ b/testing/test_package_docs/ex/MyErrorImplements-class.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/MyException-class.html b/testing/test_package_docs/ex/MyException-class.html index c75ada8de4..d49c5f0856 100644 --- a/testing/test_package_docs/ex/MyException-class.html +++ b/testing/test_package_docs/ex/MyException-class.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/MyExceptionImplements-class.html b/testing/test_package_docs/ex/MyExceptionImplements-class.html index 940aa7f819..bd3d1ed582 100644 --- a/testing/test_package_docs/ex/MyExceptionImplements-class.html +++ b/testing/test_package_docs/ex/MyExceptionImplements-class.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/PRETTY_COLORS-constant.html b/testing/test_package_docs/ex/PRETTY_COLORS-constant.html index 59936cc639..a70291e481 100644 --- a/testing/test_package_docs/ex/PRETTY_COLORS-constant.html +++ b/testing/test_package_docs/ex/PRETTY_COLORS-constant.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/ParameterizedTypedef.html b/testing/test_package_docs/ex/ParameterizedTypedef.html index a600a42642..a7a74b14dd 100644 --- a/testing/test_package_docs/ex/ParameterizedTypedef.html +++ b/testing/test_package_docs/ex/ParameterizedTypedef.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/PublicClassExtendsPrivateClass-class.html b/testing/test_package_docs/ex/PublicClassExtendsPrivateClass-class.html index b00c7440fb..7c556de546 100644 --- a/testing/test_package_docs/ex/PublicClassExtendsPrivateClass-class.html +++ b/testing/test_package_docs/ex/PublicClassExtendsPrivateClass-class.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/PublicClassImplementsPrivateInterface-class.html b/testing/test_package_docs/ex/PublicClassImplementsPrivateInterface-class.html index 30d761d4b7..9d6a30e52c 100644 --- a/testing/test_package_docs/ex/PublicClassImplementsPrivateInterface-class.html +++ b/testing/test_package_docs/ex/PublicClassImplementsPrivateInterface-class.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/ShapeType-class.html b/testing/test_package_docs/ex/ShapeType-class.html index 65e1a76301..1cce18d08c 100644 --- a/testing/test_package_docs/ex/ShapeType-class.html +++ b/testing/test_package_docs/ex/ShapeType-class.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/SpecializedDuration-class.html b/testing/test_package_docs/ex/SpecializedDuration-class.html index b8232a3b56..fc5db81322 100644 --- a/testing/test_package_docs/ex/SpecializedDuration-class.html +++ b/testing/test_package_docs/ex/SpecializedDuration-class.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/WithGeneric-class.html b/testing/test_package_docs/ex/WithGeneric-class.html index 53249376a4..d766c1b7af 100644 --- a/testing/test_package_docs/ex/WithGeneric-class.html +++ b/testing/test_package_docs/ex/WithGeneric-class.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/WithGenericSub-class.html b/testing/test_package_docs/ex/WithGenericSub-class.html index 792bf8dc14..4a79c2a6ad 100644 --- a/testing/test_package_docs/ex/WithGenericSub-class.html +++ b/testing/test_package_docs/ex/WithGenericSub-class.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/aThingToDo-class.html b/testing/test_package_docs/ex/aThingToDo-class.html index ac5b38cd59..adc12f5a9c 100644 --- a/testing/test_package_docs/ex/aThingToDo-class.html +++ b/testing/test_package_docs/ex/aThingToDo-class.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/deprecated-constant.html b/testing/test_package_docs/ex/deprecated-constant.html index e0b2493cff..d4e1344f19 100644 --- a/testing/test_package_docs/ex/deprecated-constant.html +++ b/testing/test_package_docs/ex/deprecated-constant.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/deprecatedField.html b/testing/test_package_docs/ex/deprecatedField.html index e01c1bab63..6fae627ed0 100644 --- a/testing/test_package_docs/ex/deprecatedField.html +++ b/testing/test_package_docs/ex/deprecatedField.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/deprecatedGetter.html b/testing/test_package_docs/ex/deprecatedGetter.html index 6b34aab9bc..1f69cf9bc0 100644 --- a/testing/test_package_docs/ex/deprecatedGetter.html +++ b/testing/test_package_docs/ex/deprecatedGetter.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/deprecatedSetter.html b/testing/test_package_docs/ex/deprecatedSetter.html index eb8d959288..5dc63b78b2 100644 --- a/testing/test_package_docs/ex/deprecatedSetter.html +++ b/testing/test_package_docs/ex/deprecatedSetter.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/ex-library.html b/testing/test_package_docs/ex/ex-library.html index 71ab27b28c..571a2090e3 100644 --- a/testing/test_package_docs/ex/ex-library.html +++ b/testing/test_package_docs/ex/ex-library.html @@ -58,7 +58,6 @@
    package test_package
  • is_deprecated
  • reexport_one
  • reexport_two
  • -
  • src.mylib
  • test_package_imported.main
  • two_exports
  • @@ -153,7 +152,7 @@

    Classes

    - Helper + Helper
    Even unresolved references in the same library should be resolved @@ -475,7 +474,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/function1.html b/testing/test_package_docs/ex/function1.html index 7da306e5f2..45d5ffd753 100644 --- a/testing/test_package_docs/ex/function1.html +++ b/testing/test_package_docs/ex/function1.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/genericFunction.html b/testing/test_package_docs/ex/genericFunction.html index 6cb83cb7a8..c1f86ec90d 100644 --- a/testing/test_package_docs/ex/genericFunction.html +++ b/testing/test_package_docs/ex/genericFunction.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/incorrectDocReference-constant.html b/testing/test_package_docs/ex/incorrectDocReference-constant.html index 8773005cef..d70c317f1b 100644 --- a/testing/test_package_docs/ex/incorrectDocReference-constant.html +++ b/testing/test_package_docs/ex/incorrectDocReference-constant.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/incorrectDocReferenceFromEx-constant.html b/testing/test_package_docs/ex/incorrectDocReferenceFromEx-constant.html index 8bfaea1346..9627b4250d 100644 --- a/testing/test_package_docs/ex/incorrectDocReferenceFromEx-constant.html +++ b/testing/test_package_docs/ex/incorrectDocReferenceFromEx-constant.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/number.html b/testing/test_package_docs/ex/number.html index ddfc3f989e..9c0cf5424a 100644 --- a/testing/test_package_docs/ex/number.html +++ b/testing/test_package_docs/ex/number.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/processMessage.html b/testing/test_package_docs/ex/processMessage.html index ef11302717..e2784e8068 100644 --- a/testing/test_package_docs/ex/processMessage.html +++ b/testing/test_package_docs/ex/processMessage.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/ex/y.html b/testing/test_package_docs/ex/y.html index b9d51809f2..a96c06f51d 100644 --- a/testing/test_package_docs/ex/y.html +++ b/testing/test_package_docs/ex/y.html @@ -62,7 +62,7 @@
    library ex
  • F
  • ForAnnotation
  • HasAnnotation
  • -
  • Helper
  • +
  • Helper
  • Klass
  • PublicClassExtendsPrivateClass
  • PublicClassImplementsPrivateInterface
  • diff --git a/testing/test_package_docs/fake/fake-library.html b/testing/test_package_docs/fake/fake-library.html index 51b0319bb9..04948eee6f 100644 --- a/testing/test_package_docs/fake/fake-library.html +++ b/testing/test_package_docs/fake/fake-library.html @@ -58,7 +58,6 @@
    package test_package
  • is_deprecated
  • reexport_one
  • reexport_two
  • -
  • src.mylib
  • test_package_imported.main
  • two_exports
  • diff --git a/testing/test_package_docs/index.html b/testing/test_package_docs/index.html index 2f6f47686f..0340e6fc46 100644 --- a/testing/test_package_docs/index.html +++ b/testing/test_package_docs/index.html @@ -56,7 +56,6 @@
    package test_package
  • is_deprecated
  • reexport_one
  • reexport_two
  • -
  • src.mylib
  • test_package_imported.main
  • two_exports
  • @@ -142,12 +141,6 @@

    Libraries

    -
    -
    - src.mylib -
    -
    -
    test_package_imported.main diff --git a/testing/test_package_docs/index.json b/testing/test_package_docs/index.json index 501e96f871..3ba526d744 100644 --- a/testing/test_package_docs/index.json +++ b/testing/test_package_docs/index.json @@ -1574,6 +1574,94 @@ "type": "class" } }, + { + "name": "Helper", + "qualifiedName": "ex.Helper", + "href": "ex/Helper-class.html", + "type": "class", + "overriddenDepth": 0, + "enclosedBy": { + "name": "ex", + "type": "library" + } + }, + { + "name": "Helper", + "qualifiedName": "ex.Helper", + "href": "ex/Helper/Helper.html", + "type": "constructor", + "overriddenDepth": 0, + "enclosedBy": { + "name": "Helper", + "type": "class" + } + }, + { + "name": "operator ==", + "qualifiedName": "ex.Helper.==", + "href": "ex/Helper/operator_equals.html", + "type": "method", + "overriddenDepth": 0, + "enclosedBy": { + "name": "Helper", + "type": "class" + } + }, + { + "name": "getContents", + "qualifiedName": "ex.Helper.getContents", + "href": "ex/Helper/getContents.html", + "type": "method", + "overriddenDepth": 0, + "enclosedBy": { + "name": "Helper", + "type": "class" + } + }, + { + "name": "hashCode", + "qualifiedName": "ex.Helper.hashCode", + "href": "ex/Helper/hashCode.html", + "type": "property", + "overriddenDepth": 0, + "enclosedBy": { + "name": "Helper", + "type": "class" + } + }, + { + "name": "noSuchMethod", + "qualifiedName": "ex.Helper.noSuchMethod", + "href": "ex/Helper/noSuchMethod.html", + "type": "method", + "overriddenDepth": 0, + "enclosedBy": { + "name": "Helper", + "type": "class" + } + }, + { + "name": "runtimeType", + "qualifiedName": "ex.Helper.runtimeType", + "href": "ex/Helper/runtimeType.html", + "type": "property", + "overriddenDepth": 0, + "enclosedBy": { + "name": "Helper", + "type": "class" + } + }, + { + "name": "toString", + "qualifiedName": "ex.Helper.toString", + "href": "ex/Helper/toString.html", + "type": "method", + "overriddenDepth": 0, + "enclosedBy": { + "name": "Helper", + "type": "class" + } + }, { "name": "Klass", "qualifiedName": "ex.Klass", @@ -6376,112 +6464,6 @@ "type": "class" } }, - { - "name": "src.mylib", - "qualifiedName": "src.mylib", - "href": "src.mylib/src.mylib-library.html", - "type": "library", - "overriddenDepth": 0 - }, - { - "name": "Helper", - "qualifiedName": "src.mylib.Helper", - "href": "src.mylib/Helper-class.html", - "type": "class", - "overriddenDepth": 0, - "enclosedBy": { - "name": "src.mylib", - "type": "library" - } - }, - { - "name": "Helper", - "qualifiedName": "src.mylib.Helper", - "href": "src.mylib/Helper/Helper.html", - "type": "constructor", - "overriddenDepth": 0, - "enclosedBy": { - "name": "Helper", - "type": "class" - } - }, - { - "name": "operator ==", - "qualifiedName": "src.mylib.Helper.==", - "href": "src.mylib/Helper/operator_equals.html", - "type": "method", - "overriddenDepth": 0, - "enclosedBy": { - "name": "Helper", - "type": "class" - } - }, - { - "name": "getContents", - "qualifiedName": "src.mylib.Helper.getContents", - "href": "src.mylib/Helper/getContents.html", - "type": "method", - "overriddenDepth": 0, - "enclosedBy": { - "name": "Helper", - "type": "class" - } - }, - { - "name": "hashCode", - "qualifiedName": "src.mylib.Helper.hashCode", - "href": "src.mylib/Helper/hashCode.html", - "type": "property", - "overriddenDepth": 0, - "enclosedBy": { - "name": "Helper", - "type": "class" - } - }, - { - "name": "noSuchMethod", - "qualifiedName": "src.mylib.Helper.noSuchMethod", - "href": "src.mylib/Helper/noSuchMethod.html", - "type": "method", - "overriddenDepth": 0, - "enclosedBy": { - "name": "Helper", - "type": "class" - } - }, - { - "name": "runtimeType", - "qualifiedName": "src.mylib.Helper.runtimeType", - "href": "src.mylib/Helper/runtimeType.html", - "type": "property", - "overriddenDepth": 0, - "enclosedBy": { - "name": "Helper", - "type": "class" - } - }, - { - "name": "toString", - "qualifiedName": "src.mylib.Helper.toString", - "href": "src.mylib/Helper/toString.html", - "type": "method", - "overriddenDepth": 0, - "enclosedBy": { - "name": "Helper", - "type": "class" - } - }, - { - "name": "helperFunction", - "qualifiedName": "src.mylib.helperFunction", - "href": "src.mylib/helperFunction.html", - "type": "function", - "overriddenDepth": 0, - "enclosedBy": { - "name": "src.mylib", - "type": "library" - } - }, { "name": "test_package_imported.main", "qualifiedName": "test_package_imported.main", diff --git a/testing/test_package_docs/is_deprecated/is_deprecated-library.html b/testing/test_package_docs/is_deprecated/is_deprecated-library.html index 92ed7bffc3..23e201765d 100644 --- a/testing/test_package_docs/is_deprecated/is_deprecated-library.html +++ b/testing/test_package_docs/is_deprecated/is_deprecated-library.html @@ -58,7 +58,6 @@
    package test_package
  • is_deprecated
  • reexport_one
  • reexport_two
  • -
  • src.mylib
  • test_package_imported.main
  • two_exports
  • diff --git a/testing/test_package_docs/reexport_one/reexport_one-library.html b/testing/test_package_docs/reexport_one/reexport_one-library.html index 468762deff..d7a6301808 100644 --- a/testing/test_package_docs/reexport_one/reexport_one-library.html +++ b/testing/test_package_docs/reexport_one/reexport_one-library.html @@ -58,7 +58,6 @@
    package test_package
  • is_deprecated
  • reexport_one
  • reexport_two
  • -
  • src.mylib
  • test_package_imported.main
  • two_exports
  • diff --git a/testing/test_package_docs/reexport_two/reexport_two-library.html b/testing/test_package_docs/reexport_two/reexport_two-library.html index bbad81a6d2..bf928dbb16 100644 --- a/testing/test_package_docs/reexport_two/reexport_two-library.html +++ b/testing/test_package_docs/reexport_two/reexport_two-library.html @@ -58,7 +58,6 @@
    package test_package
  • is_deprecated
  • reexport_one
  • reexport_two
  • -
  • src.mylib
  • test_package_imported.main
  • two_exports
  • diff --git a/testing/test_package_docs/src.mylib/Helper-class.html b/testing/test_package_docs/src.mylib/Helper-class.html deleted file mode 100644 index 53d94c3df4..0000000000 --- a/testing/test_package_docs/src.mylib/Helper-class.html +++ /dev/null @@ -1,220 +0,0 @@ - - - - - - - - Helper class - src.mylib library - Dart API - - - - - - - - - - - - - -
    - -
    - -
    - -
    -
    - - - -
    - -
    -

    Even unresolved references in the same library should be resolved -Apple -ex.B

    -
    - - -
    -

    Constructors

    - -
    -
    - Helper() -
    -
    - -
    -
    -
    - -
    -

    Properties

    - -
    -
    - hashCode - → int -
    -
    - The hash code for this object. -
    read-only, inherited
    -
    -
    - runtimeType - → Type -
    -
    - A representation of the runtime type of the object. -
    read-only, inherited
    -
    -
    -
    - -
    -

    Methods

    -
    -
    - getContents() - → String - -
    -
    - - -
    -
    - noSuchMethod(Invocation invocation) - → dynamic - -
    -
    - Invoked when a non-existent method or property is accessed. -
    inherited
    -
    -
    - toString() - → String - -
    -
    - Returns a string representation of this object. -
    inherited
    -
    -
    -
    - -
    -

    Operators

    -
    -
    - operator ==(other) - → bool - -
    -
    - The equality operator. -
    inherited
    -
    -
    -
    - - - - -
    - - - -
    -
    - -
    -
    -
    -

    - - test_package 0.0.1 - - • - - Dart - - • - - cc license - - -

    -
    -
    -
    - - - - - - - - - - - diff --git a/testing/test_package_docs/src.mylib/Helper/Helper.html b/testing/test_package_docs/src.mylib/Helper/Helper.html deleted file mode 100644 index 94632119bb..0000000000 --- a/testing/test_package_docs/src.mylib/Helper/Helper.html +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - - Helper constructor - Helper class - src.mylib library - Dart API - - - - - - - - - - - - - -
    - -
    - -
    - -
    -
    - - - -
    -
    - - Helper() -
    - - - - -
    - - - -
    -
    - -
    -
    -
    -

    - - test_package 0.0.1 - - • - - Dart - - • - - cc license - - -

    -
    -
    -
    - - - - - - - - - - - diff --git a/testing/test_package_docs/src.mylib/Helper/getContents.html b/testing/test_package_docs/src.mylib/Helper/getContents.html deleted file mode 100644 index 2eedc4812f..0000000000 --- a/testing/test_package_docs/src.mylib/Helper/getContents.html +++ /dev/null @@ -1,121 +0,0 @@ - - - - - - - - getContents method - Helper class - src.mylib library - Dart API - - - - - - - - - - - - - -
    - -
    - -
    - -
    -
    - - - -
    -
    - String - getContents() -
    - - - -
    - - - -
    -
    - -
    -
    -
    -

    - - test_package 0.0.1 - - • - - Dart - - • - - cc license - - -

    -
    -
    -
    - - - - - - - - - - - diff --git a/testing/test_package_docs/src.mylib/Helper/hashCode.html b/testing/test_package_docs/src.mylib/Helper/hashCode.html deleted file mode 100644 index 50d3b8d41e..0000000000 --- a/testing/test_package_docs/src.mylib/Helper/hashCode.html +++ /dev/null @@ -1,150 +0,0 @@ - - - - - - - - hashCode property - Helper class - src.mylib library - Dart API - - - - - - - - - - - - - -
    - -
    - -
    - -
    -
    - - - -
    - - -
    - -
    - int - hashCode
    - -
    -

    The hash code for this object.

    -

    A hash code is a single integer which represents the state of the object -that affects == comparisons.

    -

    All objects have hash codes. -The default hash code represents only the identity of the object, -the same way as the default == implementation only considers objects -equal if they are identical (see identityHashCode).

    -

    If == is overridden to use the object state instead, -the hash code must also be changed to represent that state.

    -

    Hash codes must be the same for objects that are equal to each other -according to ==. -The hash code of an object should only change if the object changes -in a way that affects equality. -There are no further requirements for the hash codes. -They need not be consistent between executions of the same program -and there are no distribution guarantees.

    -

    Objects that are not equal are allowed to have the same hash code, -it is even technically allowed that all instances have the same hash code, -but if clashes happen too often, it may reduce the efficiency of hash-based -data structures like HashSet or HashMap.

    -

    If a subclass overrides hashCode, it should override the -== operator as well to maintain consistency.

    -
    -
    - - - -
    - - - -
    -
    - -
    -
    -
    -

    - - test_package 0.0.1 - - • - - Dart - - • - - cc license - - -

    -
    -
    -
    - - - - - - - - - - - diff --git a/testing/test_package_docs/src.mylib/Helper/noSuchMethod.html b/testing/test_package_docs/src.mylib/Helper/noSuchMethod.html deleted file mode 100644 index 22170a9b8a..0000000000 --- a/testing/test_package_docs/src.mylib/Helper/noSuchMethod.html +++ /dev/null @@ -1,127 +0,0 @@ - - - - - - - - noSuchMethod method - Helper class - src.mylib library - Dart API - - - - - - - - - - - - - -
    - -
    - -
    - -
    -
    - - - -
    -
    - dynamic - noSuchMethod(Invocation invocation) -
    -
    -

    Invoked when a non-existent method or property is accessed.

    -

    Classes can override noSuchMethod to provide custom behavior.

    -

    If a value is returned, it becomes the result of the original invocation.

    -

    The default behavior is to throw a NoSuchMethodError.

    -
    - - - -
    - - - -
    -
    - -
    -
    -
    -

    - - test_package 0.0.1 - - • - - Dart - - • - - cc license - - -

    -
    -
    -
    - - - - - - - - - - - diff --git a/testing/test_package_docs/src.mylib/Helper/operator_equals.html b/testing/test_package_docs/src.mylib/Helper/operator_equals.html deleted file mode 100644 index 03e44dc1ac..0000000000 --- a/testing/test_package_docs/src.mylib/Helper/operator_equals.html +++ /dev/null @@ -1,141 +0,0 @@ - - - - - - - - operator == method - Helper class - src.mylib library - Dart API - - - - - - - - - - - - - -
    - -
    - -
    - -
    -
    - - - -
    -
    - bool - operator ==(other) -
    -
    -

    The equality operator.

    -

    The default behavior for all Objects is to return true if and -only if this and other are the same object.

    -

    Override this method to specify a different equality relation on -a class. The overriding method must still be an equivalence relation. -That is, it must be:

    • -

      Total: It must return a boolean for all arguments. It should never throw -or return null.

    • -

      Reflexive: For all objects o, o == o must be true.

    • -

      Symmetric: For all objects o1 and o2, o1 == o2 and o2 == o1 must -either both be true, or both be false.

    • -

      Transitive: For all objects o1, o2, and o3, if o1 == o2 and -o2 == o3 are true, then o1 == o3 must be true.

    -

    The method should also be consistent over time, -so whether two objects are equal should only change -if at least one of the objects was modified.

    -

    If a subclass overrides the equality operator it should override -the hashCode method as well to maintain consistency.

    -
    - - - -
    - - - -
    -
    - -
    -
    -
    -

    - - test_package 0.0.1 - - • - - Dart - - • - - cc license - - -

    -
    -
    -
    - - - - - - - - - - - diff --git a/testing/test_package_docs/src.mylib/Helper/runtimeType.html b/testing/test_package_docs/src.mylib/Helper/runtimeType.html deleted file mode 100644 index 5ea44c1640..0000000000 --- a/testing/test_package_docs/src.mylib/Helper/runtimeType.html +++ /dev/null @@ -1,129 +0,0 @@ - - - - - - - - runtimeType property - Helper class - src.mylib library - Dart API - - - - - - - - - - - - - -
    - -
    - -
    - -
    -
    - - - -
    - - -
    - -
    - Type - runtimeType
    - -
    -

    A representation of the runtime type of the object.

    -
    -
    - - - -
    - - - -
    -
    - -
    -
    -
    -

    - - test_package 0.0.1 - - • - - Dart - - • - - cc license - - -

    -
    -
    -
    - - - - - - - - - - - diff --git a/testing/test_package_docs/src.mylib/Helper/toString.html b/testing/test_package_docs/src.mylib/Helper/toString.html deleted file mode 100644 index a28f728fe4..0000000000 --- a/testing/test_package_docs/src.mylib/Helper/toString.html +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - toString method - Helper class - src.mylib library - Dart API - - - - - - - - - - - - - -
    - -
    - -
    - -
    -
    - - - -
    -
    - String - toString() -
    -
    -

    Returns a string representation of this object.

    -
    - - - -
    - - - -
    -
    - -
    -
    -
    -

    - - test_package 0.0.1 - - • - - Dart - - • - - cc license - - -

    -
    -
    -
    - - - - - - - - - - - diff --git a/testing/test_package_docs/src.mylib/helperFunction.html b/testing/test_package_docs/src.mylib/helperFunction.html deleted file mode 100644 index b91f8328a7..0000000000 --- a/testing/test_package_docs/src.mylib/helperFunction.html +++ /dev/null @@ -1,112 +0,0 @@ - - - - - - - - helperFunction function - src.mylib library - Dart API - - - - - - - - - - - - - -
    - -
    - -
    - -
    -
    - - - -
    - -
    - void - helperFunction(String message) -
    - - - -
    - - - -
    -
    - -
    -
    -
    -

    - - test_package 0.0.1 - - • - - Dart - - • - - cc license - - -

    -
    -
    -
    - - - - - - - - - - - diff --git a/testing/test_package_docs/src.mylib/src.mylib-library.html b/testing/test_package_docs/src.mylib/src.mylib-library.html deleted file mode 100644 index 163031d6d8..0000000000 --- a/testing/test_package_docs/src.mylib/src.mylib-library.html +++ /dev/null @@ -1,157 +0,0 @@ - - - - - - - - src.mylib library - Dart API - - - - - - - - - - - - - -
    - -
    - -
    - -
    -
    - - - -
    - - -
    -

    Classes

    - -
    -
    - Helper -
    -
    - Even unresolved references in the same library should be resolved -Apple -ex.B -
    -
    -
    - - - -
    -

    Functions

    - -
    -
    - helperFunction(String message) - → void - -
    -
    - - -
    -
    -
    - - - - -
    - - - -
    -
    - -
    -
    -
    -

    - - test_package 0.0.1 - - • - - Dart - - • - - cc license - - -

    -
    -
    -
    - - - - - - - - - - - diff --git a/testing/test_package_docs/test_package_imported.main/test_package_imported.main-library.html b/testing/test_package_docs/test_package_imported.main/test_package_imported.main-library.html index 71f31d1bb3..05479014c7 100644 --- a/testing/test_package_docs/test_package_imported.main/test_package_imported.main-library.html +++ b/testing/test_package_docs/test_package_imported.main/test_package_imported.main-library.html @@ -58,7 +58,6 @@
    package test_package
  • is_deprecated
  • reexport_one
  • reexport_two
  • -
  • src.mylib
  • test_package_imported.main
  • two_exports
  • diff --git a/testing/test_package_docs/two_exports/two_exports-library.html b/testing/test_package_docs/two_exports/two_exports-library.html index 5d420ca4d8..838db3823c 100644 --- a/testing/test_package_docs/two_exports/two_exports-library.html +++ b/testing/test_package_docs/two_exports/two_exports-library.html @@ -58,7 +58,6 @@
    package test_package
  • is_deprecated
  • reexport_one
  • reexport_two
  • -
  • src.mylib
  • test_package_imported.main
  • two_exports
  • From abf875fe2e9d53dfb9a21c236780c3aee9edd694 Mon Sep 17 00:00:00 2001 From: Janice Collins Date: Mon, 5 Jun 2017 11:07:10 -0700 Subject: [PATCH 15/19] Helper moved with the fix. --- .../test_package_docs/ex/Helper-class.html | 267 ++++++++++++++++++ .../test_package_docs/ex/Helper/Helper.html | 122 ++++++++ .../ex/Helper/getContents.html | 121 ++++++++ .../test_package_docs/ex/Helper/hashCode.html | 150 ++++++++++ .../ex/Helper/noSuchMethod.html | 127 +++++++++ .../ex/Helper/operator_equals.html | 141 +++++++++ .../ex/Helper/runtimeType.html | 129 +++++++++ .../test_package_docs/ex/Helper/toString.html | 124 ++++++++ 8 files changed, 1181 insertions(+) create mode 100644 testing/test_package_docs/ex/Helper-class.html create mode 100644 testing/test_package_docs/ex/Helper/Helper.html create mode 100644 testing/test_package_docs/ex/Helper/getContents.html create mode 100644 testing/test_package_docs/ex/Helper/hashCode.html create mode 100644 testing/test_package_docs/ex/Helper/noSuchMethod.html create mode 100644 testing/test_package_docs/ex/Helper/operator_equals.html create mode 100644 testing/test_package_docs/ex/Helper/runtimeType.html create mode 100644 testing/test_package_docs/ex/Helper/toString.html diff --git a/testing/test_package_docs/ex/Helper-class.html b/testing/test_package_docs/ex/Helper-class.html new file mode 100644 index 0000000000..0fbc22a325 --- /dev/null +++ b/testing/test_package_docs/ex/Helper-class.html @@ -0,0 +1,267 @@ + + + + + + + + Helper class - ex library - Dart API + + + + + + + + + + + + + +
    + +
    + +
    + +
    +
    + + + +
    + +
    +

    Even unresolved references in the same library should be resolved +Apple +ex.B

    +
    + + +
    +

    Constructors

    + +
    +
    + Helper() +
    +
    + +
    +
    +
    + +
    +

    Properties

    + +
    +
    + hashCode + → int +
    +
    + The hash code for this object. +
    read-only, inherited
    +
    +
    + runtimeType + → Type +
    +
    + A representation of the runtime type of the object. +
    read-only, inherited
    +
    +
    +
    + +
    +

    Methods

    +
    +
    + getContents() + → String + +
    +
    + + +
    +
    + noSuchMethod(Invocation invocation) + → dynamic + +
    +
    + Invoked when a non-existent method or property is accessed. +
    inherited
    +
    +
    + toString() + → String + +
    +
    + Returns a string representation of this object. +
    inherited
    +
    +
    +
    + +
    +

    Operators

    +
    +
    + operator ==(other) + → bool + +
    +
    + The equality operator. +
    inherited
    +
    +
    +
    + + + + +
    + + + +
    +
    + +
    +
    +
    +

    + + test_package 0.0.1 + + • + + Dart + + • + + cc license + + +

    +
    +
    +
    + + + + + + + + + + + diff --git a/testing/test_package_docs/ex/Helper/Helper.html b/testing/test_package_docs/ex/Helper/Helper.html new file mode 100644 index 0000000000..5a4550aea3 --- /dev/null +++ b/testing/test_package_docs/ex/Helper/Helper.html @@ -0,0 +1,122 @@ + + + + + + + + Helper constructor - Helper class - ex library - Dart API + + + + + + + + + + + + + +
    + +
    + +
    + +
    +
    + + + +
    +
    + + Helper() +
    + + + + +
    + + + +
    +
    + +
    +
    +
    +

    + + test_package 0.0.1 + + • + + Dart + + • + + cc license + + +

    +
    +
    +
    + + + + + + + + + + + diff --git a/testing/test_package_docs/ex/Helper/getContents.html b/testing/test_package_docs/ex/Helper/getContents.html new file mode 100644 index 0000000000..3a164f65fc --- /dev/null +++ b/testing/test_package_docs/ex/Helper/getContents.html @@ -0,0 +1,121 @@ + + + + + + + + getContents method - Helper class - ex library - Dart API + + + + + + + + + + + + + +
    + +
    + +
    + +
    +
    + + + +
    +
    + String + getContents() +
    + + + +
    + + + +
    +
    + +
    +
    +
    +

    + + test_package 0.0.1 + + • + + Dart + + • + + cc license + + +

    +
    +
    +
    + + + + + + + + + + + diff --git a/testing/test_package_docs/ex/Helper/hashCode.html b/testing/test_package_docs/ex/Helper/hashCode.html new file mode 100644 index 0000000000..16e8ae61c5 --- /dev/null +++ b/testing/test_package_docs/ex/Helper/hashCode.html @@ -0,0 +1,150 @@ + + + + + + + + hashCode property - Helper class - ex library - Dart API + + + + + + + + + + + + + +
    + +
    + +
    + +
    +
    + + + +
    + + +
    + +
    + int + hashCode
    + +
    +

    The hash code for this object.

    +

    A hash code is a single integer which represents the state of the object +that affects == comparisons.

    +

    All objects have hash codes. +The default hash code represents only the identity of the object, +the same way as the default == implementation only considers objects +equal if they are identical (see identityHashCode).

    +

    If == is overridden to use the object state instead, +the hash code must also be changed to represent that state.

    +

    Hash codes must be the same for objects that are equal to each other +according to ==. +The hash code of an object should only change if the object changes +in a way that affects equality. +There are no further requirements for the hash codes. +They need not be consistent between executions of the same program +and there are no distribution guarantees.

    +

    Objects that are not equal are allowed to have the same hash code, +it is even technically allowed that all instances have the same hash code, +but if clashes happen too often, it may reduce the efficiency of hash-based +data structures like HashSet or HashMap.

    +

    If a subclass overrides hashCode, it should override the +== operator as well to maintain consistency.

    +
    +
    + + + +
    + + + +
    +
    + +
    +
    +
    +

    + + test_package 0.0.1 + + • + + Dart + + • + + cc license + + +

    +
    +
    +
    + + + + + + + + + + + diff --git a/testing/test_package_docs/ex/Helper/noSuchMethod.html b/testing/test_package_docs/ex/Helper/noSuchMethod.html new file mode 100644 index 0000000000..616d815818 --- /dev/null +++ b/testing/test_package_docs/ex/Helper/noSuchMethod.html @@ -0,0 +1,127 @@ + + + + + + + + noSuchMethod method - Helper class - ex library - Dart API + + + + + + + + + + + + + +
    + +
    + +
    + +
    +
    + + + +
    +
    + dynamic + noSuchMethod(Invocation invocation) +
    +
    +

    Invoked when a non-existent method or property is accessed.

    +

    Classes can override noSuchMethod to provide custom behavior.

    +

    If a value is returned, it becomes the result of the original invocation.

    +

    The default behavior is to throw a NoSuchMethodError.

    +
    + + + +
    + + + +
    +
    + +
    +
    +
    +

    + + test_package 0.0.1 + + • + + Dart + + • + + cc license + + +

    +
    +
    +
    + + + + + + + + + + + diff --git a/testing/test_package_docs/ex/Helper/operator_equals.html b/testing/test_package_docs/ex/Helper/operator_equals.html new file mode 100644 index 0000000000..1d8423007d --- /dev/null +++ b/testing/test_package_docs/ex/Helper/operator_equals.html @@ -0,0 +1,141 @@ + + + + + + + + operator == method - Helper class - ex library - Dart API + + + + + + + + + + + + + +
    + +
    + +
    + +
    +
    + + + +
    +
    + bool + operator ==(other) +
    +
    +

    The equality operator.

    +

    The default behavior for all Objects is to return true if and +only if this and other are the same object.

    +

    Override this method to specify a different equality relation on +a class. The overriding method must still be an equivalence relation. +That is, it must be:

    • +

      Total: It must return a boolean for all arguments. It should never throw +or return null.

    • +

      Reflexive: For all objects o, o == o must be true.

    • +

      Symmetric: For all objects o1 and o2, o1 == o2 and o2 == o1 must +either both be true, or both be false.

    • +

      Transitive: For all objects o1, o2, and o3, if o1 == o2 and +o2 == o3 are true, then o1 == o3 must be true.

    +

    The method should also be consistent over time, +so whether two objects are equal should only change +if at least one of the objects was modified.

    +

    If a subclass overrides the equality operator it should override +the hashCode method as well to maintain consistency.

    +
    + + + +
    + + + +
    +
    + +
    +
    +
    +

    + + test_package 0.0.1 + + • + + Dart + + • + + cc license + + +

    +
    +
    +
    + + + + + + + + + + + diff --git a/testing/test_package_docs/ex/Helper/runtimeType.html b/testing/test_package_docs/ex/Helper/runtimeType.html new file mode 100644 index 0000000000..8cd515dfa1 --- /dev/null +++ b/testing/test_package_docs/ex/Helper/runtimeType.html @@ -0,0 +1,129 @@ + + + + + + + + runtimeType property - Helper class - ex library - Dart API + + + + + + + + + + + + + +
    + +
    + +
    + +
    +
    + + + +
    + + +
    + +
    + Type + runtimeType
    + +
    +

    A representation of the runtime type of the object.

    +
    +
    + + + +
    + + + +
    +
    + +
    +
    +
    +

    + + test_package 0.0.1 + + • + + Dart + + • + + cc license + + +

    +
    +
    +
    + + + + + + + + + + + diff --git a/testing/test_package_docs/ex/Helper/toString.html b/testing/test_package_docs/ex/Helper/toString.html new file mode 100644 index 0000000000..d5bd6ae5f6 --- /dev/null +++ b/testing/test_package_docs/ex/Helper/toString.html @@ -0,0 +1,124 @@ + + + + + + + + toString method - Helper class - ex library - Dart API + + + + + + + + + + + + + +
    + +
    + +
    + +
    +
    + + + +
    +
    + String + toString() +
    +
    +

    Returns a string representation of this object.

    +
    + + + +
    + + + +
    +
    + +
    +
    +
    +

    + + test_package 0.0.1 + + • + + Dart + + • + + cc license + + +

    +
    +
    +
    + + + + + + + + + + + From e16af38d171f21228b77d4d87e57ea99e727a366 Mon Sep 17 00:00:00 2001 From: Janice Collins Date: Mon, 5 Jun 2017 11:44:13 -0700 Subject: [PATCH 16/19] Hide the debug option for the scorer confidence --- bin/dartdoc.dart | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/dartdoc.dart b/bin/dartdoc.dart index fdc111831e..0f3e0762f0 100644 --- a/bin/dartdoc.dart +++ b/bin/dartdoc.dart @@ -269,7 +269,8 @@ ArgParser _createArgsParser() { parser.addOption('ambiguous-reexport-scorer-min-confidence', help: 'Minimum scorer confidence to suppress warning on ambiguous reexport.', - defaultsTo: "0.1"); + defaultsTo: "0.1", + hide: true); parser.addFlag('verbose-warnings', help: 'Display extra debugging information and help with warnings.', negatable: true, From 8e880c48af044a1bd619a9e174148ee5f07174d6 Mon Sep 17 00:00:00 2001 From: Janice Collins Date: Mon, 5 Jun 2017 13:03:21 -0700 Subject: [PATCH 17/19] Remove unnecessary casts --- bin/dartdoc.dart | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/dartdoc.dart b/bin/dartdoc.dart index 0f3e0762f0..6afbcc8fb8 100644 --- a/bin/dartdoc.dart +++ b/bin/dartdoc.dart @@ -156,17 +156,17 @@ main(List arguments) async { PhysicalResourceProvider.INSTANCE.getFolder(sdkDir.path)); setConfig( - addCrossdart: args['add-crossdart'] as bool, + addCrossdart: args['add-crossdart'], examplePathPrefix: args['example-path-prefix'], showWarnings: args['show-warnings'], - includeSource: args['include-source'] as bool, + includeSource: args['include-source'], inputDir: inputDir, sdkVersion: sdk.sdkVersion, autoIncludeDependencies: args['auto-include-dependencies'], categoryOrder: args['category-order'], reexportMinConfidence: double.parse(args['ambiguous-reexport-scorer-min-confidence']), - verboseWarnings: args['verbose-warnings'] as bool); + verboseWarnings: args['verbose-warnings']); DartDoc dartdoc = new DartDoc(inputDir, excludeLibraries, sdkDir, generators, outputDir, packageMeta, includeLibraries, From a69203a13c1283cfbf8226279a96449b843710a2 Mon Sep 17 00:00:00 2001 From: Janice Collins Date: Tue, 6 Jun 2017 11:22:30 -0700 Subject: [PATCH 18/19] Implement review comments and extract namePieces into Nameable --- lib/src/model.dart | 27 ++++++++++----------------- test/model_test.dart | 6 +++--- 2 files changed, 13 insertions(+), 20 deletions(-) diff --git a/lib/src/model.dart b/lib/src/model.dart index 636a2a9553..271e4e036c 100644 --- a/lib/src/model.dart +++ b/lib/src/model.dart @@ -1849,9 +1849,8 @@ class ScoredCandidate implements Comparable { } @override - String toString() { - return "${library.name}: ${score.toStringAsPrecision(4)} - ${reasons.join(', ')}"; - } + String toString() => + "${library.name}: ${score.toStringAsPrecision(4)} - ${reasons.join(', ')}"; } /// This class is the foundation of Dartdoc's model for source code. @@ -1880,7 +1879,8 @@ class ScoredCandidate implements Comparable { /// helps prevent subtle bugs as generated output for a non-canonical /// ModelElement will reference itself as part of the "wrong" [Library] /// from the public interface perspective. -abstract class ModelElement implements Comparable, Nameable, Documentable { +abstract class ModelElement extends Nameable + implements Comparable, Documentable { final Element _element; final Library _library; @@ -2022,11 +2022,6 @@ abstract class ModelElement implements Comparable, Nameable, Documentable { .where((s) => s.isNotEmpty)); } - Set get namePieces { - return new Set() - ..addAll(name.split(_locationSplitter).where((s) => s.isNotEmpty)); - } - // Use components of this element's location to return a score for library // location. ScoredCandidate scoreElementWithLibrary(Library lib) { @@ -2922,6 +2917,9 @@ class ModelFunction extends ModelElement /// Something that has a name. abstract class Nameable { String get name; + + Set get namePieces => new Set() + ..addAll(name.split(_locationSplitter).where((s) => s.isNotEmpty)); } class Operator extends Method { @@ -3006,7 +3004,7 @@ class PackageWarningHelpText { PackageWarningHelpText(this.warning, this.warningName, this.shortHelp, [this.longHelp]) { - if (this.longHelp == null) this.longHelp = []; + this.longHelp ??= []; } } @@ -3233,7 +3231,7 @@ class PackageWarningCounter { } } -class Package implements Nameable, Documentable { +class Package extends Nameable implements Documentable { // Library objects serving as entry points for documentation. final List _libraries = []; @@ -3398,7 +3396,7 @@ class Package implements Nameable, Documentable { break; case PackageWarning.ignoredCanonicalFor: warningMessage = - "library says it is {@canonicalFor ${message}} but ${message} is not exported there"; + "library says it is {@canonicalFor ${message}} but ${message} can't be canonical there"; break; case PackageWarning.categoryOrderGivesMissingPackageName: warningMessage = @@ -3454,11 +3452,6 @@ class Package implements Nameable, Documentable { packageWarningCounter.addWarning(warnable, kind, message, fullMessage); } - Set get namePieces { - return new Set() - ..addAll(name.split(_locationSplitter).where((s) => s.isNotEmpty)); - } - static Package _withAutoIncludedDependencies( Set libraryElements, PackageMeta packageMeta, diff --git a/test/model_test.dart b/test/model_test.dart index 38baeb2cb3..b9958d7d37 100644 --- a/test/model_test.dart +++ b/test/model_test.dart @@ -266,8 +266,8 @@ void main() { }); test('@canonicalFor directive works', () { - expect(SomeOtherClass.canonicalLibrary, equals(reexportOneLib)); - expect(SomeClass.canonicalLibrary, equals(reexportTwoLib)); + expect(SomeOtherClass.canonicalLibrary, reexportOneLib); + expect(SomeClass.canonicalLibrary, reexportTwoLib); }); }); @@ -1818,7 +1818,7 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans, }); } -class StringName implements Nameable { +class StringName extends Nameable { @override final String name; StringName(this.name); From bc47ab2ea22b12168d8ca028e456c96e7c1488ea Mon Sep 17 00:00:00 2001 From: Janice Collins Date: Tue, 13 Jun 2017 10:57:09 -0700 Subject: [PATCH 19/19] Regenerate docs --- .../reexport_one/SomeOtherClass-class.html | 73 ++++++--------- .../SomeOtherClass/SomeOtherClass.html | 65 +++++-------- .../reexport_one/SomeOtherClass/hashCode.html | 91 +++++-------------- .../SomeOtherClass/noSuchMethod.html | 71 +++++---------- .../SomeOtherClass/operator_equals.html | 85 +++++------------ .../SomeOtherClass/runtimeType.html | 70 +++++--------- .../reexport_one/SomeOtherClass/toString.html | 68 +++++--------- .../reexport_one/reexport_one-library.html | 61 ++++--------- .../reexport_two/AUnicornClass-class.html | 73 ++++++--------- .../AUnicornClass/AUnicornClass.html | 65 +++++-------- .../reexport_two/AUnicornClass/hashCode.html | 91 +++++-------------- .../AUnicornClass/noSuchMethod.html | 71 +++++---------- .../AUnicornClass/operator_equals.html | 85 +++++------------ .../AUnicornClass/runtimeType.html | 70 +++++--------- .../reexport_two/AUnicornClass/toString.html | 68 +++++--------- .../reexport_two/SomeClass-class.html | 73 ++++++--------- .../reexport_two/SomeClass/SomeClass.html | 65 +++++-------- .../reexport_two/SomeClass/hashCode.html | 91 +++++-------------- .../reexport_two/SomeClass/noSuchMethod.html | 71 +++++---------- .../SomeClass/operator_equals.html | 85 +++++------------ .../reexport_two/SomeClass/runtimeType.html | 70 +++++--------- .../reexport_two/SomeClass/toString.html | 68 +++++--------- .../reexport_two/YetAnotherClass-class.html | 73 ++++++--------- .../YetAnotherClass/YetAnotherClass.html | 65 +++++-------- .../YetAnotherClass/hashCode.html | 91 +++++-------------- .../YetAnotherClass/noSuchMethod.html | 71 +++++---------- .../YetAnotherClass/operator_equals.html | 85 +++++------------ .../YetAnotherClass/runtimeType.html | 70 +++++--------- .../YetAnotherClass/toString.html | 68 +++++--------- .../reexport_two/reexport_two-library.html | 61 ++++--------- 30 files changed, 680 insertions(+), 1534 deletions(-) diff --git a/testing/test_package_docs/reexport_one/SomeOtherClass-class.html b/testing/test_package_docs/reexport_one/SomeOtherClass-class.html index 9c957e75d5..6ad69ab648 100644 --- a/testing/test_package_docs/reexport_one/SomeOtherClass-class.html +++ b/testing/test_package_docs/reexport_one/SomeOtherClass-class.html @@ -11,7 +11,6 @@ - @@ -21,29 +20,20 @@
    -
    - +
    + + +
    SomeOtherClass
    +
    -
    -
    +
    - The hash code for this object. +
    read-only, inherited
    @@ -96,7 +86,7 @@

    Properties

    → Type
    - A representation of the runtime type of the object. +
    read-only, inherited
    @@ -111,7 +101,7 @@

    Methods

    - Invoked when a non-existent method or property is accessed. +
    inherited
    @@ -120,7 +110,7 @@

    Methods

    - Returns a string representation of this object. +
    inherited
    @@ -135,7 +125,7 @@

    Operators

    - The equality operator. +
    inherited
    @@ -170,28 +160,17 @@
    class SomeOtherClass
    -
    - +
    -
    -
    -

    - - test_package 0.0.1 - - • - - Dart - - • - - cc license - - -

    -
    -
    + + test_package 0.0.1 + + • + + cc license + +
    diff --git a/testing/test_package_docs/reexport_one/SomeOtherClass/SomeOtherClass.html b/testing/test_package_docs/reexport_one/SomeOtherClass/SomeOtherClass.html index db31058680..1937f6269b 100644 --- a/testing/test_package_docs/reexport_one/SomeOtherClass/SomeOtherClass.html +++ b/testing/test_package_docs/reexport_one/SomeOtherClass/SomeOtherClass.html @@ -11,7 +11,6 @@ - @@ -21,30 +20,21 @@
    -
    - +
    + + +
    SomeOtherClass
    +
    -
    -
    +
    -
    -
    +
    -
    -
    -

    - - test_package 0.0.1 - - • - - Dart - - • - - cc license - - -

    -
    -
    + + test_package 0.0.1 + + • + + cc license + +
    diff --git a/testing/test_package_docs/reexport_one/SomeOtherClass/hashCode.html b/testing/test_package_docs/reexport_one/SomeOtherClass/hashCode.html index e26e8a2226..9d9724170a 100644 --- a/testing/test_package_docs/reexport_one/SomeOtherClass/hashCode.html +++ b/testing/test_package_docs/reexport_one/SomeOtherClass/hashCode.html @@ -11,7 +11,6 @@ - @@ -21,30 +20,21 @@
    -
    - +
    + + +
    hashCode
    +
    -
    -
    +
    -
    -
    +
    -
    -
    -

    - - test_package 0.0.1 - - • - - Dart - - • - - cc license - - -

    -
    -
    + + test_package 0.0.1 + + • + + cc license + +
    diff --git a/testing/test_package_docs/reexport_one/SomeOtherClass/noSuchMethod.html b/testing/test_package_docs/reexport_one/SomeOtherClass/noSuchMethod.html index ceec6b5143..88e7880de0 100644 --- a/testing/test_package_docs/reexport_one/SomeOtherClass/noSuchMethod.html +++ b/testing/test_package_docs/reexport_one/SomeOtherClass/noSuchMethod.html @@ -11,7 +11,6 @@ - @@ -21,30 +20,21 @@
    -
    - +
    + + +
    noSuchMethod
    +
    -
    -
    +
    -
    -
    +
    -
    -
    -

    - - test_package 0.0.1 - - • - - Dart - - • - - cc license - - -

    -
    -
    + + test_package 0.0.1 + + • + + cc license + +
    diff --git a/testing/test_package_docs/reexport_one/SomeOtherClass/operator_equals.html b/testing/test_package_docs/reexport_one/SomeOtherClass/operator_equals.html index 0dfe1c74b9..b02982fd7a 100644 --- a/testing/test_package_docs/reexport_one/SomeOtherClass/operator_equals.html +++ b/testing/test_package_docs/reexport_one/SomeOtherClass/operator_equals.html @@ -11,7 +11,6 @@ - @@ -21,30 +20,21 @@
    -
    - +
    + + +
    operator ==
    +
    -
    -
    +
    -
    -
    +
    -
    -
    -

    - - test_package 0.0.1 - - • - - Dart - - • - - cc license - - -

    -
    -
    + + test_package 0.0.1 + + • + + cc license + +
    diff --git a/testing/test_package_docs/reexport_one/SomeOtherClass/runtimeType.html b/testing/test_package_docs/reexport_one/SomeOtherClass/runtimeType.html index 4bd7bd57ed..c1f3c16cf0 100644 --- a/testing/test_package_docs/reexport_one/SomeOtherClass/runtimeType.html +++ b/testing/test_package_docs/reexport_one/SomeOtherClass/runtimeType.html @@ -11,7 +11,6 @@ - @@ -21,30 +20,21 @@
    -
    - +
    + + +
    runtimeType
    +
    -
    -
    +
    -
    -
    +
    -
    -
    -

    - - test_package 0.0.1 - - • - - Dart - - • - - cc license - - -

    -
    -
    + + test_package 0.0.1 + + • + + cc license + +
    diff --git a/testing/test_package_docs/reexport_one/SomeOtherClass/toString.html b/testing/test_package_docs/reexport_one/SomeOtherClass/toString.html index ded10739db..afcbb1ed05 100644 --- a/testing/test_package_docs/reexport_one/SomeOtherClass/toString.html +++ b/testing/test_package_docs/reexport_one/SomeOtherClass/toString.html @@ -11,7 +11,6 @@ - @@ -21,30 +20,21 @@
    -
    - +
    + + +
    toString
    +
    -
    -
    +
    -
    -
    +
    -
    -
    -

    - - test_package 0.0.1 - - • - - Dart - - • - - cc license - - -

    -
    -
    + + test_package 0.0.1 + + • + + cc license + +
    diff --git a/testing/test_package_docs/reexport_one/reexport_one-library.html b/testing/test_package_docs/reexport_one/reexport_one-library.html index d7a6301808..050e229827 100644 --- a/testing/test_package_docs/reexport_one/reexport_one-library.html +++ b/testing/test_package_docs/reexport_one/reexport_one-library.html @@ -11,7 +11,6 @@ - @@ -21,28 +20,19 @@
    -
    - +
    + + +
    reexport_one
    +
    -
    -
    +
    -
    -
    +
    -
    -
    -

    - - test_package 0.0.1 - - • - - Dart - - • - - cc license - - -

    -
    -
    + + test_package 0.0.1 + + • + + cc license + +
    diff --git a/testing/test_package_docs/reexport_two/AUnicornClass-class.html b/testing/test_package_docs/reexport_two/AUnicornClass-class.html index 3063cb03fe..3aa03084d7 100644 --- a/testing/test_package_docs/reexport_two/AUnicornClass-class.html +++ b/testing/test_package_docs/reexport_two/AUnicornClass-class.html @@ -11,7 +11,6 @@ - @@ -21,29 +20,20 @@
    -
    - +
    + + +
    AUnicornClass
    +
    -
    -
    +
    -
    -
    +
    -
    -
    -

    - - test_package 0.0.1 - - • - - Dart - - • - - cc license - - -

    -
    -
    + + test_package 0.0.1 + + • + + cc license + +
    diff --git a/testing/test_package_docs/reexport_two/AUnicornClass/AUnicornClass.html b/testing/test_package_docs/reexport_two/AUnicornClass/AUnicornClass.html index 2258febe51..099e096513 100644 --- a/testing/test_package_docs/reexport_two/AUnicornClass/AUnicornClass.html +++ b/testing/test_package_docs/reexport_two/AUnicornClass/AUnicornClass.html @@ -11,7 +11,6 @@ - @@ -21,30 +20,21 @@
    -
    - +
    + + +
    AUnicornClass
    +
    -
    -
    +
    -
    -
    +
    -
    -
    -

    - - test_package 0.0.1 - - • - - Dart - - • - - cc license - - -

    -
    -
    + + test_package 0.0.1 + + • + + cc license + +
    diff --git a/testing/test_package_docs/reexport_two/AUnicornClass/hashCode.html b/testing/test_package_docs/reexport_two/AUnicornClass/hashCode.html index f3644a3f44..f2032f957a 100644 --- a/testing/test_package_docs/reexport_two/AUnicornClass/hashCode.html +++ b/testing/test_package_docs/reexport_two/AUnicornClass/hashCode.html @@ -11,7 +11,6 @@ - @@ -21,30 +20,21 @@
    -
    - +
    + + +
    hashCode
    +
    -
    -
    +
    -
    -
    +
    -
    -
    -

    - - test_package 0.0.1 - - • - - Dart - - • - - cc license - - -

    -
    -
    + + test_package 0.0.1 + + • + + cc license + +
    diff --git a/testing/test_package_docs/reexport_two/AUnicornClass/noSuchMethod.html b/testing/test_package_docs/reexport_two/AUnicornClass/noSuchMethod.html index 361411c968..169da86e33 100644 --- a/testing/test_package_docs/reexport_two/AUnicornClass/noSuchMethod.html +++ b/testing/test_package_docs/reexport_two/AUnicornClass/noSuchMethod.html @@ -11,7 +11,6 @@ - @@ -21,30 +20,21 @@
    -
    - +
    + + +
    noSuchMethod
    +
    -
    -
    +
    -
    -
    +
    -
    -
    -

    - - test_package 0.0.1 - - • - - Dart - - • - - cc license - - -

    -
    -
    + + test_package 0.0.1 + + • + + cc license + +
    diff --git a/testing/test_package_docs/reexport_two/AUnicornClass/operator_equals.html b/testing/test_package_docs/reexport_two/AUnicornClass/operator_equals.html index 975be86a3b..f1e4b8070a 100644 --- a/testing/test_package_docs/reexport_two/AUnicornClass/operator_equals.html +++ b/testing/test_package_docs/reexport_two/AUnicornClass/operator_equals.html @@ -11,7 +11,6 @@ - @@ -21,30 +20,21 @@
    -
    - +
    + + +
    operator ==
    +
    -
    -
    +
    -
    -
    +
    -
    -
    -

    - - test_package 0.0.1 - - • - - Dart - - • - - cc license - - -

    -
    -
    + + test_package 0.0.1 + + • + + cc license + +
    diff --git a/testing/test_package_docs/reexport_two/AUnicornClass/runtimeType.html b/testing/test_package_docs/reexport_two/AUnicornClass/runtimeType.html index c3b089b267..660644b6c0 100644 --- a/testing/test_package_docs/reexport_two/AUnicornClass/runtimeType.html +++ b/testing/test_package_docs/reexport_two/AUnicornClass/runtimeType.html @@ -11,7 +11,6 @@ - @@ -21,30 +20,21 @@
    -
    - +
    + + +
    runtimeType
    +
    -
    -
    +
    -
    -
    +
    -
    -
    -

    - - test_package 0.0.1 - - • - - Dart - - • - - cc license - - -

    -
    -
    + + test_package 0.0.1 + + • + + cc license + +
    diff --git a/testing/test_package_docs/reexport_two/AUnicornClass/toString.html b/testing/test_package_docs/reexport_two/AUnicornClass/toString.html index e4cec730d8..099003ff3e 100644 --- a/testing/test_package_docs/reexport_two/AUnicornClass/toString.html +++ b/testing/test_package_docs/reexport_two/AUnicornClass/toString.html @@ -11,7 +11,6 @@ - @@ -21,30 +20,21 @@
    -
    - +
    + + +
    toString
    +
    -
    -
    +
    -
    -
    +
    -
    -
    -

    - - test_package 0.0.1 - - • - - Dart - - • - - cc license - - -

    -
    -
    + + test_package 0.0.1 + + • + + cc license + +
    diff --git a/testing/test_package_docs/reexport_two/SomeClass-class.html b/testing/test_package_docs/reexport_two/SomeClass-class.html index b22bf111e0..7508fa4871 100644 --- a/testing/test_package_docs/reexport_two/SomeClass-class.html +++ b/testing/test_package_docs/reexport_two/SomeClass-class.html @@ -11,7 +11,6 @@ - @@ -21,29 +20,20 @@
    -
    - +
    + + +
    SomeClass
    +
    -
    -
    +
    -
    -
    +
    -
    -
    -

    - - test_package 0.0.1 - - • - - Dart - - • - - cc license - - -

    -
    -
    + + test_package 0.0.1 + + • + + cc license + +
    diff --git a/testing/test_package_docs/reexport_two/SomeClass/SomeClass.html b/testing/test_package_docs/reexport_two/SomeClass/SomeClass.html index 9f994dbbe7..0d57aed928 100644 --- a/testing/test_package_docs/reexport_two/SomeClass/SomeClass.html +++ b/testing/test_package_docs/reexport_two/SomeClass/SomeClass.html @@ -11,7 +11,6 @@ - @@ -21,30 +20,21 @@
    -
    - +
    + + +
    SomeClass
    +
    -
    -
    +
    -
    -
    +
    -
    -
    -

    - - test_package 0.0.1 - - • - - Dart - - • - - cc license - - -

    -
    -
    + + test_package 0.0.1 + + • + + cc license + +
    diff --git a/testing/test_package_docs/reexport_two/SomeClass/hashCode.html b/testing/test_package_docs/reexport_two/SomeClass/hashCode.html index 211f005d85..b19b2921a2 100644 --- a/testing/test_package_docs/reexport_two/SomeClass/hashCode.html +++ b/testing/test_package_docs/reexport_two/SomeClass/hashCode.html @@ -11,7 +11,6 @@ - @@ -21,30 +20,21 @@
    -
    - +
    + + +
    hashCode
    +
    -
    -
    +
    -
    -
    +
    -
    -
    -

    - - test_package 0.0.1 - - • - - Dart - - • - - cc license - - -

    -
    -
    + + test_package 0.0.1 + + • + + cc license + +
    diff --git a/testing/test_package_docs/reexport_two/SomeClass/noSuchMethod.html b/testing/test_package_docs/reexport_two/SomeClass/noSuchMethod.html index 1edeec596b..b94e6682c1 100644 --- a/testing/test_package_docs/reexport_two/SomeClass/noSuchMethod.html +++ b/testing/test_package_docs/reexport_two/SomeClass/noSuchMethod.html @@ -11,7 +11,6 @@ - @@ -21,30 +20,21 @@
    -
    - +
    + + +
    noSuchMethod
    +
    -
    -
    +
    -
    -
    +
    -
    -
    -

    - - test_package 0.0.1 - - • - - Dart - - • - - cc license - - -

    -
    -
    + + test_package 0.0.1 + + • + + cc license + +
    diff --git a/testing/test_package_docs/reexport_two/SomeClass/operator_equals.html b/testing/test_package_docs/reexport_two/SomeClass/operator_equals.html index 75e6460c62..416003c1ae 100644 --- a/testing/test_package_docs/reexport_two/SomeClass/operator_equals.html +++ b/testing/test_package_docs/reexport_two/SomeClass/operator_equals.html @@ -11,7 +11,6 @@ - @@ -21,30 +20,21 @@
    -
    - +
    + + +
    operator ==
    +
    -
    -
    +
    -
    -
    +
    -
    -
    -

    - - test_package 0.0.1 - - • - - Dart - - • - - cc license - - -

    -
    -
    + + test_package 0.0.1 + + • + + cc license + +
    diff --git a/testing/test_package_docs/reexport_two/SomeClass/runtimeType.html b/testing/test_package_docs/reexport_two/SomeClass/runtimeType.html index 4188c08c13..0fbf47523a 100644 --- a/testing/test_package_docs/reexport_two/SomeClass/runtimeType.html +++ b/testing/test_package_docs/reexport_two/SomeClass/runtimeType.html @@ -11,7 +11,6 @@ - @@ -21,30 +20,21 @@
    -
    - +
    + + +
    runtimeType
    +
    -
    -
    +
    -
    -
    +
    -
    -
    -

    - - test_package 0.0.1 - - • - - Dart - - • - - cc license - - -

    -
    -
    + + test_package 0.0.1 + + • + + cc license + +
    diff --git a/testing/test_package_docs/reexport_two/SomeClass/toString.html b/testing/test_package_docs/reexport_two/SomeClass/toString.html index d8cf559add..4f8821fe35 100644 --- a/testing/test_package_docs/reexport_two/SomeClass/toString.html +++ b/testing/test_package_docs/reexport_two/SomeClass/toString.html @@ -11,7 +11,6 @@ - @@ -21,30 +20,21 @@
    -
    - +
    + + +
    toString
    +
    -
    -
    +
    -
    -
    +
    -
    -
    -

    - - test_package 0.0.1 - - • - - Dart - - • - - cc license - - -

    -
    -
    + + test_package 0.0.1 + + • + + cc license + +
    diff --git a/testing/test_package_docs/reexport_two/YetAnotherClass-class.html b/testing/test_package_docs/reexport_two/YetAnotherClass-class.html index 3263e1a49c..aef867af17 100644 --- a/testing/test_package_docs/reexport_two/YetAnotherClass-class.html +++ b/testing/test_package_docs/reexport_two/YetAnotherClass-class.html @@ -11,7 +11,6 @@ - @@ -21,29 +20,20 @@
    -
    - +
    + + +
    YetAnotherClass
    +
    -
    -
    +
    -
    -
    +
    -
    -
    -

    - - test_package 0.0.1 - - • - - Dart - - • - - cc license - - -

    -
    -
    + + test_package 0.0.1 + + • + + cc license + +
    diff --git a/testing/test_package_docs/reexport_two/YetAnotherClass/YetAnotherClass.html b/testing/test_package_docs/reexport_two/YetAnotherClass/YetAnotherClass.html index 4fb678fd36..5e12ac7e09 100644 --- a/testing/test_package_docs/reexport_two/YetAnotherClass/YetAnotherClass.html +++ b/testing/test_package_docs/reexport_two/YetAnotherClass/YetAnotherClass.html @@ -11,7 +11,6 @@ - @@ -21,30 +20,21 @@
    -
    - +
    + + +
    YetAnotherClass
    +
    -
    -
    +
    -
    -
    +
    -
    -
    -

    - - test_package 0.0.1 - - • - - Dart - - • - - cc license - - -

    -
    -
    + + test_package 0.0.1 + + • + + cc license + +
    diff --git a/testing/test_package_docs/reexport_two/YetAnotherClass/hashCode.html b/testing/test_package_docs/reexport_two/YetAnotherClass/hashCode.html index c30ee994d6..e946c5112f 100644 --- a/testing/test_package_docs/reexport_two/YetAnotherClass/hashCode.html +++ b/testing/test_package_docs/reexport_two/YetAnotherClass/hashCode.html @@ -11,7 +11,6 @@ - @@ -21,30 +20,21 @@
    -
    - +
    + + +
    hashCode
    +
    -
    -
    +
    -
    -
    +
    -
    -
    -

    - - test_package 0.0.1 - - • - - Dart - - • - - cc license - - -

    -
    -
    + + test_package 0.0.1 + + • + + cc license + +
    diff --git a/testing/test_package_docs/reexport_two/YetAnotherClass/noSuchMethod.html b/testing/test_package_docs/reexport_two/YetAnotherClass/noSuchMethod.html index 037e296b98..c24d7d3e7e 100644 --- a/testing/test_package_docs/reexport_two/YetAnotherClass/noSuchMethod.html +++ b/testing/test_package_docs/reexport_two/YetAnotherClass/noSuchMethod.html @@ -11,7 +11,6 @@ - @@ -21,30 +20,21 @@
    -
    - +
    + + +
    noSuchMethod
    +
    -
    -
    +
    -
    -
    +
    -
    -
    -

    - - test_package 0.0.1 - - • - - Dart - - • - - cc license - - -

    -
    -
    + + test_package 0.0.1 + + • + + cc license + +
    diff --git a/testing/test_package_docs/reexport_two/YetAnotherClass/operator_equals.html b/testing/test_package_docs/reexport_two/YetAnotherClass/operator_equals.html index 0e81e86322..ac8a6aec62 100644 --- a/testing/test_package_docs/reexport_two/YetAnotherClass/operator_equals.html +++ b/testing/test_package_docs/reexport_two/YetAnotherClass/operator_equals.html @@ -11,7 +11,6 @@ - @@ -21,30 +20,21 @@
    -
    - +
    + + +
    operator ==
    +
    -
    -
    +
    -
    -
    +
    -
    -
    -

    - - test_package 0.0.1 - - • - - Dart - - • - - cc license - - -

    -
    -
    + + test_package 0.0.1 + + • + + cc license + +
    diff --git a/testing/test_package_docs/reexport_two/YetAnotherClass/runtimeType.html b/testing/test_package_docs/reexport_two/YetAnotherClass/runtimeType.html index 11cd546c47..83721691dc 100644 --- a/testing/test_package_docs/reexport_two/YetAnotherClass/runtimeType.html +++ b/testing/test_package_docs/reexport_two/YetAnotherClass/runtimeType.html @@ -11,7 +11,6 @@ - @@ -21,30 +20,21 @@
    -
    - +
    + + +
    runtimeType
    +
    -
    -
    +
    -
    -
    +
    -
    -
    -

    - - test_package 0.0.1 - - • - - Dart - - • - - cc license - - -

    -
    -
    + + test_package 0.0.1 + + • + + cc license + +
    diff --git a/testing/test_package_docs/reexport_two/YetAnotherClass/toString.html b/testing/test_package_docs/reexport_two/YetAnotherClass/toString.html index 2cc8070577..b1a11511ad 100644 --- a/testing/test_package_docs/reexport_two/YetAnotherClass/toString.html +++ b/testing/test_package_docs/reexport_two/YetAnotherClass/toString.html @@ -11,7 +11,6 @@ - @@ -21,30 +20,21 @@
    -
    - +
    + + +
    toString
    +
    -
    -
    +
    -
    -
    +
    -
    -
    -

    - - test_package 0.0.1 - - • - - Dart - - • - - cc license - - -

    -
    -
    + + test_package 0.0.1 + + • + + cc license + +
    diff --git a/testing/test_package_docs/reexport_two/reexport_two-library.html b/testing/test_package_docs/reexport_two/reexport_two-library.html index bf928dbb16..78819da53e 100644 --- a/testing/test_package_docs/reexport_two/reexport_two-library.html +++ b/testing/test_package_docs/reexport_two/reexport_two-library.html @@ -11,7 +11,6 @@ - @@ -21,28 +20,19 @@
    -
    - +
    + + +
    reexport_two
    +
    -
    -
    +
    -
    -
    +
    -
    -
    -

    - - test_package 0.0.1 - - • - - Dart - - • - - cc license - - -

    -
    -
    + + test_package 0.0.1 + + • + + cc license + +