feat: always use Sourcegraph extensions, remove feature flag

src/browser/types.ts

@@ -58,10 +58,6 @@ export interface StorageItems {
     openFileOnSourcegraph: boolean
     sourcegraphAnonymousUid: string
     disableExtension: boolean
-    /**
-     * Enable the use of Sourcegraph extensions.
-     */
-    useExtensions: boolean
     /**
      * Storage for feature flags
      */
@@ -98,7 +94,6 @@ export const defaultStorageItems: StorageItems = {
     openFileOnSourcegraph: true,
     sourcegraphAnonymousUid: '',
     disableExtension: false,
-    useExtensions: false,
     featureFlags: featureFlagDefaults,
     clientConfiguration: {
         contentScriptUrls: [],

src/extension/scripts/inject.tsx

@@ -12,7 +12,6 @@ import {
     setRenderMermaidGraphsEnabled,
     setRepositoryFileTreeEnabled,
     setSourcegraphUrl,
-    setUseExtensions,
 } from '../../shared/util/context'
 import { featureFlags } from '../../shared/util/featureFlags'
 
@@ -109,8 +108,6 @@ function injectApplication(): void {
                 window.addEventListener('unload', () => subscriptions.unsubscribe())
             }
         }
-
-        setUseExtensions(items.useExtensions === undefined ? false : items.useExtensions)
     }
 
     storage.getSync(handleGetStorage)

src/libs/code_intelligence/code_intelligence.tsx

@@ -24,7 +24,7 @@ import { createJumpURLFetcher, createLSPFromExtensions, JumpURLLocation } from '
 import { lspViaAPIXlang, toTextDocumentIdentifier } from '../../shared/backend/lsp'
 import { ButtonProps, CodeViewToolbar } from '../../shared/components/CodeViewToolbar'
 import { AbsoluteRepoFile } from '../../shared/repo'
-import { eventLogger, getModeFromPath, sourcegraphUrl, useExtensions } from '../../shared/util/context'
+import { eventLogger, getModeFromPath, sourcegraphUrl } from '../../shared/util/context'
 import { githubCodeHost } from '../github/code_intelligence'
 import { gitlabCodeHost } from '../gitlab/code_intelligence'
 import { phabricatorCodeHost } from '../phabricator/code_intelligence'
@@ -200,10 +200,9 @@ function initCodeIntelligence(
     hoverifier: Hoverifier
     controllers: Partial<Controllers>
 } {
-    const { extensionsContextController, extensionsController }: Partial<Controllers> =
-        useExtensions && codeHost.getCommandPaletteMount
-            ? initializeExtensions(codeHost.getCommandPaletteMount, documents)
-            : {}
+    const { extensionsContextController, extensionsController }: Partial<Controllers> = codeHost.getCommandPaletteMount
+        ? initializeExtensions(codeHost.getCommandPaletteMount, documents)
+        : {}
     const simpleProviderFns = extensionsController ? createLSPFromExtensions(extensionsController) : lspViaAPIXlang
 
     /** Emits when the go to definition button was clicked */

src/libs/github/inject.tsx

@@ -59,7 +59,6 @@ import {
     renderMermaidGraphsEnabled,
     repositoryFileTreeEnabled,
     sourcegraphUrl,
-    useExtensions,
 } from '../../shared/util/context'
 import { featureFlags } from '../../shared/util/featureFlags'
 import { diffDomFunctions, searchCodeSnippetDOMFunctions, singleFileDOMFunctions } from './dom_functions'
@@ -123,7 +122,7 @@ function injectCodeIntelligence(): void {
     let extensionsController: ClientController<ConfigurationSubject, Settings> | undefined
     let simpleProviderFns = lspViaAPIXlang
 
-    if (isSingleCodeFile && useExtensions && filePath) {
+    if (isSingleCodeFile && filePath) {
         extensionsContextController = createExtensionsContextController(sourcegraphUrl)
         extensionsController = createController(extensionsContextController.context, createMessageTransports)
         simpleProviderFns = createLSPFromExtensions(extensionsController!)

src/shared/components/options/FeatureFlagCard.tsx

@@ -2,7 +2,6 @@ import * as React from 'react'
 import { Card, CardBody, CardHeader, Col, Form, FormGroup, Input, Label, Row } from 'reactstrap'
 import storage from '../../../browser/storage'
 import { StorageItems } from '../../../browser/types'
-import { sourcegraphUrl } from '../../util/context'
 
 interface Props {
     storage: StorageItems
@@ -26,17 +25,12 @@ export class FeatureFlagCard extends React.Component<Props, {}> {
         storage.setSync({ inlineSymbolSearchEnabled: !this.props.storage.inlineSymbolSearchEnabled })
     }
 
-    private onUseExtensionsToggled = () => {
-        storage.setSync({ useExtensions: !this.props.storage.useExtensions })
-    }
-
     public render(): JSX.Element | null {
         const {
             inlineSymbolSearchEnabled,
             renderMermaidGraphsEnabled,
             repositoryFileTreeEnabled,
             executeSearchEnabled,
-            useExtensions,
         } = this.props.storage
         return (
             <Row className="pb-3">
@@ -89,25 +83,6 @@ export class FeatureFlagCard extends React.Component<Props, {}> {
                                         </div>
                                     </Label>
                                 </FormGroup>
-                                <FormGroup check={true}>
-                                    <Label check={true}>
-                                        <Input
-                                            onClick={this.onUseExtensionsToggled}
-                                            defaultChecked={useExtensions}
-                                            type="checkbox"
-                                        />{' '}
-                                        Use Sourcegraph extensions
-                                        {useExtensions && (
-                                            <>
-                                                {' '}
-                                                and{' '}
-                                                <a href={sourcegraphUrl + '/extensions'} target="_blank">
-                                                    enable extensions on the registry
-                                                </a>
-                                            </>
-                                        )}
-                                    </Label>
-                                </FormGroup>
                                 <FormGroup check={true}>
                                     <Label check={true}>
                                         <Input

src/shared/util/context.tsx

@@ -19,8 +19,6 @@ export let repositoryFileTreeEnabled = false
 
 export let inlineSymbolSearchEnabled = false
 
-export let useExtensions = false
-
 interface UrlCache {
     [key: string]: string
 }
@@ -38,7 +36,6 @@ if (window.SG_ENV === 'EXTENSION') {
         repositoryFileTreeEnabled = items.repositoryFileTreeEnabled
 
         inlineSymbolSearchEnabled = items.inlineSymbolSearchEnabled
-        useExtensions = items.useExtensions
     })
 }
 
@@ -78,10 +75,6 @@ export function setInlineSymbolSearchEnabled(enabled: boolean): void {
     inlineSymbolSearchEnabled = enabled
 }
 
-export function setUseExtensions(value: boolean): void {
-    useExtensions = value
-}
-
 /**
  * modeToHighlightJsName gets the highlight.js name of the language given a
  * mode.