Merge pull request sourcegraph#107 from sourcegraph/sg/references-builtin

slimsag · web-flow · commit a4de5d23fcd0 · 2017-01-23T12:53:32.000-07:00
langserver: return 'no results' not an error on builtins
diff --git a/langserver/references.go b/langserver/references.go
@@ -26,7 +26,7 @@ func (h *LangHandler) handleTextDocumentReferences(ctx context.Context, conn JSO
 		// Invalid nodes means we tried to click on something which is
 		// not an ident (eg comment/string/etc). Return no information.
 		if _, ok := err.(*invalidNodeError); ok {
-			return nil, nil
+			return []lsp.Location{}, nil
 		}
 		return nil, err
 	}
@@ -54,6 +54,11 @@ func (h *LangHandler) handleTextDocumentReferences(ctx context.Context, conn JSO
 	}
 
 	if obj.Pkg() == nil {
+		if _, builtin := obj.(*types.Builtin); builtin {
+			// We don't support builtin references due to the massive number
+			// of references, so ignore the missing package error.
+			return []lsp.Location{}, nil
+		}
 		return nil, fmt.Errorf("no package found for object %s", obj)
 	}
 	defpkg := obj.Pkg().Path()

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ func (h *LangHandler) handleTextDocumentReferences(ctx context.Context, conn JSO`
`26`	`26`	`// Invalid nodes means we tried to click on something which is`
`27`	`27`	`// not an ident (eg comment/string/etc). Return no information.`
`28`	`28`	`if _, ok := err.(*invalidNodeError); ok {`
`29`		`- return nil, nil`
	`29`	`+ return []lsp.Location{}, nil`
`30`	`30`	`}`
`31`	`31`	`return nil, err`
`32`	`32`	`}`
`@@ -54,6 +54,11 @@ func (h *LangHandler) handleTextDocumentReferences(ctx context.Context, conn JSO`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`if obj.Pkg() == nil {`
	`57`	`+ if _, builtin := obj.(*types.Builtin); builtin {`
	`58`	`+ // We don't support builtin references due to the massive number`
	`59`	`+ // of references, so ignore the missing package error.`
	`60`	`+ return []lsp.Location{}, nil`
	`61`	`+ }`
`57`	`62`	`return nil, fmt.Errorf("no package found for object %s", obj)`
`58`	`63`	`}`
`59`	`64`	`defpkg := obj.Pkg().Path()`