From 9ecc6e9444c01357bf95792a266cc746e22ff308 Mon Sep 17 00:00:00 2001 From: Felix Kling Date: Wed, 3 Jul 2024 17:56:51 +0200 Subject: [PATCH] fix(search): Don't show inline cody widget when new cody web is enabled (#63608) Closes srch-673 This disables the inline cody widget when new cody web is enabled. The widget doesn't work with the new sidebar. ## Test plan Code inspection, it's a simple code change. --- client/web/src/repo/blob/CodeMirrorBlob.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/client/web/src/repo/blob/CodeMirrorBlob.tsx b/client/web/src/repo/blob/CodeMirrorBlob.tsx index 7670dbf7b2d..438c5e18d1d 100644 --- a/client/web/src/repo/blob/CodeMirrorBlob.tsx +++ b/client/web/src/repo/blob/CodeMirrorBlob.tsx @@ -20,7 +20,7 @@ import { createCodeIntelAPI } from '@sourcegraph/shared/src/codeintel/api' import { editorHeight, useCodeMirror, useCompartment } from '@sourcegraph/shared/src/components/CodeMirrorEditor' import { useKeyboardShortcut } from '@sourcegraph/shared/src/keyboardShortcuts/useKeyboardShortcut' import { Shortcut } from '@sourcegraph/shared/src/react-shortcuts' -import { useSettings } from '@sourcegraph/shared/src/settings/settings' +import { useSettings, useExperimentalFeatures } from '@sourcegraph/shared/src/settings/settings' import type { TemporarySettingsSchema } from '@sourcegraph/shared/src/settings/temporary/TemporarySettings' import type { TelemetryV2Props } from '@sourcegraph/shared/src/telemetry' import type { TelemetryProps } from '@sourcegraph/shared/src/telemetry/telemetryService' @@ -339,8 +339,9 @@ export const CodeMirrorBlob: React.FunctionComponent = props => { ) const { isFileIgnored } = useCodyIgnore() + const newCodyWeb = useExperimentalFeatures(features => features.newCodyWeb) const isCodyEnabledForFile = - window.context?.codyEnabledForCurrentUser && !isFileIgnored(blobInfo.repoName, blobInfo.filePath) + !newCodyWeb && window.context?.codyEnabledForCurrentUser && !isFileIgnored(blobInfo.repoName, blobInfo.filePath) const extensions = useMemo( () => [