File tree Expand file tree Collapse file tree 3 files changed +7
-6
lines changed Expand file tree Collapse file tree 3 files changed +7
-6
lines changed Original file line number Diff line number Diff line change @@ -2997,11 +2997,11 @@ and end-of-string meta-characters."
2997
2997
(defun lsp-glob-to-regexps (glob-pattern)
2998
2998
"Convert a GLOB-PATTERN to a list of Elisp regexps."
2999
2999
(when-let*
3000
- ((glob-pattern (cond ((hash-table-p glob-pattern)
3001
- (ht-get glob-pattern "pattern") )
3002
- ((stringp glob- pattern) glob- pattern)
3003
- (t (error "Unknown glob-pattern type: %s" glob-pattern))))
3004
- (trimmed-pattern (string-trim glob-pattern ))
3000
+ ((glob (pcase glob-pattern
3001
+ ((pred stringp) glob-pattern)
3002
+ ((lsp-interface RelativePattern :base-uri : pattern) (format "%s%s" base-uri pattern) )
3003
+ (_ (error "Unknown glob-pattern type: %s" glob-pattern))))
3004
+ (trimmed-pattern (string-trim glob))
3005
3005
(top-level-unbraced-patterns (lsp-glob-unbrace-at-top-level trimmed-pattern)))
3006
3006
(seq-map #'lsp-glob-convert-to-wrapped-regexp
3007
3007
top-level-unbraced-patterns)))
Original file line number Diff line number Diff line change @@ -828,6 +828,7 @@ See `-let' for a description of the destructuring mechanism."
828
828
(WillSaveTextDocumentParams (:reason :textDocument ) nil )
829
829
(WorkspaceSymbolParams (:query ) nil )
830
830
; ; 3.17
831
+ (RelativePattern (:baseUri :pattern ) nil )
831
832
(LabelDetails nil (:detail :description ))
832
833
(InlayHint (:label :position ) (:kind :paddingLeft :paddingRight ))
833
834
(InlayHintLabelPart (:value ) (:tooltip :location :command ))
Original file line number Diff line number Diff line change 1737
1737
"type" : " string"
1738
1738
}
1739
1739
},
1740
- "required" : [" uri" " name" ]
1740
+ "required" : [" uri" , " name" ]
1741
1741
},
1742
1742
"WorkspaceFoldersChangeEvent" : {
1743
1743
"type" : " object" ,
You can’t perform that action at this time.
0 commit comments