Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WIP: granular diffs #112

Open
wants to merge 6 commits into
base: alpha
Choose a base branch
from
Open

WIP: granular diffs #112

wants to merge 6 commits into from

Conversation

MarcMcIntosh
Copy link
Collaborator

@MarcMcIntosh MarcMcIntosh commented Sep 18, 2024 •
edited
Loading

Granular diffs

Description

Allows the user to select each chunk to apply from a diff with multiple chunks.

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Refactoring (no functional changes, only code improvements)
  • Documentation update

How to Test

  1. Ask a question the would make a few diffs, Change the frog class to bird without renaming the files
  2. click the more button on one of the diffs
  3. toggle apply

Screenshots (if applicable)

Checklist

  • My code follows the code style of this project.
  • I have performed a self-review of my code.
  • I have commented my code, particularly in hard-to-understand areas.
  • I have added tests that prove my fix is effective or that my feature works.
  • New and existing unit tests pass locally with my changes.
  • Any dependent changes have been merged and published in downstream modules.
  • I have updated the documentation where necessary.

Linked Issues

https://github.com/orgs/smallcloudai/projects/5/views/1?pane=issue&itemId=79901359

Additional Notes

Note: the response from diff-status doesn't seem to always be accurate.

Base automatically changed from apply-all-for-conesecutive-diffs to alpha September 24, 2024 09:47
@MarcMcIntosh
Merge branch 'alpha' into granular-diffs
0a2b71a 
 Conflicts:
	src/components/ChatContent/DiffContent.tsx

 Changes to be committed:
	modified:   package-lock.json
	modified:   package.json
	modified:   src/__fixtures__/chat.ts
	modified:   src/__fixtures__/history.ts
	modified:   src/__tests__/DeleteChat.test.tsx
	modified:   src/__tests__/RestoreChat.test.tsx
	modified:   src/app/store.ts
	modified:   src/components/Callout/Callout.module.css
	modified:   src/components/Callout/Callout.tsx
	modified:   src/components/Callout/index.ts
	modified:   src/components/Chat/Chat.tsx
	modified:   src/components/ChatContent/ContextFiles.tsx
	modified:   src/components/ChatContent/DiffContent.tsx
	modified:   src/components/ChatForm/ChatForm.tsx
	modified:   src/components/Link/Link.module.css
	modified:   src/components/Link/Link.tsx
	modified:   src/components/Toolbar/Dropdown.tsx
	modified:   src/components/Toolbar/Toolbar.tsx
	modified:   src/features/Chat/Thread/actions.ts
	modified:   src/features/Chat/Thread/reducer.ts
	modified:   src/features/Chat/Thread/selectors.ts
	modified:   src/features/Chat/Thread/types.ts
	new file:   src/features/Errors/warningSlice.ts
	modified:   src/features/History/historySlice.ts
	modified:   src/hooks/useEventBusForIDE.ts
	modified:   src/hooks/useSendChatRequest.ts
	modified:   src/services/refact/chat.ts
	modified:   src/services/refact/consts.ts
	modified:   src/services/refact/diffs.ts
	modified:   src/services/refact/index.ts
	renamed:    src/services/refact/fullpath.ts -> src/services/refact/path.ts
	modified:   src/services/refact/types.ts
	new file:   src/utils/takeFromLast.ts
@MarcMcIntosh MarcMcIntosh marked this pull request as ready for review September 24, 2024 11:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@MarcMcIntosh