mirror of
https://github.com/mawww/kakoune.git
synced 2024-09-11 13:00:41 +03:00
658c3385a9
When using either of set-option g completers option=my_option prompt -shell-script-candidates ... While the search text is empty, the completions will be sorted alphabetically. This is bad because it means the most important entries are not listed first, making them harder to select or even spot. Let's apply input order before resorting to sorting alphabetically. In theory there is a more elegant solution: sort candidates (except if they're user input) before passing them to RankedMatch, and then always use stable sort. However that doesn't work because we use a heap which doesn't support stable sort. Closes #1709, #4813
65 lines
1.7 KiB
C++
65 lines
1.7 KiB
C++
#ifndef ranked_match_hh_INCLUDED
|
|
#define ranked_match_hh_INCLUDED
|
|
|
|
#include "string.hh"
|
|
#include "meta.hh"
|
|
|
|
#include <cstdint>
|
|
|
|
namespace Kakoune
|
|
{
|
|
|
|
using UsedLetters = uint64_t;
|
|
UsedLetters used_letters(StringView str);
|
|
|
|
constexpr UsedLetters upper_mask = 0xFFFFFFC000000;
|
|
|
|
inline UsedLetters to_lower(UsedLetters letters)
|
|
{
|
|
return ((letters & upper_mask) >> 26) | (letters & (~upper_mask));
|
|
}
|
|
|
|
struct RankedMatch
|
|
{
|
|
RankedMatch(StringView candidate, StringView query);
|
|
RankedMatch(StringView candidate, UsedLetters candidate_letters,
|
|
StringView query, UsedLetters query_letters);
|
|
|
|
const StringView& candidate() const { return m_candidate; }
|
|
bool operator<(const RankedMatch& other) const;
|
|
bool operator==(const RankedMatch& other) const { return m_candidate == other.m_candidate; }
|
|
|
|
explicit operator bool() const { return m_matches; }
|
|
|
|
void set_input_sequence_number(size_t i) { m_input_sequence_number = i; }
|
|
|
|
private:
|
|
template<typename TestFunc>
|
|
RankedMatch(StringView candidate, StringView query, TestFunc test);
|
|
|
|
enum class Flags : int
|
|
{
|
|
None = 0,
|
|
// Order is important, the highest bit has precedence for comparison
|
|
SingleWord = 1 << 0,
|
|
Contiguous = 1 << 1,
|
|
OnlyWordBoundary = 1 << 2,
|
|
Prefix = 1 << 3,
|
|
BaseName = 1 << 4,
|
|
SmartFullMatch = 1 << 5,
|
|
FullMatch = 1 << 6,
|
|
};
|
|
friend constexpr bool with_bit_ops(Meta::Type<Flags>) { return true; }
|
|
|
|
StringView m_candidate{};
|
|
bool m_matches = false;
|
|
Flags m_flags = Flags::None;
|
|
int m_word_boundary_match_count = 0;
|
|
int m_max_index = 0;
|
|
size_t m_input_sequence_number = 0;
|
|
};
|
|
|
|
}
|
|
|
|
#endif // ranked_match_hh_INCLUDED
|