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.

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

Span macros to replace alot of spans #16820

Merged
merged 15 commits into from Nov 7, 2023
Merged

Conversation

CheffieGithub
Copy link
Contributor

@CheffieGithub CheffieGithub commented Nov 6, 2023

About the PR

Replaces most <span ='class'>msg</span> with SPAN_CLASS(msg). There are limitations of this such as not being able to be used in descriptions unless the entire description is in the macro for example (since the macro evaulates to just a string).
Some spans I intentionally left out due to only using local css for one file.

I used these regexes in this order:

"<span class='([a-zA-Z_]+)'>(.*?)</span>" // Spans encasing whole strings
SPAN_\U$1("$2")
<span class='([a-zA-Z_]+)'>(.*?)</span> // Spans in strings
[SPAN_\U$1("$2")]
<span class='([a-zA-Z_]+)'>(.*?)"\) // Unclosed span tags

Any errors were manually resolved (this includes 100+ missing / malformed tags and most instances of text() usage)

Why's this needed?

Mistakes while writing spans such as missing or malformed end tags are very common.
It should make some areas of code easier to read and shorter depending what classes are used.
Its somewhat easier to maintain this way.

Changelog

(u)Cheffie
(*)Big internal styling refactor, please report any styling errors you encounter in the chat!

@github-actions github-actions bot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Nov 6, 2023
@CheffieGithub CheffieGithub added A-Internal Deals with major internal, generally non-player facing code - e.g. types C-Code-Quality Cleans up code, refactors things to be more readable or intuitive C-QoL A quality of life improvement that makes the game easier to play labels Nov 6, 2023
@github-actions github-actions bot added the S-Merge-Conflict Applied and removed when a PR has or no longer has a merge conflict label Nov 7, 2023
@@ -0,0 +1,51 @@
/* ====== SPAN MACROS ====== */
Copy link
Member

Choose a reason for hiding this comment

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

Unless there is something preventing that I think these should use string interpolation instead of +.

@pali6 pali6 merged commit 595bec5 into goonstation:master Nov 7, 2023
22 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-Internal Deals with major internal, generally non-player facing code - e.g. types C-Code-Quality Cleans up code, refactors things to be more readable or intuitive C-QoL A quality of life improvement that makes the game easier to play S-Merge-Conflict Applied and removed when a PR has or no longer has a merge conflict size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants