Skip to content

Conversation

@mrubens
Copy link
Collaborator

@mrubens mrubens commented Dec 17, 2024

  • Remove the debug checkbox and just always include the verbose error
  • But, only show the verbose error if the apply_diff fails twice in a row (after re-reading the file)
  • Change the fuzzy diff match to search from the specified lines outward, and expand out 20 lines instead of 5 (still requiring a 90% fuzzy match)
  • Revert back to the older version of the apply_diff prompt which anecdotally seems to confuse Claude less

Important

Enhances diff application in Cline by tracking consecutive mistakes, refining error handling, and removing debugDiffEnabled.

  • Behavior:
    • Introduces consecutiveMistakeCountForApplyDiff in Cline.ts to track consecutive mistakes for applyDiff.
    • Refines error messages for file existence and diff application failures in Cline.ts.
    • Removes debugDiffEnabled feature from Cline.ts, ClineProvider.ts, and related files.
  • Diff Strategy:
    • Updates getDiffStrategy() in DiffStrategy.ts to remove debugEnabled parameter.
    • Enhances applyDiff() in search-replace.ts to handle middle-out search and improve error handling.
  • Tests:
    • Adds test for middle-out search in search-replace.test.ts.
    • Updates constructor tests in Cline.test.ts to reflect removal of debugDiffEnabled.
  • UI and State Management:
    • Removes debugDiffEnabled from SettingsView.tsx and ExtensionStateContext.tsx.
    • Updates state management in ClineProvider.ts and ExtensionStateContext.tsx to reflect changes.

This description was created by Ellipsis for f5bd5fa. It will automatically update as commits are pushed.

@changeset-bot
Copy link

changeset-bot bot commented Dec 17, 2024

⚠️ No Changeset found

Latest commit: f5bd5fa

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

Copy link

@pranav15197 pranav15197 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@mrubens mrubens merged commit 3fcfc8d into main Dec 17, 2024
6 checks passed
@mrubens mrubens deleted the more_diff_iterations branch December 17, 2024 13:07
roomote pushed a commit that referenced this pull request Jul 8, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants