Skip to content

fix(amazonq): /test file collection usecase adds more patterns to filtering. #6681

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
merged 8 commits into from
Feb 26, 2025
Merged

fix(amazonq): /test file collection usecase adds more patterns to filtering. #6681

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
eab6f5c
Adding additional patterns for file filtering for test generation.
ashishrp-aws Feb 25, 2025
a80ae37
Sorting workspace folders in ziputils for test generation usecase.
ashishrp-aws Feb 25, 2025
2d0b39c
correction for workspace folder for usecase.
ashishrp-aws Feb 25, 2025
8efc232
Fixed syntax errors and updated the test generation ignore pattern list.
ashishrp-aws Feb 26, 2025
7ca7a58
Correction for files ignore patterns
ashishrp-aws Feb 26, 2025
f57fd67
correction for removing usecase from workspaceUtils.
ashishrp-aws Feb 26, 2025
ef4d79d
Fix for imports
ashishrp-aws Feb 26, 2025
2932fa1
fix for useCase trype for lint
ashishrp-aws Feb 26, 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
25 changes: 25 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 @@ -896,3 +896,28 @@ export enum SecurityScanStep {
}

export const amazonqCodeIssueDetailsTabTitle = 'Code Issue Details'

export const testGenExcludePatterns = [
'**/annotation-generated-src/*',
'**/annotation-generated-tst/*',
'**/build/*',
'**/env/*',
'**/release-info/*',
'**/*.jar',
'**/*.exe',
'**/*.a',
'**/*.map',
'**/*.graph',
'**/*.so',
'**/*.csv',
'**/*.dylib',
'**/*.parquet',
'**/*.xlsx',
'**/*.tar.gz',
'**/*.tar',
'**/*.pack',
'**/*.pkg',
'**/*.pkl',
'**/*.deb',
'**/*.model',
]
15 changes: 11 additions & 4 deletions packages/core/src/codewhisperer/util/zipUtil.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { fs } from '../../shared/fs/fs'
import { getLoggerForScope } from '../service/securityScanHandler'
import { runtimeLanguageContext } from './runtimeLanguageContext'
import { CodewhispererLanguage } from '../../shared/telemetry/telemetry.gen'
import { CurrentWsFolders, collectFiles } from '../../shared/utilities/workspaceUtils'
import { CurrentWsFolders, collectFiles, defaultExcludePatterns } from '../../shared/utilities/workspaceUtils'
import {
FileSizeExceededError,
NoActiveFileError,
Expand Down Expand Up @@ -412,11 +412,18 @@ export class ZipUtil {

const sourceFiles = await collectFiles(
projectPaths,
vscode.workspace.workspaceFolders as CurrentWsFolders,
(useCase === FeatureUseCase.TEST_GENERATION
? [...(vscode.workspace.workspaceFolders ?? [])].sort(
(a, b) => b.uri.fsPath.length - a.uri.fsPath.length
)
: vscode.workspace.workspaceFolders) as CurrentWsFolders,
{
maxSizeBytes: this.getProjectScanPayloadSizeLimitInBytes(),
},
useCase
excludePatterns:
useCase === 'TEST_GENERATION'
? [...CodeWhispererConstants.testGenExcludePatterns, ...defaultExcludePatterns]
: defaultExcludePatterns,
}
)
for (const file of sourceFiles) {
const projectName = path.basename(file.workspaceFolder.uri.fsPath)
Expand Down
17 changes: 5 additions & 12 deletions packages/core/src/shared/utilities/workspaceUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import fs from '../fs/fs'
import { ChildProcess } from './processUtils'
import { isWin } from '../vscode/env'
import { maxRepoSizeBytes } from '../../amazonqFeatureDev/constants'
import { FeatureUseCase } from '../../codewhisperer/models/constants'
import { FeatureUseCase, testGenExcludePatterns } from '../../codewhisperer/models/constants'

type GitIgnoreRelativeAcceptor = {
folderPath: string
Expand Down Expand Up @@ -224,18 +224,12 @@ export function getWorkspaceRelativePath(
workspaceFolders?: readonly vscode.WorkspaceFolder[]
} = {
workspaceFolders: vscode.workspace.workspaceFolders,
},
useCase?: FeatureUseCase
}
): { relativePath: string; workspaceFolder: vscode.WorkspaceFolder } | undefined {
if (!override.workspaceFolders) {
return
}
let folders = override.workspaceFolders
if (useCase && useCase === FeatureUseCase.TEST_GENERATION) {
// Sort workspace folders by path length (descending) to prioritize deeper paths
// TODO: Need to enable this for entire Q
folders = [...override.workspaceFolders].sort((a, b) => b.uri.fsPath.length - a.uri.fsPath.length)
}
const folders = override.workspaceFolders

for (const folder of folders) {
if (isInDirectory(folder.uri.fsPath, childPath)) {
Expand Down Expand Up @@ -361,8 +355,7 @@ export async function collectFiles(
excludeByGitIgnore?: boolean // default true
excludePatterns?: string[] // default defaultExcludePatterns
filterFn?: CollectFilesFilter
},
useCase?: FeatureUseCase
}
): Promise<CollectFilesResultItem[]> {
const storage: Awaited<CollectFilesResultItem[]> = []

Expand Down Expand Up @@ -408,7 +401,7 @@ export async function collectFiles(
const files = excludeByGitIgnore ? await filterOutGitignoredFiles(rootPath, allFiles, false) : allFiles

for (const file of files) {
const relativePath = getWorkspaceRelativePath(file.fsPath, { workspaceFolders }, useCase)
const relativePath = getWorkspaceRelativePath(file.fsPath, { workspaceFolders })
if (!relativePath) {
continue
}
Expand Down
Loading