Skip to content

Commit 9a13041

Browse files
authored
Remove the single diff strategy and make multi-diff the default (#2133)
1 parent 5203266 commit 9a13041

File tree

27 files changed

+71
-1972
lines changed

27 files changed

+71
-1972
lines changed

src/core/diff/DiffStrategy.ts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import type { DiffStrategy } from "./types"
2-
import { SearchReplaceDiffStrategy } from "./strategies/search-replace"
32
import { NewUnifiedDiffStrategy } from "./strategies/new-unified"
43
import { MultiSearchReplaceDiffStrategy } from "./strategies/multi-search-replace"
54
import { EXPERIMENT_IDS, ExperimentId } from "../../shared/experiments"
@@ -12,7 +11,7 @@ export type { DiffStrategy }
1211
* @returns The appropriate diff strategy for the model
1312
*/
1413

15-
export type DiffStrategyName = "unified" | "multi-search-and-replace" | "search-and-replace"
14+
export type DiffStrategyName = "unified" | "multi-search-and-replace"
1615

1716
type GetDiffStrategyOptions = {
1817
model: string
@@ -23,6 +22,4 @@ type GetDiffStrategyOptions = {
2322
export const getDiffStrategy = ({ fuzzyMatchThreshold, experiments }: GetDiffStrategyOptions): DiffStrategy =>
2423
experiments[EXPERIMENT_IDS.DIFF_STRATEGY_UNIFIED]
2524
? new NewUnifiedDiffStrategy(fuzzyMatchThreshold)
26-
: experiments[EXPERIMENT_IDS.DIFF_STRATEGY_MULTI_SEARCH_AND_REPLACE]
27-
? new MultiSearchReplaceDiffStrategy(fuzzyMatchThreshold)
28-
: new SearchReplaceDiffStrategy(fuzzyMatchThreshold)
25+
: new MultiSearchReplaceDiffStrategy(fuzzyMatchThreshold)

0 commit comments

Comments
 (0)