reuse GetMaxNumberOfCompletionsToAdd

Author: eronnen

lldb/include/lldb/Utility/CompletionRequest.h

@@ -167,12 +167,12 @@ class CompletionRequest {
   /// Returns true if the maximum number of completions has not been reached
   /// yet, hence we should keep adding completions.
   bool ShouldAddCompletions() const {
-    return m_result.GetNumberOfResults() < m_max_return_elements;
+    return GetMaxNumberOfCompletionsToAdd() > 0;
   }
 
   /// Returns the maximum number of completions that need to be added
   /// until reaching the maximum
-  size_t GetMaxNumberOfResultsToAdd() const {
+  size_t GetMaxNumberOfCompletionsToAdd() const {
     const size_t number_of_results = m_result.GetNumberOfResults();
     if (number_of_results >= m_max_return_elements)
       return 0;

lldb/source/Commands/CommandCompletions.cpp

@@ -167,7 +167,7 @@ class SourceFileCompleter : public Completer {
         m_matching_files.AppendIfUnique(context.comp_unit->GetPrimaryFile());
       }
     }
-    return m_matching_files.GetSize() >= m_request.GetMaxNumberOfResultsToAdd()
+    return m_matching_files.GetSize() >= m_request.GetMaxNumberOfCompletionsToAdd()
                ? Searcher::eCallbackReturnStop
                : Searcher::eCallbackReturnContinue;
   }
@@ -232,7 +232,7 @@ class SymbolCompleter : public Completer {
 
       // Now add the functions & symbols to the list - only add if unique:
       for (const SymbolContext &sc : sc_list) {
-        if (m_match_set.size() >= m_request.GetMaxNumberOfResultsToAdd())
+        if (m_match_set.size() >= m_request.GetMaxNumberOfCompletionsToAdd())
           break;
 
         ConstString func_name = sc.GetFunctionName(Mangled::ePreferDemangled);
@@ -244,7 +244,7 @@ class SymbolCompleter : public Completer {
           m_match_set.insert(func_name);
       }
     }
-    return m_match_set.size() >= m_request.GetMaxNumberOfResultsToAdd()
+    return m_match_set.size() >= m_request.GetMaxNumberOfCompletionsToAdd()
                ? Searcher::eCallbackReturnStop
                : Searcher::eCallbackReturnContinue;
   }