cafkafk/lix
cafkafk/lix
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Merge "flake: fix compiler warning" into main

Browse source
This commit is contained in:
jade 2024-08-21 10:44:01 +00:00 committed by Gerrit Code Review
commit 3cbbe22fab
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/nix/flake.cc
View file

@ -1275,13 +1275,15 @@ struct CmdFlakeShow : FlakeCommand, MixJSON
// FIXME: handle utf8 visible width properly once we get KJ which has utf8 support // FIXME: handle utf8 visible width properly once we get KJ which has utf8 support
// technically filterANSIEscapes knows how to do this but there is absolutely // technically filterANSIEscapes knows how to do this but there is absolutely
// no clear usage of it that would actually let us do this layout. // no clear usage of it that would actually let us do this layout.
int spaceForDescription = screenWidth - output.size() - quotesAndSepsWidth; assert(output.size() < std::numeric_limits<int>::max());
int spaceForDescription = screenWidth - int(output.size()) - quotesAndSepsWidth;
if (spaceForDescription <= 0) { if (spaceForDescription <= 0) {
// do nothing, it is going to wrap no matter what, and it's better to output *something* // do nothing, it is going to wrap no matter what, and it's better to output *something*
} else { } else {
const char *ellipsis = ""; const char *ellipsis = "";
if (spaceForDescription < firstLineDesc.size()) { assert(firstLineDesc.size() < std::numeric_limits<int>::max());
if (spaceForDescription < int(firstLineDesc.size())) {
// subtract one to make space for the ellipsis // subtract one to make space for the ellipsis
firstLineDesc.resize(spaceForDescription - 1); firstLineDesc.resize(spaceForDescription - 1);
ellipsis = "…"; ellipsis = "…";