Index: source/Commands/CommandObjectExpression.h
===================================================================
--- source/Commands/CommandObjectExpression.h
+++ source/Commands/CommandObjectExpression.h
@@ -62,6 +62,8 @@
 
   Options *GetOptions() override;
 
+  int HandleArgumentCompletion(CompletionRequest &request, OptionElementVector &opt_element_vector) override;
+
 protected:
   //------------------------------------------------------------------
   // IOHandler::Delegate functions
@@ -80,6 +82,8 @@
 
   void GetMultilineExpression();
 
+    bool WantsRawCommandString() override { return false; }
+
   OptionGroupOptions m_option_group;
   OptionGroupFormat m_format_options;
   OptionGroupValueObjectDisplay m_varobj_options;
Index: source/Commands/CommandObjectExpression.cpp
===================================================================
--- source/Commands/CommandObjectExpression.cpp
+++ source/Commands/CommandObjectExpression.cpp
@@ -307,6 +307,16 @@
 
 Options *CommandObjectExpression::GetOptions() { return &m_option_group; }
 
+int CommandObjectExpression::HandleArgumentCompletion(CompletionRequest &request,
+                                                      OptionElementVector &opt_element_vector)   {
+  CommandCompletions::InvokeCommonCompletionCallbacks(
+          GetCommandInterpreter(),
+          CommandCompletions::eVariablePathCompletion | CommandCompletions::eSymbolCompletion,
+          request,
+          nullptr);
+  return request.GetNumberOfMatches();
+}
+
 static lldb_private::Status
 CanBeUsedForElementCountPrinting(ValueObject &valobj) {
   CompilerType type(valobj.GetCompilerType());