artin/sourcegraph
1
0
Fork 0
mirror of https://github.com/sourcegraph/sourcegraph.git synced 2026-02-06 15:12:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Search: re-add support for 'lucky' patterntype (#64293)

Browse Source 
In #64215, we removed support for smart search. We continued to allow
the `smart` search mode, but just execute with `precise` behavior.
However, we started to throw an error for `patterntype:lucky` (which is
the old way of specifying smart search). It turns out that `lucky` made
its way into some search links and settings, causing those searches to
fail.

This PR restores support for `lucky`, and remaps it to `standard`. This
preserves the semantics as much as possible (since smart search attempts
a 'standard' search as its first rule).

Closes SRCH-840
This commit is contained in:
Julie Tibshirani 2024-08-06 14:04:09 +03:00 committed by GitHub
parent 8f058838ce
commit f19af57fe4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/search/client/client.go
View File

@ -247,6 +247,9 @@ func SearchTypeFromString(patternType string) (query.SearchType, error) {
return query.SearchTypeCodyContext, nil
case "keyword":
return query.SearchTypeKeyword, nil
// NOTE: the lucky patterntype is deprecated. For now, we remap it to 'standard' to avoid breaks.
case "lucky":
return query.SearchTypeStandard, nil
default:
return -1, errors.Errorf("unrecognized patternType %q", patternType)
}
@ -297,6 +300,9 @@ func overrideSearchType(input string, searchType query.SearchType) query.SearchT
searchType = query.SearchTypeCodyContext
case "keyword":
searchType = query.SearchTypeKeyword
// NOTE: the lucky patterntype is deprecated. For now, we remap it to 'standard' to avoid breaks.
case "lucky":
searchType = query.SearchTypeStandard
}
})
return searchType

3
internal/search/client/client_test.go
View File

@ -20,6 +20,7 @@ import (
func TestDetectSearchType(t *testing.T) {
typeRegexp := "regexp"
typeLiteral := "literal"
typeLucky := "lucky"
testCases := []struct {
name string
version string
@ -40,6 +41,8 @@ func TestDetectSearchType(t *testing.T) {
{"V2, override regex variant pattern type with single quotes", "V2", &typeLiteral, `patterntype:'regex'`, query.SearchTypeRegex},
{"V1, override literal pattern type", "V1", &typeRegexp, "patterntype:literal", query.SearchTypeLiteral},
{"V1, override literal pattern type, with case-insensitive query", "V1", &typeRegexp, "pAtTErNTypE:literal", query.SearchTypeLiteral},
{"V1, lucky pattern type should be mapped to standard", "V1", &typeLucky, "", query.SearchTypeStandard},
{"V1, lucky pattern type in query should be mapped to standard", "V1", nil, "patternType:lucky", query.SearchTypeStandard},
}
for _, test := range testCases {