Align hcl.Block & hclsyntax.Block DefRange
#487
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This patch fixes a minor discrepancy between `hclsyntax` and `hcl`
in how DefRange is computed for a block.
DefRange of the "higher-level" `hcl.Block` (typically used by most applications)
ends with the last label.
DefRange of the "lower-level" `hclsyntax.Block` ended with the opening brace `{`
(i.e. at least 2 characters further).
Here we align the low-level API with the high-level one, meaning that most consumers
should not be affected by this change, partly because they use
`hcl.Block` (which isn't changing) or because they use DefRange
to inform some non-critical decisions such as enriching diagnostics.
apparentlymart
approved these changes
Sep 22, 2021
radeksimko
added a commit
to hashicorp/hcl-lang
that referenced
this pull request
Jan 5, 2022
This is to reflect upstream change hashicorp/hcl#487
radeksimko
added a commit
to hashicorp/hcl-lang
that referenced
this pull request
Jan 5, 2022
) * build(deps): bump github.com/hashicorp/hcl/v2 from 2.10.1 to 2.11.1 Bumps [github.com/hashicorp/hcl/v2](https://github.com/hashicorp/hcl) from 2.10.1 to 2.11.1. - [Release notes](https://github.com/hashicorp/hcl/releases) - [Changelog](https://github.com/hashicorp/hcl/blob/main/CHANGELOG.md) - [Commits](hashicorp/hcl@v2.10.1...v2.11.1) --- updated-dependencies: - dependency-name: github.com/hashicorp/hcl/v2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Update position lookup for outside of body This is to reflect upstream change hashicorp/hcl#487 Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Radek Simko <radek.simko@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This patch fixes a minor discrepancy between
hclsyntaxandhclin how DefRange is computed for a block.DefRange of the "higher-level"
hcl.Block(typically used by most applications) ends with the last label.DefRange of the "lower-level"
hclsyntax.Blockended with the opening brace{(i.e. at least 2 characters further).Here we align the low-level API with the high-level one, meaning that most consumers should not be affected by this change, partly because they use
hcl.Block(which isn't changing) or because they use DefRange to inform some non-critical decisions such as enriching diagnostics.I ran into this discrepancy when working on adding support to JSON syntax to the language server in hashicorp/hcl-lang#88