refactor(ziputil): remove non-zipping related utilities out of ZipUtil
#6830
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
Author
|
/runIntegrationTests |
Contributor
Author
|
Integ tests failed for unrelated flaky tests. :( |
Hweinstock
changed the title
ZipUtil. (WIP)ZipUtil
jpinkney-aws
approved these changes
Mar 21, 2025
|
|
||
| export const readonlyDocument = new ReadonlyDocument() | ||
|
|
||
| export async function getTextContent(uri: vscode.Uri) { |
Contributor
There was a problem hiding this comment.
it blows my mind we didn't have this already 😆
Contributor
Author
There was a problem hiding this comment.
Yea, its pretty small so its possible/likely something similar is inlined in a few places.
| assert.deepStrictEqual(getWorkspacePaths(), [workspaceFolder]) | ||
| }) | ||
|
|
||
| it('Should return the correct project path for unit test generation', function () { |
Contributor
There was a problem hiding this comment.
You can probably dropunit test generation, i'm guessing that was just leftover from the zipUtil test
ctlai95
approved these changes
Mar 25, 2025
jpinkney-aws
approved these changes
Mar 25, 2025
Hweinstock
added a commit
to Hweinstock/aws-toolkit-vscode
that referenced
this pull request
Mar 26, 2025
justinmk3
reviewed
Mar 27, 2025
| import { getWorkspaceForFile, getWorkspacePaths } from '../../../shared/utilities/workspaceUtils' | ||
| import { getTestWorkspaceFolder } from '../../../testInteg/integrationTestsUtilities' | ||
|
|
||
| describe('getWorkspace utilities', function () { |
Contributor
There was a problem hiding this comment.
was this test file intentionally placed in amazonq/util/ instead of shared/utilities/ ?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Problem
ZipUtilcontains a mix of different utilities from working with workspaces, to computing git diffs. These are all used in zipping the project, but inherently have no connection to it.Larger problem is that
ZipUtilis highly coupled to agent implementations and is difficult to generalize. Moving out non-zipping noise will help.Solution
GitDiffutilities out of theZipUtilclass. These functions have no test coverage and are therefore unsafe to export or move to their own file in its current state.Future Work
Refactor to avoid references to scope and use case.
feature/xbranches will not be squash-merged at release time.