Merge pull request #380 from notjrbauer/5383-const-values

Display values of constants onHover

Author: efritz

langserver/hover.go

@@ -97,7 +97,7 @@ func (h *LangHandler) handleHover(ctx context.Context, conn jsonrpc2.JSONRPC2, r
 			}
 		}
 		if s == "" {
-			s = types.ObjectString(o, qf)
+			s = objectString(o, qf)
 		}
 	} else if t != nil {
 		s = types.TypeString(t, qf)
@@ -667,6 +667,16 @@ func typeName(fset *token.FileSet, typ ast.Expr) string {
 	}
 }
 
+// objectString wraps types.ObjectString for specific type formatting.
+func objectString(obj types.Object, qf types.Qualifier) string {
+	str := types.ObjectString(obj, qf)
+	switch obj := obj.(type) {
+	case *types.Const:
+		str = fmt.Sprintf("%s = %s", str, obj.Val())
+	}
+	return str
+}
+
 // fmtNode formats the given node as a string.
 func fmtNode(fset *token.FileSet, n ast.Node) string {
 	var buf bytes.Buffer

langserver/integration_test.go

@@ -26,6 +26,7 @@ func TestIntegration_FileSystem(t *testing.T) {
 		"A.go":    "package p; func A() int { return 0 }",
 		"B.go":    "package p; var _ = A",
 		"P2/C.go": `package p2; import "test/p"; var _ = p.A`,
+		"P2/D.go": `package p2; const D int = 1`,
 	}
 	integrationTest(t, files, nil, func(ctx context.Context, rootURI lsp.DocumentURI, conn *jsonrpc2.Conn, notifies chan *jsonrpc2.Request) {
 		// Test some hovers using files on disk.
@@ -34,6 +35,7 @@ func TestIntegration_FileSystem(t *testing.T) {
 				"A.go:1:17":    "func A() int",
 				"B.go:1:20":    "func A() int",
 				"P2/C.go:1:40": "func A() int",
+				"P2/D.go:1:19": "const D int = 1",
 			},
 		}
 		lspTests(t, ctx, nil, conn, rootURI, cases)
@@ -53,6 +55,7 @@ func TestIntegration_FileSystem(t *testing.T) {
 				"A.go:1:17":    "func A() int",
 				"B.go:1:20":    "func A() int",
 				"P2/C.go:1:40": "func A() int",
+				"P2/D.go:1:19": "const D int = 1",
 			},
 		}
 		lspTests(t, ctx, nil, conn, rootURI, cases)
@@ -95,6 +98,7 @@ func TestIntegration_FileSystem(t *testing.T) {
 				"A.go:1:28":    "func A(i int)",
 				"B.go:1:20":    "func A(i int)",
 				"P2/C.go:1:40": "func A(i int)",
+				"P2/D.go:1:19": "const D int = 1",
 			},
 		}
 		lspTests(t, ctx, nil, conn, rootURI, cases)