Set CloseBraceRange to last label in error-recovered blocks#786
Open
Yantrio wants to merge 1 commit intohashicorp:mainfrom
Open
Set CloseBraceRange to last label in error-recovered blocks#786Yantrio wants to merge 1 commit intohashicorp:mainfrom
Yantrio wants to merge 1 commit intohashicorp:mainfrom
Conversation
Signed-off-by: James Humphries <james@james-humphries.co.uk>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Description
When the HCL parser error-recovers from an incomplete block (no opening brace),
Block.Range()only covered the type keyword, not the labels. This is becauseCloseBraceRangewas set toident.Rangeas a placeholder, soRangeBetween(TypeRange, CloseBraceRange)produced a range that ended at the type keyword.This caused position-based lookups like
OutermostBlockAtPosto miss positions within labels, which downstream affected things likecompletionAtPosin hcl-lang skipping incomplete blocks entirely and returning snippets instead of real label candidates.This attempts to fix this by editing the
finishParsingBodyBlock's error-recovery path, settingCloseBraceRangeto the last label range (falling back toident.Rangeif no labels exist). This ensures that the range includes more information than before.Related Issue
OpenBraceRange.Startdiffers if a proper block precedes it or not #708 (Partially)How Has This Been Tested?
I've run the entire test suite and included new tests to cover the new functionality.