xenia/home
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add support for hex formatting

Browse Source
This commit is contained in:
Maxime Coste 2015-06-22 13:56:00 +01:00
parent 7e6b02f26a
commit 6870895374
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/highlighters.cc
View File

@ -17,7 +17,6 @@
#include "utf8.hh" #include "utf8.hh"
#include "utf8_iterator.hh" #include "utf8_iterator.hh"
#include <sstream>
#include <locale> #include <locale>
namespace Kakoune namespace Kakoune
@ -834,15 +833,12 @@ void expand_unprintable(const Context& context, HighlightFlags flags, DisplayBuf
auto next = utf8::next(it, end); auto next = utf8::next(it, end);
if (cp != '\n' and not iswprint(cp)) if (cp != '\n' and not iswprint(cp))
{ {
std::ostringstream oss;
oss << "U+" << std::hex << cp;
const auto& stdstr = oss.str();
String str{stdstr.begin(), stdstr.end()};
if (it.coord() != atom_it->begin()) if (it.coord() != atom_it->begin())
atom_it = ++line.split(atom_it, it.coord()); atom_it = ++line.split(atom_it, it.coord());
if (next.coord() < atom_it->end()) if (next.coord() < atom_it->end())
atom_it = line.split(atom_it, next.coord()); atom_it = line.split(atom_it, next.coord());
atom_it->replace(str);
atom_it->replace(format("U+{}", hex(cp)));
atom_it->face = { Color::Red, Color::Black }; atom_it->face = { Color::Red, Color::Black };
break; break;
} }

7
src/string.cc
View File

@ -137,6 +137,13 @@ InplaceString<24> to_string(size_t val)
return res; return res;
} }
InplaceString<24> to_string(Hex val)
{
InplaceString<24> res;
res.m_length = sprintf(res.m_data, "%zx", val.val);
return res;
}
InplaceString<24> to_string(float val) InplaceString<24> to_string(float val)
{ {
InplaceString<24> res; InplaceString<24> res;

4
src/string.hh
View File

@ -270,8 +270,12 @@ struct InplaceString
char m_data[N]; char m_data[N];
}; };
struct Hex { size_t val; };
inline Hex hex(size_t val) { return {val}; }
InplaceString<16> to_string(int val); InplaceString<16> to_string(int val);
InplaceString<24> to_string(size_t val); InplaceString<24> to_string(size_t val);
InplaceString<24> to_string(Hex val);
InplaceString<24> to_string(float val); InplaceString<24> to_string(float val);
template<typename RealType, typename ValueType> template<typename RealType, typename ValueType>