Problem

When migrating queries that use the @CurrentIteration macro, the TfsSharedQueryProcessor fails to preserve area path selections in the migrated query. This results in queries being migrated without any errors but missing their area selection criteria.

As shown in the screenshot from the issue, queries with both area selection and @CurrentIteration lose their area path condition during migration:

Solution

This PR implements a solution that ensures area path conditions are preserved when migrating queries with @CurrentIteration macros. The implementation:

1. Adds special handling for queries containing @CurrentIteration
2. Detects when a query contains both area path conditions and the @CurrentIteration macro
3. Reorders conditions when necessary to put area path conditions before iteration path conditions
4. Preserves the query structure and ensures all conditions are maintained in the migrated query
5. Adds enhanced logging to help with troubleshooting

Changes

• Modified MigrateQuery method to capture and log the original query text
• Added a new PreserveMacros method to handle special macros like @CurrentIteration
• Implemented condition reordering when needed to preserve area path selections
• Added new test cases to verify the fix

Testing

Added unit tests that verify:

• Queries with both @CurrentIteration and area path selections are properly preserved
• When area path conditions appear after @CurrentIteration, they are reordered to ensure preservation

Fixes #2705.

💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more Copilot coding agent tips in the docs.