From a105c2870252fc85788639b258a96c44259899a6 Mon Sep 17 00:00:00 2001 From: Quinn Slack Date: Thu, 25 Oct 2018 03:23:21 -0700 Subject: [PATCH] feat: always use Sourcegraph extensions, remove feature flag Removes the feature flag to toggle between whether to use Sourcegraph extensions and not. Sourcegraph extensions will always be used. --- src/browser/types.ts | 5 -- src/extension/scripts/inject.tsx | 3 - .../code_intelligence/code_intelligence.tsx | 9 ++- src/libs/github/inject.tsx | 3 +- .../components/options/FeatureFlagCard.tsx | 25 -------- .../components/options/OptionsPageSidebar.tsx | 64 ------------------- src/shared/util/context.tsx | 7 -- 7 files changed, 5 insertions(+), 111 deletions(-) delete mode 100644 src/shared/components/options/OptionsPageSidebar.tsx diff --git a/src/browser/types.ts b/src/browser/types.ts index e5267c22..10f32a26 100644 --- a/src/browser/types.ts +++ b/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: [], diff --git a/src/extension/scripts/inject.tsx b/src/extension/scripts/inject.tsx index 6f3ab8f4..87f3f936 100644 --- a/src/extension/scripts/inject.tsx +++ b/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) diff --git a/src/libs/code_intelligence/code_intelligence.tsx b/src/libs/code_intelligence/code_intelligence.tsx index c62b32f7..15535ecc 100644 --- a/src/libs/code_intelligence/code_intelligence.tsx +++ b/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 } { - const { extensionsContextController, extensionsController }: Partial = - useExtensions && codeHost.getCommandPaletteMount - ? initializeExtensions(codeHost.getCommandPaletteMount, documents) - : {} + const { extensionsContextController, extensionsController }: Partial = codeHost.getCommandPaletteMount + ? initializeExtensions(codeHost.getCommandPaletteMount, documents) + : {} const simpleProviderFns = extensionsController ? createLSPFromExtensions(extensionsController) : lspViaAPIXlang /** Emits when the go to definition button was clicked */ diff --git a/src/libs/github/inject.tsx b/src/libs/github/inject.tsx index 73929e85..11478eea 100644 --- a/src/libs/github/inject.tsx +++ b/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 | undefined let simpleProviderFns = lspViaAPIXlang - if (isSingleCodeFile && useExtensions && filePath) { + if (isSingleCodeFile && filePath) { extensionsContextController = createExtensionsContextController(sourcegraphUrl) extensionsController = createController(extensionsContextController.context, createMessageTransports) simpleProviderFns = createLSPFromExtensions(extensionsController!) diff --git a/src/shared/components/options/FeatureFlagCard.tsx b/src/shared/components/options/FeatureFlagCard.tsx index 6e2e91fc..d54e0b22 100644 --- a/src/shared/components/options/FeatureFlagCard.tsx +++ b/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 { 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 ( @@ -89,25 +83,6 @@ export class FeatureFlagCard extends React.Component { - - -