fix: fix JSON within core commands and update highlighting#30
Merged
davem-intersys merged 1 commit intointersystems:mainfrom Mar 22, 2026
Merged
fix: fix JSON within core commands and update highlighting#30davem-intersys merged 1 commit intointersystems:mainfrom
davem-intersys merged 1 commit intointersystems:mainfrom
Conversation
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.
Overview
A bug was found where the return statement wasn't parsing JSON objects correctly. This PR fixes that bug and updates highlighting.
Details
The return statement wasn't being parsed correctly (this was a special case where the scanner was messing up and registered { as an argumentless loop, when it shouldn't since it is json):

This led me to realize this should be fixed for many of the commands. I added a new function
build_command_rule_argumentful_block_allowedto core that doesn't register { as a block, and thus parses json objects as expected.This new function replaces
build_command_rule_argumentfulfor the following commands:write,lock,read,open,close,use,throw,break,return,quit,goto,hang,xecute,view,zkill,zn,zsu,ztrap,zwrite,zz.With this change, JSON objects are parsed as expected:

Highlighting Updates
Testing
See the corresponding workflows: