Skip to content

Minor fixes#51

Merged
rmordechay merged 3 commits intormordechay:mainfrom
FalsePattern:pr1
Mar 28, 2025
Merged

Minor fixes#51
rmordechay merged 3 commits intormordechay:mainfrom
FalsePattern:pr1

Conversation

@FalsePattern
Copy link
Copy Markdown
Contributor

  • Fixed tests failing on linux
  • Fixed MACRO_IDENTIFIER_STATE lexer state leaking across newline
  • Fixed a crash caused by getLookupElement calling kotlin TODO instead of returning null

Supersedes #47 (part 1 of 4)

@FalsePattern FalsePattern mentioned this pull request Mar 6, 2025
Comment thread grammar/GlslLexer.flex

<MACRO_IDENTIFIER_STATE> {
{WHITE_SPACE} { return WHITE_SPACE; }
{BACKSLASH} { return WHITE_SPACE; }
Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please explain more about this one? And also can you add steps to reproduce? I'm saying that because I cannot even remember how many nights I spent to make macros work in this plugin and this touches the core of the logic so I'm very very afraid to touch anything that is related to macros

Copy link
Copy Markdown
Contributor Author

@FalsePattern FalsePattern Mar 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#define \
EXAMPLE 10

without this fix:
image

with this fix:
image

@rmordechay rmordechay merged commit 0dc6736 into rmordechay:main Mar 28, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants