Indexing: improve skipped doc handling

build/builder.go

@@ -951,6 +951,11 @@ type rankedDoc struct {
 // at query time, because earlier documents receive a boost at query time and
 // have a higher chance of being searched before limits kick in.
 func rank(d *zoekt.Document, origIdx int) []float64 {
+	skipped := 0.0
+	if d.SkipReason != "" {
+		skipped = 1.0
+	}
+
 	generated := 0.0
 	if isGenerated(d.Name) {
 		generated = 1.0
@@ -968,6 +973,9 @@ func rank(d *zoekt.Document, origIdx int) []float64 {
 
 	// Smaller is earlier (=better).
 	return []float64{
+		// Always place skipped docs last
+		skipped,
+
 		// Prefer docs that are not generated
 		generated,
 

build/ctags.go

@@ -49,7 +49,7 @@ func ctagsAddSymbolsParserMap(todo []*zoekt.Document, languageMap ctags.Language
 	var tagsToSections tagsToSections
 
 	for _, doc := range todo {
-		if doc.Symbols != nil {
+		if doc.Content == nil || doc.Symbols != nil {
 			continue
 		}
 

build/e2e_test.go

@@ -525,6 +525,27 @@ func TestFileRank(t *testing.T) {
 			},
 		},
 		want: []int{0, 2, 1},
+	}, {
+		name: "skipped docs",
+		docs: []*zoekt.Document{
+			{
+				Name: "binary_file",
+				SkipReason: "binary file",
+			},
+			{
+				Name: "some_test.go",
+				Content: []byte("bla"),
+			},
+			{
+				Name: "large_file.go",
+				SkipReason: "too large",
+			},
+			{
+				Name: "file.go",
+				Content: []byte("blabla"),
+			},
+		},
+		want: []int{3, 1, 0, 2},
 	}} {
 		t.Run(c.name, func(t *testing.T) {
 			testFileRankAspect(t, c)