code intel: Remove search context from search based code intel (#58010)

Using search context is problematic when viewing a file/repo that is not
part of the selected search context, which can happen when a custom
default context is set.

It doesn't seem necessary to include the context. The query I looked at
now doesn't have the context set anymore. Example:

    ^append$ type:symbol patternType:regexp count:50 case:yes file:\.(go)$ repo:^github.com/sourcegraph/sourcegraph$ index:only

I wasn't able to verify all code paths though.

Author: fkling

CHANGELOG.md

@@ -23,6 +23,7 @@ All notable changes to Sourcegraph are documented in this file.
 ### Changed
 
 - The setting `experimentalFeatures.searchQueryInput` now refers to the new query input as `v2` (not `experimental`). <!-- NOTE: If v2 becomes the default before this release is cut, then update this entry to mention that instead of adding a separate entry. -->
+- Search-based code intel doesn't include the currently selected search context anymore. It was possible to get into a situation where search-based code intel wouldn't find any information due to being restricted by the current search context. [#58010](https://github.com/sourcegraph/sourcegraph/pull/58010)
 
 ### Fixed
 

client/shared/BUILD.bazel

@@ -210,7 +210,6 @@ ts_project(
         "src/codeintel/legacy-extensions/util/promise.ts",
         "src/codeintel/legacy-extensions/util/uri.ts",
         "src/codeintel/scip.ts",
-        "src/codeintel/searchContext.ts",
         "src/commands/commands.ts",
         "src/components/CodeMirrorEditor.tsx",
         "src/components/HighlightedMatches.tsx",

client/shared/src/codeintel/legacy-extensions/util/api.ts

@@ -1,7 +1,6 @@
 import { once } from 'lodash'
 import gql from 'tagged-template-noop'
 
-import { searchContext } from '../../searchContext'
 import type * as sourcegraph from '../api'
 import { cache } from '../util'
 
@@ -68,7 +67,6 @@ export class API {
     /**
      * Retrieves the name and fork/archive status of a repository. This method
      * throws an error if the repository is not known to the Sourcegraph instance.
-     *
      * @param name The repository's name.
      */
     public async resolveRepo(name: string): Promise<RepoMeta> {
@@ -298,7 +296,6 @@ export class API {
      * Get the content of a file. Throws an error if the repository is not known to
      * the Sourcegraph instance. Returns undefined if the input rev or the file is
      * not known to the Sourcegraph instance.
-     *
      * @param repo The repository in which the file exists.
      * @param revision The revision in which the target version of the file exists.
      * @param path The path of the file.
@@ -330,14 +327,10 @@ export class API {
 
     /**
      * Perform a search.
-     *
      * @param searchQuery The input to the search command.
      * @param fileLocal Set to false to not request this field, which is absent in older versions of Sourcegraph.
      */
-    public async search(searchQuery: string, fileLocal = true): Promise<SearchResult[]> {
-        const context = searchContext()
-        const query = context ? `context:${context} ${searchQuery}` : searchQuery
-
+    public async search(query: string, fileLocal = true): Promise<SearchResult[]> {
         interface Response {
             search: {
                 results: {

client/shared/src/codeintel/searchContext.ts

@@ -10,7 +10,6 @@ import { logger } from '@sourcegraph/common'
 import { type GraphQLClient, HTTPStatusError } from '@sourcegraph/http-client'
 import { SharedSpanName, TraceSpanProvider } from '@sourcegraph/observability-client'
 import { type FetchFileParameters, fetchHighlightedFileLineRanges } from '@sourcegraph/shared/src/backend/file'
-import { setCodeIntelSearchContext } from '@sourcegraph/shared/src/codeintel/searchContext'
 import type { Controller as ExtensionsController } from '@sourcegraph/shared/src/extensions/controller'
 import { createNoopController } from '@sourcegraph/shared/src/extensions/createNoopLoadedController'
 import type { PlatformContext } from '@sourcegraph/shared/src/platform/context'
@@ -308,14 +307,6 @@ export class LegacySourcegraphWebApp extends React.Component<StaticAppConfig, Le
     }
 
     private async setWorkspaceSearchContext(spec: string | undefined): Promise<void> {
-        // NOTE(2022-09-08) Inform the inlined code from
-        // sourcegraph/code-intel-extensions about the change of search context.
-        // The old extension code previously accessed this information from the
-        // 'sourcegraph' npm package, and updating the context like this was the
-        // simplest solution to mirror the old behavior while deprecating
-        // extensions on a tight deadline. It would be nice to properly pass
-        // around this via React state in the future.
-        setCodeIntelSearchContext(spec)
         if (this.extensionsController === null) {
             return
         }

client/web/src/LegacySourcegraphWebApp.tsx

@@ -8,7 +8,6 @@ import { combineLatest, from, Subscription, fromEvent } from 'rxjs'
 
 import { HTTPStatusError } from '@sourcegraph/http-client'
 import { SharedSpanName, TraceSpanProvider } from '@sourcegraph/observability-client'
-import { setCodeIntelSearchContext } from '@sourcegraph/shared/src/codeintel/searchContext'
 import type { ExtensionsControllerProps } from '@sourcegraph/shared/src/extensions/controller'
 import type { PlatformContext } from '@sourcegraph/shared/src/platform/context'
 import { ShortcutProvider } from '@sourcegraph/shared/src/react-shortcuts'
@@ -120,22 +119,9 @@ export const SourcegraphWebApp: FC<SourcegraphWebAppProps> = props => {
     const [selectedSearchContextSpec, _setSelectedSearchContextSpec] = useState<string | undefined>()
 
     // NOTE(2022-09-08) Inform the inlined code from
-    // sourcegraph/code-intel-extensions about the change of search context.
-    // The old extension code previously accessed this information from the
-    // 'sourcegraph' npm package, and updating the context like this was the
-    // simplest solution to mirror the old behavior while deprecating
-    // extensions on a tight deadline. It would be nice to properly pass
-    // around this via React state in the future.
-    const setWorkspaceSearchContext = useCallback((spec: string | null): void => {
-        setCodeIntelSearchContext(spec ?? undefined)
+    const setSelectedSearchContextSpecWithNoChecks = useCallback((spec: string): void => {
+        _setSelectedSearchContextSpec(spec)
     }, [])
-    const setSelectedSearchContextSpecWithNoChecks = useCallback(
-        (spec: string): void => {
-            _setSelectedSearchContextSpec(spec)
-            setWorkspaceSearchContext(spec)
-        },
-        [setWorkspaceSearchContext]
-    )
     const setSelectedSearchContextSpecToDefault = useCallback((): void => {
         if (!props.searchContextsEnabled) {
             return
@@ -233,8 +219,6 @@ export const SourcegraphWebApp: FC<SourcegraphWebAppProps> = props => {
             setSelectedSearchContextSpecToDefault()
         }
 
-        setWorkspaceSearchContext(selectedSearchContextSpec ?? null)
-
         return () => subscriptions.unsubscribe()
 
         // We only ever want to run this hook once when the component mounts for

client/web/src/SourcegraphWebApp.tsx

@@ -9,7 +9,6 @@ import type { Range as ExtensionRange, Position as ExtensionPosition } from '@so
 import { getDocumentNode } from '@sourcegraph/http-client'
 import type { LanguageSpec } from '@sourcegraph/shared/src/codeintel/legacy-extensions/language-specs/language-spec'
 import { Position as ScipPosition } from '@sourcegraph/shared/src/codeintel/scip'
-import { searchContext } from '@sourcegraph/shared/src/codeintel/searchContext'
 import { toPrettyBlobURL } from '@sourcegraph/shared/src/util/url'
 
 import { getWebGraphQLClient } from '../../backend/graphql'
@@ -315,7 +314,6 @@ export async function searchBasedDefinitions({
  * Perform a search query for definitions. Returns results converted to locations,
  * filtered by the language's definition filter, and sorted by proximity to the
  * current text document path.
- *
  * @param api The GraphQL API instance.
  * @param args Parameter bag.
  */
@@ -363,11 +361,6 @@ async function searchAndFilterReferences({
 }
 
 async function executeSearchQuery(terms: string[]): Promise<SearchResult[]> {
-    const context = searchContext()
-    if (context) {
-        terms.push(`context:${context}`)
-    }
-
     interface Response {
         search: {
             results: {