code review 67110043: godoc: Fix m=src URLs.

godoc: Fix m=src URLs.
For source code links, prepend /src/pkg if not already prefixed.
Fixes issue 7383.

[bgarcia, 2014-02-21 20:12:23]

Hello bradfitz, sameer@golang.org (cc: golang-codereviews@googlegroups.com),

I'd like you to review this change to
https://code.google.com/p/go.tools

[bradfitz, 2014-02-21 22:31:16]

LGTM



On Fri, Feb 21, 2014 at 12:12 PM, <bgarcia@golang.org> wrote:

> Reviewers: bradfitz, Sameer Ajmani,
>
> Message:
> Hello bradfitz, sameer@golang.org (cc:
> golang-codereviews@googlegroups.com),
>
> I'd like you to review this change to
> https://code.google.com/p/go.tools
>
>
> Description:
> godoc: Fix m=src URLs.
> For source code links, prepend /src/pkg if not already prefixed.
> Fixes issue 7383.
>
> Please review this at https://codereview.appspot.com/67110043/
>
> Affected files (+16, -3 lines):
>   M godoc/godoc.go
>   M godoc/godoc_test.go
>   M godoc/static/package.html
>   M godoc/static/static.go
>
>
> Index: godoc/godoc.go
> ===================================================================
> --- a/godoc/godoc.go
> +++ b/godoc/godoc.go
> @@ -280,6 +280,7 @@
>  }
>
>  func srcPosLinkFunc(s string, line, low, high int) string {
> +       s = srcLinkFunc(s)
>         var buf bytes.Buffer
>         template.HTMLEscape(&buf, []byte(s))
>         // selection ranges are of form "s=low:high"
> @@ -301,7 +302,11 @@
>  }
>
>  func srcLinkFunc(s string) string {
> -       return pathpkg.Clean("/" + s)
> +       s = pathpkg.Clean("/" + s)
> +       if !strings.HasPrefix(s, "/src/pkg/") {
> +               s = "/src/pkg" + s
> +       }
> +       return s
>  }
>
>  // queryLinkFunc returns a URL for a line in a source file with a
> highlighted
> Index: godoc/godoc_test.go
> ===================================================================
> --- a/godoc/godoc_test.go
> +++ b/godoc/godoc_test.go
> @@ -35,6 +35,8 @@
>                 {"/src/pkg/fmt/print.go", 2, 0, 0,
> "/src/pkg/fmt/print.go#L2"},
>                 {"/src/pkg/fmt/print.go", 0, 0, 0,
> "/src/pkg/fmt/print.go"},
>                 {"/src/pkg/fmt/print.go", 0, 1, 5,
> "/src/pkg/fmt/print.go?s=1:5#L1"},
> +               {"fmt/print.go", 0, 0, 0, "/src/pkg/fmt/print.go"},
> +               {"fmt/print.go", 0, 1, 5, "/src/pkg/fmt/print.go?s=1:5#
> L1"},
>         } {
>                 if got, want := srcPosLinkFunc(tc.src, tc.line, tc.low,
> tc.high), tc.want; got != want {
>                         t.Errorf("srcLinkFunc(%v, %v, %v, %v) = %v; want
> %v", tc.src, tc.line, tc.low, tc.high, got, want)
> @@ -49,6 +51,8 @@
>         }{
>                 {"/src/pkg/fmt/print.go", "/src/pkg/fmt/print.go"},
>                 {"src/pkg/fmt/print.go", "/src/pkg/fmt/print.go"},
> +               {"/fmt/print.go", "/src/pkg/fmt/print.go"},
> +               {"fmt/print.go", "/src/pkg/fmt/print.go"},
>         } {
>                 if got, want := srcLinkFunc(tc.src), tc.want; got != want {
>                         t.Errorf("srcLinkFunc(%v) = %v; want %v", tc.src,
> got, want)
> Index: godoc/static/package.html
> ===================================================================
> --- a/godoc/static/package.html
> +++ b/godoc/static/package.html
> @@ -179,7 +179,9 @@
>  {{end}}
>
>  {{with .PAst}}
> -       <pre>{{node_html $ . false}}</pre>
> +       {{range $filename, $ast := .}}
> +               <a
href="{{$filename|srcLink|html}}">{{$filename|filename|html}}</a>:<pre>{{node_html
> $ $ast false}}</pre>
> +       {{end}}
>  {{end}}
>
>  {{with .Dirs}}
> Index: godoc/static/static.go
> ===================================================================
> --- a/godoc/static/static.go
> +++ b/godoc/static/static.go
> @@ -705,7 +705,9 @@
>  {{end}}
>
>  {{with .PAst}}
> -       <pre>{{node_html $ . false}}</pre>
> +       {{range $filename, $ast := .}}
> +               <a
href="{{$filename|srcLink|html}}">{{$filename|filename|html}}</a>:<pre>{{node_html
> $ $ast false}}</pre>
> +       {{end}}
>  {{end}}
>
>  {{with .Dirs}}
>
>
>

[bgarcia, 2014-02-22 00:51:52]

*** Submitted as
https://code.google.com/p/go/source/detail?r=67afad85d9a4&repo=tools ***

godoc: Fix m=src URLs.
For source code links, prepend /src/pkg if not already prefixed.
Fixes issue 7383.

R=bradfitz, sameer
CC=golang-codereviews
https://codereview.appspot.com/67110043