Fix navigation bar wrong entries for local functions (#1932)#1936
Closed
Copilot wants to merge 1 commit into
Closed
Fix navigation bar wrong entries for local functions (#1932)#1936Copilot wants to merge 1 commit into
Copilot wants to merge 1 commit into
Conversation
…CAL keyword being consumed in ParseVisibilityAndModifiers Agent-Logs-Url: https://github.com/X-Sharp/XSharpPublic/sessions/f69f4cba-fc28-43fd-a578-b44a64177ee8 Co-authored-by: RobertvanderHulst <14240939+RobertvanderHulst@users.noreply.github.com>
Copilot created this pull request from a session on behalf of
RobertvanderHulst
May 15, 2026 13:40
View session
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
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.
Root cause
The commit that added
LOCAL CLASSsupport (8cb728b7a1) introduced aCASE XSharpLexer.LOCALbranch inParseVisibilityAndModifiersthat consumes theLOCALkeyword when followed by any keyword not inIsValidLocalSuffix. SinceFUNCTIONandPROCEDUREwere not inIsValidLocalSuffix,ParseVisibilityAndModifiersconsumedLOCALforlocal functionandlocal proceduredeclarations.This caused
IsStartOfEntityto seeFUNCTION/PROCEDURE(instead ofLOCAL FUNCTION/LOCAL PROCEDURE) and classify local functions as globalKind.Functioninstead ofKind.LocalFunc. Consequently:_globalType.XMembersinstead of being parented to the containing methodRange.EndLinewith the line ofreturn nil(thetokenBeforeof the next method)FindMemberAtRowreturned the misclassified local function instead of the containing method when cursor was atreturn nilFix
Added
FUNCTIONandPROCEDUREtoIsValidLocalSuffixso thatParseVisibilityAndModifiersdoes not consumeLOCALwhen followed by these keywords.IsStartOfEntitythen correctly seesLOCAL FUNCTION/LOCAL PROCEDUREand createsKind.LocalFunc/Kind.LocalProcentities, whichParseLocalFuncProchandles properly.The
LOCAL CLASSfeature is unaffected sinceCLASSis not added toIsValidLocalSuffix.Fixes #1932, related to #1935.