Fix XmlForClause and JsonForClause FirstTokenIndex in subqueries #129
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.
Issue
When using XML or JSON
FORclauses in subqueries, theFirstTokenIndexofXmlForClauseandJsonForClauseobjects incorrectly pointed to the first option token (typicallyPATH) instead of theFORkeyword token.As shown in the screenshot, the
FirstTokenIndexvalue of theXmlForClausein a subquery points to index 55 (thePATHkeyword) while it should point to theFORkeyword like it does in regular queries.Changes
Modified the
xmlForClauseandjsonForClausegrammar rules to properly track theFORtoken index:FORtoken usingGetLastTokenIndex()at the beginning of the clause parsingFirstTokenIndexto theFORtoken index usingUpdateTokenInfo()before any other token operationsTesting
Added a test file with examples of both regular queries and subqueries using
FOR XMLandFOR JSONclauses.This ensures that
FirstTokenIndexconsistently points to theFORkeyword in all contexts, making token indexing more reliable for tooling that depends on these indices.Fixes #119.
Warning
Firewall rules blocked me from connecting to one or more addresses
I tried to connect to the following addresses, but was blocked by firewall rules:
crl3.digicert.comdotnet build(dns block)crl4.digicert.comdotnet build(dns block)dc.services.visualstudio.comdotnet build(dns block)dot.netwget REDACTED(dns block)ocsp.digicert.comdotnet build(dns block)s.symcb.comdotnet build(dns block)/home/REDACTED/work/_temp/ghcca-node/node/bin/node /home/REDACTED/work/_temp/copilot-developer-action-main/dist/index.js(dns block)s.symcd.comdotnet build(dns block)ts-crl.ws.symantec.comdotnet build(dns block)ts-ocsp.ws.symantec.comdotnet build(dns block)www.antlr2.org/home/REDACTED/.dotnet/dotnet /home/REDACTED/.dotnet/sdk/8.0.406/MSBuild.dll /nologo /nodemode:1 /nodeReuse:true /low:false(dns block)www.antlr3.orgwget REDACTED(dns block)If you need me to access, download, or install something from one of these locations, you can either:
💡 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.