Merge branch 'main' into jhh/revamp-expand-contract-sidebar

Author: jasonhawkharris

.github/workflows/sg-setup.yml

@@ -24,7 +24,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.20.9
+          go-version: 1.20.10
 
       - name: Install asdf plugins
         uses: asdf-vm/actions/install@v1

.tool-versions

@@ -1,4 +1,4 @@
-golang 1.20.9
+golang 1.20.10
 nodejs 18.17.1
 fd 8.6.0
 shfmt 3.5.0

WORKSPACE

@@ -314,7 +314,7 @@ go_rules_dependencies()
 
 go_register_toolchains(
     nogo = "@//:sg_nogo",
-    version = "1.20.9",
+    version = "1.20.10",
 )
 
 linter_dependencies()

client/branded/src/search-ui/input/SearchBox.tsx

@@ -46,9 +46,6 @@ export interface SearchBoxProps
     /** Don't show search help button */
     hideHelpButton?: boolean
 
-    /** Set in JSContext only available to the web app. */
-    isExternalServicesUserModeAll?: boolean
-
     /** Called with the underlying editor instance on creation. */
     onEditorCreated?: (editor: IEditor) => void
 

client/jetbrains/webview/src/search/input/JetBrainsSearchBox.tsx

@@ -46,9 +46,6 @@ export interface JetBrainsSearchBoxProps
     /** Don't show search help button */
     hideHelpButton?: boolean
 
-    /** Set in JSContext only available to the web app. */
-    isExternalServicesUserModeAll?: boolean
-
     /** Called with the underlying editor instance on creation. */
     onEditorCreated?: (editor: IEditor) => void
 }

client/web-sveltekit/src/lib/branded.ts

@@ -4,7 +4,8 @@ export {
     basicSyntaxColumns,
     exampleQueryColumns,
 } from '@sourcegraph/branded/src/search-ui/components/QueryExamples.constants'
-export { createDefaultSuggestions, singleLine } from '@sourcegraph/branded/src/search-ui/input/codemirror'
+export { createDefaultSuggestions } from '@sourcegraph/branded/src/search-ui/input/codemirror'
+export { multiline } from '@sourcegraph/branded/src/search-ui/input/codemirror/multiline'
 export { parseInputAsQuery } from '@sourcegraph/branded/src/search-ui/input/codemirror/parsedQuery'
 export { querySyntaxHighlighting } from '@sourcegraph/branded/src/search-ui/input/codemirror/syntax-highlighting'
 export { decorateQuery } from '@sourcegraph/branded/src/search-ui/util/query'

client/web-sveltekit/src/lib/search/CodeMirrorQueryInput.svelte

@@ -7,7 +7,7 @@
 
     import { browser } from '$app/environment'
     import { goto } from '$app/navigation'
-    import { createDefaultSuggestions, singleLine, parseInputAsQuery, querySyntaxHighlighting } from '$lib/branded'
+    import { createDefaultSuggestions, multiline, parseInputAsQuery, querySyntaxHighlighting } from '$lib/branded'
     import type { SearchPatternType } from '$lib/graphql-operations'
     import { fetchStreamSuggestions, QueryChangeSource, type QueryState } from '$lib/shared'
 
@@ -46,7 +46,6 @@
                 fetchSuggestions: query => fetchStreamSuggestions(query),
                 isSourcegraphDotCom: false,
                 navigate: url => goto(url.toString()),
-                applyOnEnter: true,
             }),
         ]
 
@@ -84,7 +83,7 @@
                     },
                 ])
             ),
-            singleLine,
+            multiline(false),
             EditorView.updateListener.of(update => {
                 const { state } = update
                 if (update.docChanged) {

client/web/dev/utils/create-js-context.ts

@@ -37,7 +37,6 @@ export const createJsContext = ({ sourcegraphBaseUrl }: { sourcegraphBaseUrl: st
         codeIntelAutoIndexingEnabled: false,
         codeIntelAutoIndexingAllowGlobalPolicies: false,
         codeInsightsEnabled: true,
-        externalServicesUserMode: 'public',
         productResearchPageEnabled: true,
         assetsRoot: '/.assets',
         deployType: 'dev',

client/web/src/components/FilteredConnection/hooks/useShowMorePagination.ts

@@ -33,6 +33,8 @@ interface UseShowMorePaginationConfig<TResult> {
     useURL?: boolean
     /** Allows modifying how the query interacts with the Apollo cache */
     fetchPolicy?: WatchQueryFetchPolicy
+    /** Allows specifying the Apollo error policy */
+    errorPolicy?: 'all' | 'none' | 'ignore'
     /**
      * Set to enable polling of all the nodes currently loaded in the connection.
      *
@@ -139,6 +141,7 @@ export const useShowMorePagination = <TResult, TVariables extends {}, TData>({
         fetchPolicy: options?.fetchPolicy,
         onCompleted: options?.onCompleted,
         onError: options?.onError,
+        errorPolicy: options?.errorPolicy,
     })
 
     /**

client/web/src/enterprise/batches/list/BatchChangesChangelogAlert.tsx

@@ -19,7 +19,7 @@ const CURRENT_VERSION = '5.2'
  * After every release, this will be set back to `false`. Chromatic will also verify
  * changes to this variable via visual regression testing.
  */
-const SHOW_CHANGELOG = true
+const SHOW_CHANGELOG = false
 
 interface BatchChangesChangelogAlertProps {
     className?: string