Skip to content

refactor(ziputil): remove non-zipping related utilities out of ZipUtil #6830

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

Merged
Hweinstock merged 6 commits into from
Mar 25, 2025
Merged

refactor(ziputil): remove non-zipping related utilities out of ZipUtil #6830

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
776dffb
refactor: move functions dealing with workspace to workspaceUtils
Hweinstock Mar 21, 2025
98c7b96
refactor: move file opening util outside zipUtil
Hweinstock Mar 21, 2025
21a9a48
refactor: move gitDiff files functionality out of zipUtil
Hweinstock Mar 21, 2025
787e1a6
fix: make method public so that it can be stubbed
Hweinstock Mar 21, 2025
807e9e2
refactor: do not export gitdiff
Hweinstock Mar 21, 2025
6e5e287
docs: update test names
Hweinstock Mar 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion packages/core/src/codewhisperer/commands/startSecurityScan.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ import {
import { SecurityIssueTreeViewProvider } from '../service/securityIssueTreeViewProvider'
import { ChatSessionManager } from '../../amazonqScan/chat/storages/chatSession'
import { TelemetryHelper } from '../util/telemetryHelper'
import { getWorkspacePaths } from '../../shared/utilities/workspaceUtils'

const localize = nls.loadMessageBundle()
export const stopScanButton = localize('aws.codewhisperer.stopscan', 'Stop Scan')
Expand Down Expand Up @@ -156,7 +157,7 @@ export async function startSecurityScan(
})
}
const zipMetadata = await zipUtil.generateZip(editor?.document.uri, scope)
const projectPaths = zipUtil.getProjectPaths()
const projectPaths = getWorkspacePaths()

const contextTruncationStartTime = performance.now()
codeScanTelemetryEntry.contextTruncationDuration = performance.now() - contextTruncationStartTime
Expand Down
3 changes: 2 additions & 1 deletion packages/core/src/codewhisperer/commands/startTestGeneration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import { ChildProcess, spawn } from 'child_process' // eslint-disable-line no-re
import { BuildStatus } from '../../amazonqTest/chat/session/session'
import { fs } from '../../shared/fs/fs'
import { Range } from '../client/codewhispereruserclient'
import { getWorkspaceForFile } from '../../shared/utilities/workspaceUtils'

// eslint-disable-next-line unicorn/no-null
let spawnResult: ChildProcess | null = null
Expand Down Expand Up @@ -48,7 +49,7 @@ export async function startTestGenerationProcess(

const zipUtil = new ZipUtil()
if (initialExecution) {
const projectPath = zipUtil.getProjectPath(filePath) ?? ''
const projectPath = getWorkspaceForFile(filePath) ?? ''
const relativeTargetPath = path.relative(projectPath, filePath)
session.listOfTestGenerationJobId = []
session.shortAnswer = undefined
Expand Down
4 changes: 4 additions & 0 deletions packages/core/src/codewhisperer/models/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -926,3 +926,7 @@ export const testGenExcludePatterns = [
'**/*.deb',
'**/*.model',
]

export const isFileAnalysisScope = (scope: CodeAnalysisScope) => {
return scope === CodeAnalysisScope.FILE_AUTO || scope === CodeAnalysisScope.FILE_ON_DEMAND
}
Loading
Loading