godoc: fix identifier search

Thanks to Andrey Mirtchovski for tracking this down.

This was broken by CL 5528077 which removed the InsertSemis
flag from go/scanner - as a result, semicolons are now always
inserted and the respective indexer code checked for the
wrong token.

Replaced the code by a direct identifier test.

R=rsc
CC=golang-dev
https://golang.org/cl/5606065

diff --git a/src/cmd/godoc/index.go b/src/cmd/godoc/index.go
index 3d2c3ff961d10b4c9866942b0b174c464d3f9796..daf1bc2cc14b49efd555d596fd86c4549236bb8c 100644 (file)
--- a/src/cmd/godoc/index.go
+++ b/src/cmd/godoc/index.go
@@ -44,7 +44,6 @@ import (
        "errors"
        "go/ast"
        "go/parser"
-       "go/scanner"
        "go/token"
        "index/suffixarray"
        "io"
@@ -54,6 +53,7 @@ import (
        "sort"
        "strings"
        "time"
+       "unicode"
 )
 
 // ----------------------------------------------------------------------------
@@ -921,15 +921,15 @@ func (x *Index) lookupWord(w string) (match *LookupResult, alt *AltWords) {
        return
 }
 
+// isIdentifier reports whether s is a Go identifier.
 func isIdentifier(s string) bool {
-       var S scanner.Scanner
-       fset := token.NewFileSet()
-       S.Init(fset.AddFile("", fset.Base(), len(s)), []byte(s), nil, 0)
-       if _, tok, _ := S.Scan(); tok == token.IDENT {
-               _, tok, _ := S.Scan()
-               return tok == token.EOF
+       for i, ch := range s {
+               if unicode.IsLetter(ch) || ch == ' ' || i > 0 && unicode.IsDigit(ch) {
+                       continue
+               }
+               return false
        }
-       return false
+       return len(s) > 0
 }
 
 // For a given query, which is either a single identifier or a qualified