chatterino2
Code Issues

fix: Fix username tab completion without @ (#4853)

Browse Source
This commit is contained in:
Daniel Sage
2023-10-01 05:39:18 -04:00
committed by GitHub
parent 467e36767c
commit 4bb196c644
3 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/controllers/completion/TabCompletionModel.cpp
+7 -4
View File
@@ -100,7 +100,7 @@ std::unique_ptr<completion::Source> TabCompletionModel::buildSource(
return this->buildEmoteSource();
}
case SourceKind::User: {
return this->buildUserSource();
return this->buildUserSource(true); // Completing with @
}
case SourceKind::Command: {
return this->buildCommandSource();
@@ -116,7 +116,8 @@ std::unique_ptr<completion::Source> TabCompletionModel::buildSource(
case SourceKind::EmoteUserCommand: {
std::vector<std::unique_ptr<completion::Source>> sources;
sources.push_back(this->buildEmoteSource());
sources.push_back(this->buildUserSource());
sources.push_back(
this->buildUserSource(false)); // Not completing with @
sources.push_back(this->buildCommandSource());
return std::make_unique<completion::UnifiedSource>(
@@ -134,10 +135,12 @@ std::unique_ptr<completion::Source> TabCompletionModel::buildEmoteSource() const
std::make_unique<completion::ClassicTabEmoteStrategy>());
}
std::unique_ptr<completion::Source> TabCompletionModel::buildUserSource() const
std::unique_ptr<completion::Source> TabCompletionModel::buildUserSource(
bool prependAt) const
{
return std::make_unique<completion::UserSource>(
&this->channel_, std::make_unique<completion::ClassicUserStrategy>());
&this->channel_, std::make_unique<completion::ClassicUserStrategy>(),
nullptr, prependAt);
}
std::unique_ptr<completion::Source> TabCompletionModel::buildCommandSource()
src/controllers/completion/TabCompletionModel.hpp
+6 -1
View File
@@ -31,10 +31,15 @@ public:
private:
enum class SourceKind {
// Known to be an emote, i.e. started with :
Emote,
// Known to be a username, i.e. started with @
User,
// Known to be a command, i.e. started with / or .
Command,
// Emote or command without : or / .
EmoteCommand,
// Emote, user, or command without :, @, / .
EmoteUserCommand
};
@@ -54,7 +59,7 @@ private:
std::unique_ptr<completion::Source> buildSource(SourceKind kind) const;
std::unique_ptr<completion::Source> buildEmoteSource() const;
std::unique_ptr<completion::Source> buildUserSource() const;
std::unique_ptr<completion::Source> buildUserSource(bool prependAt) const;
std::unique_ptr<completion::Source> buildCommandSource() const;
Channel &channel_;