Replaced more boilerplate code with CompletionRequest (NFC)
Summary:
As suggested in D48796, this patch replaces even more internal calls that were using the old
completion API style with a single CompletionRequest. In some cases we also pass an option
vector/index, but as we don't always have this information, it currently is not part of the
CompletionRequest class.
The constructor of the CompletionRequest is now also more sensible. You only pass the
user input, cursor position and your list of matches to the request and the rest will be
inferred (using the same code we used before to calculate this). You also have to pass these
match window parameters to it, even though they are unused right now.
The patch shouldn't change any behavior.
Reviewers: jingham
Reviewed By: jingham
Subscribers: lldb-commits
Differential Revision: https://reviews.llvm.org/D48976
llvm-svn: 337031
diff --git a/lldb/source/Commands/CommandObjectSettings.cpp b/lldb/source/Commands/CommandObjectSettings.cpp
index ed58ca4..f259f2f 100644
--- a/lldb/source/Commands/CommandObjectSettings.cpp
+++ b/lldb/source/Commands/CommandObjectSettings.cpp
@@ -136,9 +136,6 @@
int HandleArgumentCompletion(
CompletionRequest &request,
OptionElementVector &opt_element_vector) override {
- std::string completion_str(
- request.GetParsedLine().GetArgumentAtIndex(request.GetCursorIndex()),
- request.GetCursorCharPosition());
const size_t argc = request.GetParsedLine().GetArgumentCount();
const char *arg = nullptr;
@@ -151,13 +148,9 @@
}
if (request.GetCursorIndex() == setting_var_idx) {
// Attempting to complete setting variable name
- bool word_complete = request.GetWordComplete();
CommandCompletions::InvokeCommonCompletionCallbacks(
GetCommandInterpreter(), CommandCompletions::eSettingsNameCompletion,
- completion_str.c_str(), request.GetMatchStartPoint(),
- request.GetMaxReturnElements(), nullptr, word_complete,
- request.GetMatches());
- request.SetWordComplete(word_complete);
+ request, nullptr);
} else {
arg =
request.GetParsedLine().GetArgumentAtIndex(request.GetCursorIndex());
@@ -174,12 +167,7 @@
m_interpreter.GetDebugger().GetPropertyValue(
&m_exe_ctx, setting_var_name, false, error));
if (value_sp) {
- bool word_complete = request.GetWordComplete();
- value_sp->AutoComplete(m_interpreter, completion_str.c_str(),
- request.GetMatchStartPoint(),
- request.GetMaxReturnElements(),
- word_complete, request.GetMatches());
- request.SetWordComplete(word_complete);
+ value_sp->AutoComplete(m_interpreter, request);
}
}
}
@@ -281,17 +269,9 @@
int HandleArgumentCompletion(
CompletionRequest &request,
OptionElementVector &opt_element_vector) override {
- std::string completion_str(
- request.GetParsedLine().GetArgumentAtIndex(request.GetCursorIndex()),
- request.GetCursorCharPosition());
-
- bool word_complete = request.GetWordComplete();
CommandCompletions::InvokeCommonCompletionCallbacks(
GetCommandInterpreter(), CommandCompletions::eSettingsNameCompletion,
- completion_str.c_str(), request.GetMatchStartPoint(),
- request.GetMaxReturnElements(), nullptr, word_complete,
- request.GetMatches());
- request.SetWordComplete(word_complete);
+ request, nullptr);
return request.GetMatches().GetSize();
}
@@ -355,17 +335,9 @@
int HandleArgumentCompletion(
CompletionRequest &request,
OptionElementVector &opt_element_vector) override {
- std::string completion_str(
- request.GetParsedLine().GetArgumentAtIndex(request.GetCursorIndex()),
- request.GetCursorCharPosition());
-
- bool word_complete = request.GetWordComplete();
CommandCompletions::InvokeCommonCompletionCallbacks(
GetCommandInterpreter(), CommandCompletions::eSettingsNameCompletion,
- completion_str.c_str(), request.GetMatchStartPoint(),
- request.GetMaxReturnElements(), nullptr, word_complete,
- request.GetMatches());
- request.SetWordComplete(word_complete);
+ request, nullptr);
return request.GetMatches().GetSize();
}
@@ -451,19 +423,10 @@
int HandleArgumentCompletion(
CompletionRequest &request,
OptionElementVector &opt_element_vector) override {
- std::string completion_str(
- request.GetParsedLine().GetArgumentAtIndex(request.GetCursorIndex()),
- request.GetCursorCharPosition());
-
- // Attempting to complete variable name
- bool word_complete = request.GetWordComplete();
if (request.GetCursorIndex() < 2)
CommandCompletions::InvokeCommonCompletionCallbacks(
GetCommandInterpreter(), CommandCompletions::eSettingsNameCompletion,
- completion_str.c_str(), request.GetMatchStartPoint(),
- request.GetMaxReturnElements(), nullptr, word_complete,
- request.GetMatches());
- request.SetWordComplete(word_complete);
+ request, nullptr);
return request.GetMatches().GetSize();
}
@@ -575,19 +538,11 @@
int HandleArgumentCompletion(
CompletionRequest &request,
OptionElementVector &opt_element_vector) override {
- std::string completion_str(
- request.GetParsedLine().GetArgumentAtIndex(request.GetCursorIndex()),
- request.GetCursorCharPosition());
-
- bool word_complete = request.GetWordComplete();
// Attempting to complete variable name
if (request.GetCursorIndex() < 2)
CommandCompletions::InvokeCommonCompletionCallbacks(
GetCommandInterpreter(), CommandCompletions::eSettingsNameCompletion,
- completion_str.c_str(), request.GetMatchStartPoint(),
- request.GetMaxReturnElements(), nullptr, word_complete,
- request.GetMatches());
- request.SetWordComplete(word_complete);
+ request, nullptr);
return request.GetMatches().GetSize();
}
@@ -683,19 +638,11 @@
int HandleArgumentCompletion(
CompletionRequest &request,
OptionElementVector &opt_element_vector) override {
- std::string completion_str(
- request.GetParsedLine().GetArgumentAtIndex(request.GetCursorIndex()),
- request.GetCursorCharPosition());
-
- bool word_complete = request.GetWordComplete();
// Attempting to complete variable name
if (request.GetCursorIndex() < 2)
CommandCompletions::InvokeCommonCompletionCallbacks(
GetCommandInterpreter(), CommandCompletions::eSettingsNameCompletion,
- completion_str.c_str(), request.GetMatchStartPoint(),
- request.GetMaxReturnElements(), nullptr, word_complete,
- request.GetMatches());
- request.SetWordComplete(word_complete);
+ request, nullptr);
return request.GetMatches().GetSize();
}
@@ -796,19 +743,11 @@
int HandleArgumentCompletion(
CompletionRequest &request,
OptionElementVector &opt_element_vector) override {
- std::string completion_str(
- request.GetParsedLine().GetArgumentAtIndex(request.GetCursorIndex()),
- request.GetCursorCharPosition());
-
- bool word_complete = request.GetWordComplete();
// Attempting to complete variable name
if (request.GetCursorIndex() < 2)
CommandCompletions::InvokeCommonCompletionCallbacks(
GetCommandInterpreter(), CommandCompletions::eSettingsNameCompletion,
- completion_str.c_str(), request.GetMatchStartPoint(),
- request.GetMaxReturnElements(), nullptr, word_complete,
- request.GetMatches());
- request.SetWordComplete(word_complete);
+ request, nullptr);
return request.GetMatches().GetSize();
}
@@ -898,19 +837,11 @@
int HandleArgumentCompletion(
CompletionRequest &request,
OptionElementVector &opt_element_vector) override {
- std::string completion_str(
- request.GetParsedLine().GetArgumentAtIndex(request.GetCursorIndex()),
- request.GetCursorCharPosition());
-
- bool word_complete = request.GetWordComplete();
// Attempting to complete variable name
if (request.GetCursorIndex() < 2)
CommandCompletions::InvokeCommonCompletionCallbacks(
GetCommandInterpreter(), CommandCompletions::eSettingsNameCompletion,
- completion_str.c_str(), request.GetMatchStartPoint(),
- request.GetMaxReturnElements(), nullptr, word_complete,
- request.GetMatches());
- request.SetWordComplete(word_complete);
+ request, nullptr);
return request.GetMatches().GetSize();
}
@@ -987,19 +918,11 @@
int HandleArgumentCompletion(
CompletionRequest &request,
OptionElementVector &opt_element_vector) override {
- std::string completion_str(
- request.GetParsedLine().GetArgumentAtIndex(request.GetCursorIndex()),
- request.GetCursorCharPosition());
-
- bool word_complete = request.GetWordComplete();
// Attempting to complete variable name
if (request.GetCursorIndex() < 2)
CommandCompletions::InvokeCommonCompletionCallbacks(
GetCommandInterpreter(), CommandCompletions::eSettingsNameCompletion,
- completion_str.c_str(), request.GetMatchStartPoint(),
- request.GetMaxReturnElements(), nullptr, word_complete,
- request.GetMatches());
- request.SetWordComplete(word_complete);
+ request, nullptr);
return request.GetMatches().GetSize();
}