cleanup: remove obsolete ellipsis complexity#12493
Closed
danielrainer wants to merge 4 commits intofish-shell:masterfrom
Closed
cleanup: remove obsolete ellipsis complexity#12493danielrainer wants to merge 4 commits intofish-shell:masterfrom
danielrainer wants to merge 4 commits intofish-shell:masterfrom
Conversation
The `msguniq` call for deduplicating the msgids originating from Rust previously did not get a header entry (empty msgid with msgstr containing metadata). This works fine as long as all msgids are ASCII-only. But when a non-ASCII character appears in a msgid, `msguniq` errors out without a header specifying the encoding. To resolve this, add the header to the input of this `msguniq` invocation and then remove the header again using sed to prevent duplicating it for the outer msguniq call at the end of the file.
added 3 commits
March 1, 2026 01:47
This time, functions for decoding `wstr` into various types and the `ToCString` trait are extracted. Part of the wider goal of slimming down the main library to improve incremental build performance and reduce dependency cycles.
Previously, we chose the ellipsis character/string based on the locale. We now assume a UTF-8 locale, and accordingly always use the Unicode HORIZONTAL ELLIPSIS U+2026 `…`. When this was changed, some of the logic for handling different ellipsis values was left behind. It no longer serves a purpose, so remove it. The functions returning constants are replaced by constants. Since the ellipsis as a `wstr` is only used in a single file, make it a local const there and define it via the `ELLIPSIS_CHAR` const. Put the `ELLIPSIS_CHAR` definition into `fish-widestring`, removing the dependency of `fish-wcstringutil` on `fish-common`, helping future extraction efforts. One localized message contains an ellipsis, which was inserted via a placeholder, preventing translators from localizing it. Since the ellipsis is a constant, put it directly into the localized string.
2c705d7 to
641c83b
Compare
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
2 participants
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.
Previously, we chose the ellipsis character/string based on the locale.
We now assume a UTF-8 locale, and accordingly always use the Unicode
HORIZONTAL ELLIPSIS U+2026
…. When this was changed, some of the logicfor handling different ellipsis values was left behind. It no longer
serves a purpose, so remove it.
The functions returning constants are replaced by constants. Since the
ellipsis as a
wstris only used in a single file, make it a localconst there and define it via the
ELLIPSIS_CHARconst.Put the
ELLIPSIS_CHARdefinition intofish-widestring, removing thedependency of
fish-wcstringutilonfish-common, helping futureextraction efforts.
One localized message contains an ellipsis, which was inserted via a
placeholder, preventing translators from localizing it. Since the
ellipsis is a constant, put it directly into the localized string.
Stacked on #12491, #12492