diff --git a/deps.bzl b/deps.bzl index f84f3cd5d5ce..8e71a11b0f5f 100644 --- a/deps.bzl +++ b/deps.bzl @@ -5436,7 +5436,7 @@ def go_dependencies(): importpath = "github.com/opentracing-contrib/go-stdlib", sum = "h1:TBS7YuVotp8myLon4Pv7BtCBzOTo1DeZCld0Z63mW2w=", version = "v1.0.0", - ) # keep + ) # keep go_repository( name = "com_github_opentracing_opentracing_go", build_file_proto_mode = "disable_global", @@ -6343,16 +6343,16 @@ def go_dependencies(): ], build_file_proto_mode = "disable_global", importpath = "github.com/sourcegraph/scip", - sum = "h1:nl0JdCmCkQYTM1gQWbDJkdaiXyoZiluUzJbyeBDGFe0=", - version = "v0.2.4-0.20230403145725-e720fb88e6fd", + sum = "h1:6PgJPdhDHRGskCu7+NxodNtX1z8umdC40QvoQt4FsP8=", + version = "v0.2.4-0.20230613194658-b62733841bc3", ) go_repository( name = "com_github_sourcegraph_zoekt", build_file_proto_mode = "disable_global", importpath = "github.com/sourcegraph/zoekt", - sum = "h1:gms1atY5vZtkWM49K+Ym5c6x0dOhC0CWZUt+ac0xkaQ=", - version = "v0.0.0-20230607145326-88def9b1ed08", + sum = "h1:BF1WS0akdRzj/2nYEzqcVhnBDbgucO6sqgDmKgbQDU8=", + version = "v0.0.0-20230613154029-b8b672211c40", ) go_repository( diff --git a/enterprise/internal/codeintel/ranking/internal/background/exporter/job.go b/enterprise/internal/codeintel/ranking/internal/background/exporter/job.go index dee7a69abcaa..00da95105df0 100644 --- a/enterprise/internal/codeintel/ranking/internal/background/exporter/job.go +++ b/enterprise/internal/codeintel/ranking/internal/background/exporter/job.go @@ -259,4 +259,6 @@ var noVersionFormatter = scip.SymbolFormatter{ IncludePackageName: func(_ string) bool { return true }, IncludePackageVersion: func(_ string) bool { return false }, IncludeDescriptor: func(_ string) bool { return true }, + IncludeRawDescriptor: func(_ *scip.Descriptor) bool { return true }, + IncludeDisambiguator: func(_ string) bool { return true }, } diff --git a/go.mod b/go.mod index 87f2cd9fa674..9941f6e775cf 100644 --- a/go.mod +++ b/go.mod @@ -197,7 +197,7 @@ require ( github.com/sourcegraph/jsonx v0.0.0-20200629203448-1a936bd500cf github.com/sourcegraph/log v0.0.0-20230523201558-ad2d71b4d2ee github.com/sourcegraph/run v0.12.0 - github.com/sourcegraph/scip v0.2.4-0.20230403145725-e720fb88e6fd + github.com/sourcegraph/scip v0.2.4-0.20230613194658-b62733841bc3 github.com/sourcegraph/sourcegraph/enterprise/dev/ci/images v0.0.0-20220203145655-4d2a39d3038a github.com/sourcegraph/sourcegraph/lib v0.0.0-20230124150142-7833ec00539f github.com/stretchr/testify v1.8.2 diff --git a/go.sum b/go.sum index 410084582a9b..71a2ac478940 100644 --- a/go.sum +++ b/go.sum @@ -2063,8 +2063,8 @@ github.com/sourcegraph/mountinfo v0.0.0-20230106004439-7026e28cef67 h1:NSYSPQOE7 github.com/sourcegraph/mountinfo v0.0.0-20230106004439-7026e28cef67/go.mod h1:4DAabK408OEbyK2NUEQ5YRApyB/p0XNGJyC1YPBAKq4= github.com/sourcegraph/run v0.12.0 h1:3A8w5e8HIYPfafHekvmdmmh42RHKGVhmiTZAPJclg7I= github.com/sourcegraph/run v0.12.0/go.mod h1:PwaP936BTnAJC1cqR5rSbG5kOs/EWStTK3lqvMX5GUA= -github.com/sourcegraph/scip v0.2.4-0.20230403145725-e720fb88e6fd h1:nl0JdCmCkQYTM1gQWbDJkdaiXyoZiluUzJbyeBDGFe0= -github.com/sourcegraph/scip v0.2.4-0.20230403145725-e720fb88e6fd/go.mod h1:ymcTuv+6D5OEZB/84TRPQvUpDK7v7zXnWBJl79hb7ns= +github.com/sourcegraph/scip v0.2.4-0.20230613194658-b62733841bc3 h1:6PgJPdhDHRGskCu7+NxodNtX1z8umdC40QvoQt4FsP8= +github.com/sourcegraph/scip v0.2.4-0.20230613194658-b62733841bc3/go.mod h1:ymcTuv+6D5OEZB/84TRPQvUpDK7v7zXnWBJl79hb7ns= github.com/sourcegraph/yaml v1.0.1-0.20200714132230-56936252f152 h1:z/MpntplPaW6QW95pzcAR/72Z5TWDyDnSo0EOcyij9o= github.com/sourcegraph/yaml v1.0.1-0.20200714132230-56936252f152/go.mod h1:GIjDIg/heH5DOkXY3YJ/wNhfHsQHoXGjl8G8amsYQ1I= github.com/sourcegraph/zoekt v0.0.0-20230613154029-b8b672211c40 h1:BF1WS0akdRzj/2nYEzqcVhnBDbgucO6sqgDmKgbQDU8= diff --git a/lib/go.mod b/lib/go.mod index 64900e313971..110469993681 100644 --- a/lib/go.mod +++ b/lib/go.mod @@ -25,7 +25,7 @@ require ( github.com/sourcegraph/go-diff v0.6.2-0.20221123165719-f8cd299c40f3 github.com/sourcegraph/jsonx v0.0.0-20200629203448-1a936bd500cf github.com/sourcegraph/log v0.0.0-20221206163500-7d93c6ad7037 - github.com/sourcegraph/scip v0.2.4-0.20221213205653-aa0e511dcfef + github.com/sourcegraph/scip v0.2.4-0.20230613194658-b62733841bc3 github.com/stretchr/testify v1.8.2 github.com/urfave/cli/v2 v2.23.7 github.com/xeipuuv/gojsonschema v1.2.0 diff --git a/lib/go.sum b/lib/go.sum index c07e390582d7..40184ebfd3b3 100644 --- a/lib/go.sum +++ b/lib/go.sum @@ -437,8 +437,8 @@ github.com/sourcegraph/jsonx v0.0.0-20200629203448-1a936bd500cf h1:oAdWFqhStsWii github.com/sourcegraph/jsonx v0.0.0-20200629203448-1a936bd500cf/go.mod h1:ppFaPm6kpcHnZGqQTFhUIAQRIEhdQDWP1PCv4/ON354= github.com/sourcegraph/log v0.0.0-20221206163500-7d93c6ad7037 h1:hgZHfGYG3KMlDDfACuPgzhMIaEjblCqZ+YltcPgd0tw= github.com/sourcegraph/log v0.0.0-20221206163500-7d93c6ad7037/go.mod h1:y+sVdVKxHhp489iiiXeZgXIhSpFYijtp/pLD2coj96g= -github.com/sourcegraph/scip v0.2.4-0.20221213205653-aa0e511dcfef h1:fWPxLkDObzzKTGe9vb6wpzK0FYkwcfSxmxUBvAOc8aw= -github.com/sourcegraph/scip v0.2.4-0.20221213205653-aa0e511dcfef/go.mod h1:ymcTuv+6D5OEZB/84TRPQvUpDK7v7zXnWBJl79hb7ns= +github.com/sourcegraph/scip v0.2.4-0.20230613194658-b62733841bc3 h1:6PgJPdhDHRGskCu7+NxodNtX1z8umdC40QvoQt4FsP8= +github.com/sourcegraph/scip v0.2.4-0.20230613194658-b62733841bc3/go.mod h1:ymcTuv+6D5OEZB/84TRPQvUpDK7v7zXnWBJl79hb7ns= github.com/sourcegraph/yaml v1.0.1-0.20200714132230-56936252f152 h1:z/MpntplPaW6QW95pzcAR/72Z5TWDyDnSo0EOcyij9o= github.com/sourcegraph/yaml v1.0.1-0.20200714132230-56936252f152/go.mod h1:GIjDIg/heH5DOkXY3YJ/wNhfHsQHoXGjl8G8amsYQ1I= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=