Merge pull request sourcegraph#103 from sourcegraph/sg/fix-500

slimsag · web-flow · commit ded64a5aa8f8 · 2017-01-22T19:50:17.000-07:00
textDocument/xdefinition: do not return "nil" AND no error.
diff --git a/langserver/definition.go b/langserver/definition.go
@@ -32,7 +32,7 @@ func (h *LangHandler) handleXDefinition(ctx context.Context, conn JSONRPC2Conn,
 		// Invalid nodes means we tried to click on something which is
 		// not an ident (eg comment/string/etc). Return no locations.
 		if _, ok := err.(*invalidNodeError); ok {
-			return nil, nil
+			return []symbolLocationInformation{}, nil
 		}
 		return nil, err
 	}
@@ -51,7 +51,7 @@ func (h *LangHandler) handleXDefinition(ctx context.Context, conn JSONRPC2Conn,
 			//
 			// TODO(sqs): find a way to actually emit builtin locations
 			// (pointing to builtin/builtin.go).
-			return nil, nil
+			return []symbolLocationInformation{}, nil
 		}
 	}
 	if len(nodes) == 0 {

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ func (h *LangHandler) handleXDefinition(ctx context.Context, conn JSONRPC2Conn,`
`32`	`32`	`// Invalid nodes means we tried to click on something which is`
`33`	`33`	`// not an ident (eg comment/string/etc). Return no locations.`
`34`	`34`	`if _, ok := err.(*invalidNodeError); ok {`
`35`		`- return nil, nil`
	`35`	`+ return []symbolLocationInformation{}, nil`
`36`	`36`	`}`
`37`	`37`	`return nil, err`
`38`	`38`	`}`
`@@ -51,7 +51,7 @@ func (h *LangHandler) handleXDefinition(ctx context.Context, conn JSONRPC2Conn,`
`51`	`51`	`//`
`52`	`52`	`// TODO(sqs): find a way to actually emit builtin locations`
`53`	`53`	`// (pointing to builtin/builtin.go).`
`54`		`- return nil, nil`
	`54`	`+ return []symbolLocationInformation{}, nil`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`	`if len(nodes) == 0 {`