Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Resolve conflict between shader uniform tooltips /** and general annotation /**/. #91549

Merged
merged 1 commit into from May 17, 2024
Merged

Resolve conflict between shader uniform tooltips /** and general annotation /**/. #91549

merged 1 commit into from May 17, 2024
+3 −1

Conversation

magian1127
Copy link
Contributor

@magian1127 magian1127 requested a review from a team as a code owner May 4, 2024 04:51
@magian1127 magian1127 marked this pull request as draft May 4, 2024 05:48
@magian1127 magian1127 force-pushed the 4.0ChangeHighlightingStartKey branch from 70d4b83 to 2f8c5e1 Compare May 4, 2024 06:09
@magian1127 magian1127 changed the title Change the highlighting of '/**' to '/** '. Change the shader uniform tooltips of '/**' to '/** '. May 4, 2024
@magian1127 magian1127 marked this pull request as ready for review May 4, 2024 06:10
@AThousandShips AThousandShips added this to the 4.3 milestone May 4, 2024
@akien-mga
Copy link
Member

akien-mga commented May 13, 2024 •
edited

What happens if someone uses:

/**
 * Some description.
 */

with no space (but only end of line, $) on the first line?

IMO this should be supported so you might need to support any whitespace (space, tab) or end of line.

Or alternatively, match /**[^/] instead.

@magian1127 magian1127 force-pushed the 4.0ChangeHighlightingStartKey branch from 2f8c5e1 to 2c627de Compare May 14, 2024 07:25
@magian1127 magian1127 changed the title Change the shader uniform tooltips of '/**' to '/** '. Resolve conflict between shader uniform tooltips "/**" and general annotation "/**/". May 14, 2024
@magian1127 magian1127 changed the title Resolve conflict between shader uniform tooltips "/**" and general annotation "/**/". Resolve conflict between shader uniform tooltips /** and general annotation /**/. May 14, 2024
@magian1127 magian1127 force-pushed the 4.0ChangeHighlightingStartKey branch from 2c627de to e6aeb4c Compare May 14, 2024 07:28
@magian1127 magian1127 force-pushed the 4.0ChangeHighlightingStartKey branch from e6aeb4c to 8a92615 Compare May 14, 2024 07:32
@magian1127
Copy link
Contributor Author

magian1127 commented May 14, 2024 •
edited

This PR has been modified again to solve the following 2 problems.

1 Change the regular to \*\*\s start match, to solve the problem of lagging.
2 Add a color_region of /**/ to solve the region interrupt problem. (This is still a stopgap measure, and it would be better to rewrite _get_line_syntax_highlighting_impl .)

clayjohn
clayjohn approved these changes May 16, 2024
View reviewed changes
Copy link
Member

@clayjohn clayjohn left a comment

Choose a reason for hiding this comment

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

I've tested locally and it works fine!

@akien-mga akien-mga merged commit 9eff940 into godotengine:master May 17, 2024
16 checks passed
@akien-mga
Copy link
Member

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@akien-mga akien-mga akien-mga approved these changes

@clayjohn clayjohn clayjohn approved these changes

Assignees
No one assigned
Labels
bug regression topic:shaders
Projects
None yet
Milestone
4.3
Development

Successfully merging this pull request may close these issues.

Shader documentation syntax fails to terminate with /**/ causing large editor freezes (regression 4.3-dev6)
4 participants
@magian1127 @akien-mga @clayjohn @AThousandShips