Remove core workflow improvements flag (#41986)

Author: Rok Novosel

client/branded/src/global-styles/colors.scss

@@ -204,7 +204,6 @@ $theme-colors: (
         rgba(215, 240, 253, 0.25) 83.64%
     );
     --modal-bg: #{rgba($gray-04, 0.5)};
-    // Colors used in the search sidebar with .core-workflow-improvements-enabled
     --sidebar-bg: var(--color-bg-1);
     --sidebar-border-color: var(--border-color-2);
 }
@@ -296,7 +295,6 @@ $theme-colors: (
     --marketing-gradient: linear-gradient(90.64deg, rgba(108, 8, 223, 0.5) 3.11%, rgba(0, 165, 213, 0.5) 83.64%);
     --marketing-gradient-25: linear-gradient(90.64deg, rgba(108, 8, 223, 0.25) 3.11%, rgba(0, 165, 213, 0.25) 83.64%);
     --modal-bg: #{rgba($gray-08, 0.5)};
-    // Colors used in the search sidebar with .core-workflow-improvements-enabled
     --sidebar-bg: var(--black);
     --sidebar-border-color: var(--color-bg-2);
 }

client/search-ui/src/components/CommitSearchResult.tsx

@@ -7,7 +7,6 @@ import SourceCommitIcon from 'mdi-react/SourceCommitIcon'
 import { displayRepoName } from '@sourcegraph/shared/src/components/RepoLink'
 import { PlatformContextProps } from '@sourcegraph/shared/src/platform/context'
 import { CommitMatch, getCommitMatchUrl, getRepositoryUrl } from '@sourcegraph/shared/src/search/stream'
-import { useCoreWorkflowImprovementsEnabled } from '@sourcegraph/shared/src/settings/useCoreWorkflowImprovementsEnabled'
 // eslint-disable-next-line no-restricted-imports
 import { Timestamp } from '@sourcegraph/web/src/components/time/Timestamp'
 import { Link, Code } from '@sourcegraph/wildcard'
@@ -36,15 +35,13 @@ export const CommitSearchResult: React.FunctionComponent<Props> = ({
     as,
     index,
 }) => {
-    const [coreWorkflowImprovementsEnabled] = useCoreWorkflowImprovementsEnabled()
-
     const renderTitle = (): JSX.Element => (
         <div className={styles.title}>
             <span
                 className={classNames(
                     'test-search-result-label flex-grow-1',
                     styles.titleInner,
-                    coreWorkflowImprovementsEnabled && styles.mutedRepoFileLink
+                    styles.mutedRepoFileLink
                 )}
             >
                 <Link to={getRepositoryUrl(result.repository)}>{displayRepoName(result.repository)}</Link>

client/search-ui/src/components/FileMatchChildren.module.scss

@@ -1,15 +1,10 @@
 .file-match-children {
     background-color: var(--code-bg);
-    border: 1px solid var(--border-color);
     border-radius: var(--border-radius);
     padding: 0.25rem 0;
     position: relative;
 
-    :global(.core-workflow-improvements-enabled) & {
-        border: none;
-    }
-
-    :global(.core-workflow-improvements-enabled) [data-collapsible='true'] & {
+    [data-collapsible='true'] & {
         border-bottom-left-radius: 0;
         border-bottom-right-radius: 0;
     }
@@ -67,11 +62,7 @@
         position: relative;
 
         &:not(:first-child) {
-            border-top: 1px solid var(--border-color-2);
-
-            :global(.core-workflow-improvements-enabled) & {
-                border-top-color: var(--border-color);
-            }
+            border-top: 1px solid var(--border-color);
         }
     }
 }

client/search-ui/src/components/FileMatchChildren.tsx

@@ -21,13 +21,10 @@ import { Controller as ExtensionsController } from '@sourcegraph/shared/src/exte
 import { HoverContext } from '@sourcegraph/shared/src/hover/HoverOverlay.types'
 import { ContentMatch, SymbolMatch, PathMatch, getFileMatchUrl } from '@sourcegraph/shared/src/search/stream'
 import { SettingsCascadeProps } from '@sourcegraph/shared/src/settings/settings'
-import { useCoreWorkflowImprovementsEnabled } from '@sourcegraph/shared/src/settings/useCoreWorkflowImprovementsEnabled'
-import { SymbolIcon } from '@sourcegraph/shared/src/symbols/SymbolIcon'
 import { SymbolTag } from '@sourcegraph/shared/src/symbols/SymbolTag'
 import { TelemetryProps } from '@sourcegraph/shared/src/telemetry/telemetryService'
 import { codeCopiedEvent } from '@sourcegraph/shared/src/tracking/event-log-creators'
 import { useCodeIntelViewerUpdates } from '@sourcegraph/shared/src/util/useCodeIntelViewerUpdates'
-import { Link, Code } from '@sourcegraph/wildcard'
 
 import { CodeExcerpt, FetchFileParameters } from './CodeExcerpt'
 import { LastSyncedIcon } from './LastSyncedIcon'
@@ -148,8 +145,6 @@ function navigateToFileOnMiddleMouseButtonClick(event: MouseEvent<HTMLElement>):
 }
 
 export const FileMatchChildren: React.FunctionComponent<React.PropsWithChildren<FileMatchProps>> = props => {
-    const [coreWorkflowImprovementsEnabled] = useCoreWorkflowImprovementsEnabled()
-
     /**
      * If LazyFileResultSyntaxHighlighting is enabled, we fetch plaintext
      * line ranges _alongside_ the typical highlighted line ranges.
@@ -347,14 +342,9 @@ export const FileMatchChildren: React.FunctionComponent<React.PropsWithChildren<
         telemetryService.log(...codeCopiedEvent('file-match'))
     }, [telemetryService])
 
-    const openInNewTabProps = props.openInNewTab ? { target: '_blank', rel: 'noopener noreferrer' } : undefined
-
     return (
         <div
-            className={classNames(
-                styles.fileMatchChildren,
-                coreWorkflowImprovementsEnabled && result.type === 'symbol' && styles.symbols
-            )}
+            className={classNames(styles.fileMatchChildren, result.type === 'symbol' && styles.symbols)}
             data-testid="file-match-children"
         >
             {result.repoLastFetched && <LastSyncedIcon lastSyncedTime={result.repoLastFetched} />}
@@ -366,23 +356,7 @@ export const FileMatchChildren: React.FunctionComponent<React.PropsWithChildren<
             )}
 
             {/* Symbols */}
-            {((!coreWorkflowImprovementsEnabled && result.type === 'symbol' && result.symbols) || []).map(symbol => (
-                <Link
-                    to={symbol.url}
-                    className={classNames('test-file-match-children-item', styles.item)}
-                    key={`symbol:${symbol.name}${String(symbol.containerName)}${symbol.url}`}
-                    data-testid="file-match-children-item"
-                    {...openInNewTabProps}
-                >
-                    <SymbolIcon kind={symbol.kind} className="mr-1 flex-shrink-0" />
-                    <Code>
-                        {symbol.name}{' '}
-                        {symbol.containerName && <span className="text-muted">{symbol.containerName}</span>}
-                    </Code>
-                </Link>
-            ))}
-
-            {((coreWorkflowImprovementsEnabled && result.type === 'symbol' && result.symbols) || []).map(symbol => (
+            {((result.type === 'symbol' && result.symbols) || []).map(symbol => (
                 <div
                     key={`symbol:${symbol.name}${String(symbol.containerName)}${symbol.url}`}
                     className={classNames('test-file-match-children-item', styles.symbol)}
@@ -420,7 +394,7 @@ export const FileMatchChildren: React.FunctionComponent<React.PropsWithChildren<
             {/* Line matches */}
             {grouped.length > 0 && (
                 <div>
-                    {grouped.map((group, index) => (
+                    {grouped.map(group => (
                         <div
                             key={`linematch:${getFileMatchUrl(result)}${group.position.line}:${
                                 group.position.character

client/search-ui/src/components/FileSearchResult.tsx

@@ -23,7 +23,6 @@ import {
     getRevision,
 } from '@sourcegraph/shared/src/search/stream'
 import { isSettingsValid, SettingsCascadeProps } from '@sourcegraph/shared/src/settings/settings'
-import { useCoreWorkflowImprovementsEnabled } from '@sourcegraph/shared/src/settings/useCoreWorkflowImprovementsEnabled'
 import { TelemetryProps } from '@sourcegraph/shared/src/telemetry/telemetryService'
 import { Badge } from '@sourcegraph/wildcard'
 
@@ -107,18 +106,17 @@ type CommonResultContainerProps = Omit<
 
 // This is a search result for types file (content), path, or symbol.
 export const FileSearchResult: React.FunctionComponent<React.PropsWithChildren<Props>> = props => {
-    const [coreWorkflowImprovementsEnabled] = useCoreWorkflowImprovementsEnabled()
     const result = props.result
     const repoAtRevisionURL = getRepositoryUrl(result.repository, result.branches)
     const revisionDisplayName = getRevision(result.branches, result.commit)
     const settings = props.settingsCascade.final
 
     const ranking = useMemo(() => {
         if (!isErrorLike(settings) && settings?.experimentalFeatures?.clientSearchResultRanking === BY_LINE_RANKING) {
-            return new LineRanking(coreWorkflowImprovementsEnabled ? 5 : 10)
+            return new LineRanking(5)
         }
-        return new ZoektRanking(coreWorkflowImprovementsEnabled ? 3 : 5)
-    }, [settings, coreWorkflowImprovementsEnabled])
+        return new ZoektRanking(3)
+    }, [settings])
 
     // The number of lines of context to show before and after each match.
     const context = useMemo(() => {
@@ -200,7 +198,7 @@ export const FileSearchResult: React.FunctionComponent<React.PropsWithChildren<P
                         ? `${props.repoDisplayName}${revisionDisplayName ? `@${revisionDisplayName}` : ''}`
                         : undefined
                 }
-                className={classNames(styles.titleInner, coreWorkflowImprovementsEnabled && styles.mutedRepoFileLink)}
+                className={classNames(styles.titleInner, styles.mutedRepoFileLink)}
             />
         ),
         allExpanded: props.allExpanded,
@@ -277,10 +275,8 @@ export const FileSearchResult: React.FunctionComponent<React.PropsWithChildren<P
                 collapsible: limitedMatchCount < matchCount,
                 collapsedChildren,
                 expandedChildren,
-                collapseLabel: coreWorkflowImprovementsEnabled ? 'Show less' : `Hide ${hideCount}`,
-                expandLabel: coreWorkflowImprovementsEnabled
-                    ? `Show ${hideCount} more ${pluralize('match', hideCount, 'matches')}`
-                    : `${hideCount} more`,
+                collapseLabel: 'Show less',
+                expandLabel: `Show ${hideCount} more ${pluralize('match', hideCount, 'matches')}`,
                 matchCountLabel,
             }
         }
@@ -300,10 +296,8 @@ export const FileSearchResult: React.FunctionComponent<React.PropsWithChildren<P
             description,
             collapsedChildren: <FileMatchChildren {...props} result={result} {...collapsedMatchGroups} />,
             expandedChildren,
-            collapseLabel: coreWorkflowImprovementsEnabled ? 'Show less' : `Hide ${length}`,
-            expandLabel: coreWorkflowImprovementsEnabled
-                ? `Show ${length} more ${pluralize('match', length, 'matches')}`
-                : `${length} more`,
+            collapseLabel: 'Show less',
+            expandLabel: `Show ${length} more ${pluralize('match', length, 'matches')}`,
             matchCountLabel,
             as: props.as,
         }

client/search-ui/src/components/RepoSearchResult.tsx

@@ -7,7 +7,6 @@ import SourceRepositoryIcon from 'mdi-react/SourceRepositoryIcon'
 import { highlightNode } from '@sourcegraph/common'
 import { codeHostSubstrLength, displayRepoName } from '@sourcegraph/shared/src/components/RepoLink'
 import { getRepoMatchLabel, getRepoMatchUrl, RepositoryMatch } from '@sourcegraph/shared/src/search/stream'
-import { useCoreWorkflowImprovementsEnabled } from '@sourcegraph/shared/src/settings/useCoreWorkflowImprovementsEnabled'
 import { Icon, Link } from '@sourcegraph/wildcard'
 
 import { LastSyncedIcon } from './LastSyncedIcon'
@@ -32,19 +31,12 @@ export const RepoSearchResult: React.FunctionComponent<RepoSearchResultProps> =
     as,
     index,
 }) => {
-    const [coreWorkflowImprovementsEnabled] = useCoreWorkflowImprovementsEnabled()
     const repoDescriptionElement = useRef<HTMLDivElement>(null)
     const repoNameElement = useRef<HTMLAnchorElement>(null)
 
     const renderTitle = (): JSX.Element => (
         <div className={styles.title}>
-            <span
-                className={classNames(
-                    'test-search-result-label',
-                    styles.titleInner,
-                    coreWorkflowImprovementsEnabled && styles.mutedRepoFileLink
-                )}
-            >
+            <span className={classNames('test-search-result-label', styles.titleInner, styles.mutedRepoFileLink)}>
                 <Link to={getRepoMatchUrl(result)} ref={repoNameElement}>
                     {displayRepoName(getRepoMatchLabel(result))}
                 </Link>

client/search-ui/src/components/ResultContainer.module.scss

@@ -4,31 +4,22 @@
     }
 
     &:not(:last-of-type) {
-        margin-bottom: 0.5rem;
-    }
-
-    :global(.core-workflow-improvements-enabled) &:not(:last-of-type) {
         // Prevents the sticky items below from affecting
         // anything outside of the result container.
         isolation: isolate;
-
         margin-bottom: 1rem;
     }
 }
 
 .header {
     padding: 0.5rem 0.5rem 0.5rem 0;
-    background-color: transparent;
     display: flex;
     align-items: center;
     flex-wrap: wrap;
-
-    :global(.core-workflow-improvements-enabled) & {
-        position: sticky;
-        top: 0;
-        z-index: 1; // Show on top of search result contents
-        background-color: var(--body-bg);
-    }
+    position: sticky;
+    top: 0;
+    z-index: 1; // Show on top of search result contents
+    background-color: var(--body-bg);
 
     &-title {
         flex: 1 1 auto;