export: remove unnecessary contents filed in defInfo (#21)

* export/exporter: ignore import with no package info * export: remove unnecessary contents filed in defInfo
sourcegraph · Aug 14, 2019 · 1d25d56 · 1d25d56
1 parent fe9790e
commit 1d25d56
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 17 deletions.
diff --git a/export/exporter.go b/export/exporter.go
@@ -290,11 +290,6 @@ func (e *exporter) exportDefs(p *packages.Package, f *ast.File, fi *fileInfo, pr
 			return fmt.Errorf(`emit "next": %v`, err)
 		}
 
-		contents, err := findContents(f, obj)
-		if err != nil {
-			return fmt.Errorf("find contents: %v", err)
-		}
-
 		switch v := obj.(type) {
 		case *types.Func:
 			log.Debugln("[func] Def:", ident.Name)
@@ -303,7 +298,6 @@ func (e *exporter) exportDefs(p *packages.Package, f *ast.File, fi *fileInfo, pr
 			e.funcs[v.FullName()] = &defInfo{
 				rangeID:     rangeID,
 				resultSetID: refResult.resultSetID,
-				contents:    contents,
 			}
 
 		case *types.Const:
@@ -312,7 +306,6 @@ func (e *exporter) exportDefs(p *packages.Package, f *ast.File, fi *fileInfo, pr
 			e.consts[ident.Pos()] = &defInfo{
 				rangeID:     rangeID,
 				resultSetID: refResult.resultSetID,
-				contents:    contents,
 			}
 
 		case *types.Var:
@@ -321,7 +314,6 @@ func (e *exporter) exportDefs(p *packages.Package, f *ast.File, fi *fileInfo, pr
 			e.vars[ident.Pos()] = &defInfo{
 				rangeID:     rangeID,
 				resultSetID: refResult.resultSetID,
-				contents:    contents,
 			}
 
 		case *types.TypeName:
@@ -331,7 +323,6 @@ func (e *exporter) exportDefs(p *packages.Package, f *ast.File, fi *fileInfo, pr
 			e.types[obj.Type().String()] = &defInfo{
 				rangeID:     rangeID,
 				resultSetID: refResult.resultSetID,
-				contents:    contents,
 			}
 
 		case *types.Label:
@@ -340,7 +331,6 @@ func (e *exporter) exportDefs(p *packages.Package, f *ast.File, fi *fileInfo, pr
 			e.labels[ident.Pos()] = &defInfo{
 				rangeID:     rangeID,
 				resultSetID: refResult.resultSetID,
-				contents:    contents,
 			}
 
 		case *types.PkgName:
@@ -349,7 +339,6 @@ func (e *exporter) exportDefs(p *packages.Package, f *ast.File, fi *fileInfo, pr
 			e.imports[ident.Pos()] = &defInfo{
 				rangeID:     rangeID,
 				resultSetID: refResult.resultSetID,
-				contents:    contents,
 			}
 
 		default:
@@ -359,6 +348,11 @@ func (e *exporter) exportDefs(p *packages.Package, f *ast.File, fi *fileInfo, pr
 			continue
 		}
 
+		contents, err := findContents(f, obj)
+		if err != nil {
+			return fmt.Errorf("find contents: %v", err)
+		}
+
 		hoverResultID, err := e.emitHoverResult(contents)
 		if err != nil {
 			return fmt.Errorf(`emit "hoverResult": %v`, err)

diff --git a/export/types.go b/export/types.go
@@ -1,9 +1,5 @@
 package export
 
-import (
-	"github.com/sourcegraph/lsif-go/protocol"
-)
-
 // fileInfo contains LSIF information of a file.
 type fileInfo struct {
 	// The vertex ID of the document that represents the file.
@@ -22,8 +18,6 @@ type defInfo struct {
 	rangeID string
 	// The vertex ID of the resultSet that represents the definition.
 	resultSetID string
-	// The contents will be used as the hover information.
-	contents []protocol.MarkedString
 	// The lazily initialized definition result ID upon first use found.
 	defResultID string
 }