If table is a function, only passthrough if its result is non-nil (#4684

)

* If table is a function, only passthrough if its result is non-nil

* Let non-empty hash tables pass through as well

lsp-completion.el

@@ -850,9 +850,19 @@ The return is nil or in range of (0, inf)."
   "Disable LSP completion support."
   (lsp-completion-mode -1))
 
-(defun lsp-completion-passthrough-try-completion (string table _pred point)
-  "Passthrough try function, always return the passed STRING and POINT."
-  (when table
+(defun lsp-completion-passthrough-try-completion (string table pred point)
+  "Passthrough try function.
+
+If TABLE is a function, it is called with STRING, PRED and nil to get
+the candidates, otherwise it is treated as the candidates.
+
+If the candidates is non-empty, return the passed STRING and POINT."
+  (when (pcase table
+          ((pred functionp)
+           (funcall table string pred nil))
+          ((pred hash-table-p)
+           (not (hash-table-empty-p table)))
+          (_ table))
     (cons string point)))
 
 (defun lsp-completion-passthrough-all-completions (_string table pred _point)