@@ -832,7 +832,7 @@ name (e.g. `data' variable passed as `data' parameter)."
832
832
(defun lsp-javascript--update-inlay-hints (start end )
833
833
(if (lsp-javascript-initialized?)
834
834
(lsp-request-async
835
- " typescript/inlayHints "
835
+ " textDocument/inlayHint "
836
836
(lsp-make-javascript-inlay-hints-params
837
837
:text-document (lsp--text-document-identifier)
838
838
:range (lsp-make-range :start
@@ -841,24 +841,18 @@ name (e.g. `data' variable passed as `data' parameter)."
841
841
(lsp-point-to-position end)))
842
842
(lambda (res )
843
843
(lsp--remove-overlays 'lsp-javascript-inlay-hint )
844
- (let ((hints (lsp-get res :inlayHints )))
845
- (unless (seq-empty-p hints)
846
- (overlay-recenter
847
- (-let* (([hint] hints)
848
- ((&javascript:InlayHint :position ) hint))
849
- (lsp--position-to-point position))))
850
- (-each hints
851
- (lambda (hint )
852
- (-let* (((&javascript:InlayHint :text :position :kind :whitespace-before? :whitespace-after? ) hint)
853
- (pos (lsp--position-to-point position))
854
- (overlay (make-overlay pos pos nil 'front-advance 'end-advance )))
855
- (overlay-put overlay 'lsp-javascript-inlay-hint t )
856
- (overlay-put overlay 'before-string
857
- (format " %s%s%s "
858
- (if (and whitespace-before? (not (string= kind lsp/javascript-inlay-hint-kind-type-hint))) " " " " )
859
- (propertize (lsp-javascript-format-inlay text kind)
860
- 'font-lock-face (lsp-javascript-face-for-inlay kind))
861
- (if whitespace-after? " " " " ))))))))
844
+ (dolist (hint res)
845
+ (-let* (((&javascript:InlayHint :label :position :kind :padding-left? :padding-right? ) hint)
846
+ (pos (lsp--position-to-point position))
847
+ (overlay (make-overlay pos pos nil 'front-advance 'end-advance )))
848
+ (when (stringp label)
849
+ (overlay-put overlay 'lsp-javascript-inlay-hint t )
850
+ (overlay-put overlay 'before-string
851
+ (format " %s%s%s "
852
+ (if padding-left? " " " " )
853
+ (propertize (lsp-javascript-format-inlay label kind)
854
+ 'font-lock-face (lsp-javascript-face-for-inlay kind))
855
+ (if padding-right? " " " " )))))))
862
856
:mode 'tick )))
863
857
864
858
(defun lsp-javascript-column-at-pos (pos )
0 commit comments