Skip to content

fix(amazonq): normalize path for /doc scope #6823

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
jpinkney-aws merged 2 commits into from
Mar 25, 2025
Merged

fix(amazonq): normalize path for /doc scope #6823

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
73880dd
fix: normalize path for /doc scope
avi-alpert Mar 20, 2025
3b5e606
Update changelog
avi-alpert Mar 20, 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
4 changes: 4 additions & 0 deletions packages/amazonq/.changes/next-release/Bug Fix-3f6a2026-9dd8-4b50-8a73-765ead8717b4.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"type": "Bug Fix",
"description": "Amazon Q Chat: Choosing a nested subfolder for `/doc` on Windows results in `The folder you chose did not contain any source files` error"
}
5 changes: 4 additions & 1 deletion packages/core/src/amazonqDoc/controllers/chat/controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ import { getPathsFromZipFilePath, SvgFileExtension } from '../../../amazonq/util
import { FollowUpTypes } from '../../../amazonq/commons/types'
import { DocGenerationTask, DocGenerationTasks } from '../docGenerationTask'
import { DevPhase } from '../../types'
import { normalize } from '../../../shared/utilities/pathUtils'

export interface ChatControllerEventEmitters {
readonly processHumanChatMessage: EventEmitter<any>
Expand Down Expand Up @@ -160,7 +161,9 @@ export class DocController {
// Display path should always include workspace folder name
displayPath = path.join(relativePath.workspaceFolder.name, relativePath.relativePath)
// Only include workspace folder name in API call if multi-root workspace
docGenerationTask.folderPath = isMultiRootWorkspace() ? displayPath : relativePath.relativePath
docGenerationTask.folderPath = normalize(
isMultiRootWorkspace() ? displayPath : relativePath.relativePath
)

if (!relativePath.relativePath) {
docGenerationTask.folderLevel = 'ENTIRE_WORKSPACE'
Expand Down
Loading