Skip to content

Fix inability to uncomment code in text shader editor#83822

Merged
akien-mga merged 1 commit intogodotengine:masterfrom
jsjtxietian:fix-can-not-uncomment-in-text-shader-editor
Oct 28, 2023
Merged

Fix inability to uncomment code in text shader editor#83822
akien-mga merged 1 commit intogodotengine:masterfrom
jsjtxietian:fix-can-not-uncomment-in-text-shader-editor

Conversation

@jsjtxietian
Copy link
Contributor

Fixes #83821

The origin logic assumes delimiter is # and thus left(1), but in shader it's \\, so the logic for checking is_commented failed.

@jsjtxietian jsjtxietian force-pushed the fix-can-not-uncomment-in-text-shader-editor branch from 628dbba to 961381c Compare October 24, 2023 03:24
@SaracenOne SaracenOne self-assigned this Oct 27, 2023
Copy link
Member

@SaracenOne SaracenOne left a comment

Choose a reason for hiding this comment

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

LGTM 👍
Tested, it works, and implementation looks fine. I also compared it with a previous similar PR I reviewed for the script editor, and it doesn't seem like any regressions have been introduced by fixing this. (#83382).

@akien-mga akien-mga merged commit b6c941f into godotengine:master Oct 28, 2023
@akien-mga
Copy link
Member

Thanks!

@akien-mga akien-mga changed the title Fix unable to uncomment code in text shader editor Fix unability to uncomment code in text shader editor Oct 28, 2023
@akien-mga akien-mga changed the title Fix unability to uncomment code in text shader editor Fix inability to uncomment code in text shader editor Oct 28, 2023
@jsjtxietian jsjtxietian deleted the fix-can-not-uncomment-in-text-shader-editor branch October 28, 2023 11:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Can not uncomment code in text shader editor

5 participants