Skip to content

Commit 6ec1bc5

Browse files
authored
fix: Allow glob-pattern from hash-table (#4427)
1 parent 57d08cd commit 6ec1bc5

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

lsp-mode.el

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2880,8 +2880,13 @@ and end-of-string meta-characters."
28802880

28812881
(defun lsp-glob-to-regexps (glob-pattern)
28822882
"Convert a GLOB-PATTERN to a list of Elisp regexps."
2883-
(let* ((trimmed-pattern (string-trim glob-pattern))
2884-
(top-level-unbraced-patterns (lsp-glob-unbrace-at-top-level trimmed-pattern)))
2883+
(when-let*
2884+
((glob-pattern (cond ((hash-table-p glob-pattern)
2885+
(ht-get glob-pattern "pattern"))
2886+
((stringp glob-pattern) glob-pattern)
2887+
(t (error "Unknown glob-pattern type: %s" glob-pattern))))
2888+
(trimmed-pattern (string-trim glob-pattern))
2889+
(top-level-unbraced-patterns (lsp-glob-unbrace-at-top-level trimmed-pattern)))
28852890
(seq-map #'lsp-glob-convert-to-wrapped-regexp
28862891
top-level-unbraced-patterns)))
28872892

0 commit comments

Comments
 (0)