Don't assume the pubspec is only one level up from a library

Don't assume the pubspec is only one level up from a library

BUG=
R=kevmoo@google.com

Committed: https://code.google.com/p/dart/source/detail?r=32994

[Alan Knight, 2014-02-21 23:59:51]

This allows the case that you have a package with a complex directory structure
and want to explicitly list the libraries you want to appear. e.g.
  docgen myStuff/things/thing.dart myStuff/config/configStuff.dart etc.
and still have them all be recognized as part of the package.

[kevmoo, 2014-02-24 17:49:02]

https://codereview.chromium.org/175693005/diff/1/pkg/docgen/lib/docgen.dart
File pkg/docgen/lib/docgen.dart (right):

https://codereview.chromium.org/175693005/diff/1/pkg/docgen/lib/docgen.dart#n...
pkg/docgen/lib/docgen.dart:1451:
_packageDirectoryFor(path.dirname(path.dirname(mirror.uri.toFilePath())));
Could you break this out and explain why there are two nested calls to dirname,
etc?

At the moment, it's not how/why the code is written this way

https://codereview.chromium.org/175693005/diff/1/pkg/docgen/lib/docgen.dart#n...
pkg/docgen/lib/docgen.dart:1466: if (newDir == dir) return null;
What happens in the null case?

[Alan Knight, 2014-02-24 18:14:02]

https://codereview.chromium.org/175693005/diff/1/pkg/docgen/lib/docgen.dart
File pkg/docgen/lib/docgen.dart (right):

https://codereview.chromium.org/175693005/diff/1/pkg/docgen/lib/docgen.dart#n...
pkg/docgen/lib/docgen.dart:1451:
_packageDirectoryFor(path.dirname(path.dirname(mirror.uri.toFilePath())));
On 2014/02/24 17:49:02, kevmoo wrote:
> Could you break this out and explain why there are two nested calls to
dirname,
> etc?
> 
> At the moment, it's not how/why the code is written this way

Done.

https://codereview.chromium.org/175693005/diff/1/pkg/docgen/lib/docgen.dart#n...
pkg/docgen/lib/docgen.dart:1466: if (newDir == dir) return null;
On 2014/02/24 17:49:02, kevmoo wrote:
> What happens in the null case?

It should indicate that we're not in a package, so shouldn't try to find package
information. Added some checks so that happens.

[kevmoo, 2014-02-24 18:22:18]

https://codereview.chromium.org/175693005/diff/80001/pkg/docgen/lib/docgen.dart
File pkg/docgen/lib/docgen.dart (right):

https://codereview.chromium.org/175693005/diff/80001/pkg/docgen/lib/docgen.da...
pkg/docgen/lib/docgen.dart:1454: // packagename/lib/.../filename.dart, so we
know that a possible
A package file could be packname/lib/packname.dart

Right?

https://codereview.chromium.org/175693005/diff/80001/pkg/docgen/lib/docgen.da...
pkg/docgen/lib/docgen.dart:1458: _packageDirectoryFor(directoryAbove);
Missing return?

[Alan Knight, 2014-02-24 18:26:59]

https://codereview.chromium.org/175693005/diff/80001/pkg/docgen/lib/docgen.dart
File pkg/docgen/lib/docgen.dart (right):

https://codereview.chromium.org/175693005/diff/80001/pkg/docgen/lib/docgen.da...
pkg/docgen/lib/docgen.dart:1454: // packagename/lib/.../filename.dart, so we
know that a possible
On 2014/02/24 18:22:19, kevmoo wrote:
> A package file could be packname/lib/packname.dart
> 
> Right?

Yes, that's the normal case, so "..." could be nothing.

https://codereview.chromium.org/175693005/diff/80001/pkg/docgen/lib/docgen.da...
pkg/docgen/lib/docgen.dart:1458: _packageDirectoryFor(directoryAbove);
On 2014/02/24 18:22:19, kevmoo wrote:
> Missing return?

Done.

[kevmoo, 2014-02-24 18:42:25]

LGTM

https://codereview.chromium.org/175693005/diff/80001/pkg/docgen/lib/docgen.dart
File pkg/docgen/lib/docgen.dart (right):

https://codereview.chromium.org/175693005/diff/80001/pkg/docgen/lib/docgen.da...
pkg/docgen/lib/docgen.dart:1454: // packagename/lib/.../filename.dart, so we
know that a possible
On 2014/02/24 18:27:00, Alan Knight wrote:
> On 2014/02/24 18:22:19, kevmoo wrote:
> > A package file could be packname/lib/packname.dart
> > 
> > Right?
> 
> Yes, that's the normal case, so "..." could be nothing.

Gottcha

[Emily Fortuna, 2014-02-24 18:59:22]

will this allow you to take out those lines that were added in this CL:
https://codereview.chromium.org/170713004/ ?

[Alan Knight, 2014-02-24 19:56:03]

On 2014/02/24 18:59:22, Emily Fortuna wrote:
> will this allow you to take out those lines that were added in this CL:
> https://codereview.chromium.org/170713004/ ?

Sadly, no. This would let you explicitly enumerate all the libraries you wanted
documented, but it doesn't do that for the SDK libs, and I don't think we really
want to do it that way, as it would be fragile.

[Alan Knight, 2014-02-24 23:25:49]

Committed patchset #4 manually as r32994 (presubmit successful).