1 files changed, 8 insertions, 2 deletions
diff --git a/workhorse/internal/lsif_transformer/parser/docs.go b/workhorse/internal/lsif_transformer/parser/docs.go
index f87bc7fd86c..9cdec4c8d42 100644
--- a/workhorse/internal/lsif_transformer/parser/docs.go
+++ b/workhorse/internal/lsif_transformer/parser/docs.go
@@ -5,6 +5,7 @@ import (
 	"bufio"
 	"encoding/json"
 	"io"
+	"path/filepath"
 	"strings"
 )
 
@@ -116,7 +117,7 @@ func (d *Docs) addMetadata(line []byte) error {
 		return err
 	}
 
-	d.Root = strings.TrimSpace(metadata.Root) + "/"
+	d.Root = strings.TrimSpace(metadata.Root)
 
 	return nil
 }
@@ -127,7 +128,12 @@ func (d *Docs) addDocument(line []byte) error {
 		return err
 	}
 
-	d.Entries[doc.Id] = strings.TrimPrefix(doc.Uri, d.Root)
+	relativePath, err := filepath.Rel(d.Root, doc.Uri)
+	if err != nil {
+		relativePath = doc.Uri
+	}
+
+	d.Entries[doc.Id] = relativePath
 
 	return nil
 }