Implemented code lenses support in lsp-mode #595

yyoncho · 2019-01-14T19:50:23Z

Fixes #361

The lenses support is similar to what VScode has:

Lenses are displayed above the line
Lenses on the same line are grouped and displayed above the first text item.
Extension could register custom lences provider and add custom lenses, e. g.
JDT LS has extensions that display the tests hints.
The placement code was adapter from https://github.com/cpitclaudel/quick-peek

Tested against CCLS and JDT LS. CCLS has to register the proper handler(similar
to what ccls vscode extension does). Some other servers like rls do clain that
they support lenses but I was unable to trigger them.

Further improvements:

Provide different methods for redering methods (e. g. in the end of the line)
Keyboard support for the lenses
Test more servers

MaskRay · 2019-01-18T02:41:38Z

lsp-mode.el

+
+(defun lsp--lenses-display (lenses)
+  "Show LENSES."
+  (let ((overlays (->> lenses


Some new lines here to reduce indentation?

Restructured the code + deleted one variable which wasn't used.

MaskRay · 2019-01-18T02:42:40Z

lsp-mode.el

  "Face used for highlighting symbols being written to."
  :group 'lsp-faces)

+(defcustom lsp-lenses-check-interval 0.1


Singular form may be good enough... codeLens is in its singular form.

Make sense, will change it everywhere.

MaskRay · 2019-01-18T02:44:18Z

lsp-mode.el

+  "Delete all lenses."
+  (interactive)
+  (let ((scroll-preserve-screen-position t))
+    (-each lsp--lenses-overlays 'delete-overlay)


Builtin mapc suffices.. No need for -each

MaskRay · 2019-01-18T02:47:12Z

lsp-mode.el

+      (goto-char (overlay-start ov))
+      (overlay-put ov
+                   'before-string
+                   (format "%s%s\n"


MaskRay · 2019-01-18T02:49:24Z

lsp-mode.el

+  "Create iddle function for buffer BUFFER."
+  (when (or (not buffer) (eq (current-buffer) buffer))
+    (cond
+     ((not (equal (buffer-modified-tick) lsp--lenses-modified-tick))


For numbers, which is more common, = or eql?

will change it to =

yyoncho · 2019-01-18T13:21:42Z

Addressed comments

MaskRay · 2019-01-18T14:17:17Z

lsp-mode.el

+(defvar-local lsp--lens-idle-timer  nil
+  "Pair of points which holds the last window location the lenses were loaded.")
+
+(defvar-local lsp--lences-data nil


lsp--lens-data

MaskRay · 2019-01-18T14:27:25Z

Typo in description. clain -> claim

"was adapter" > "adapted"

... CCLS can be referred in its lower case form..

MaskRay · 2019-01-18T15:11:43Z

lsp-mode.el

+  (or (car (cl-remove-if-not (lambda (ov) (lsp--lens-overlay-matches-pos ov pos)) lsp--lens-overlays))
+      (let* ((ov (save-excursion
+                   (goto-char pos)
+                   (make-overlay (point-at-bol) (1+ (point-at-eol))))))


Set front-advance but unset rear-advance

Can you elaborate?

(make-overlay (point-at-bol) (1+ (point-at-eol) nil 'front-advance)

Oh, this does not matter if the overlay is on its own line. It matters when the overlay is on the same line of the text.

MaskRay · 2019-01-18T16:06:28Z

lsp-mode.el

+  "Create iddle function for buffer BUFFER."
+  (when (or (not buffer) (eq (current-buffer) buffer))
+    (cond
+     ((not (eq (buffer-modified-tick) lsp--lens-modified-tick))


MaskRay · 2019-01-18T16:06:47Z

lsp-mode.el

+    (puthash "pending" t it)
+    (lsp-request-async "codeLens/resolve" it
+                       (lambda (lens)
+                         (when (equal tick (buffer-modified-tick))


MaskRay · 2019-01-18T16:06:57Z

lsp-mode.el

+          (lsp-request-async "textDocument/codeLens"
+                             `(:textDocument (:uri ,(lsp--path-to-uri buffer-file-name)))
+                             (lambda (lenses)
+                               (when (equal tick (buffer-modified-tick))


MaskRay · 2019-01-18T16:09:42Z

lsp-mode.el

+  (-some-> lsp--lens-refresh-timer cancel-timer)
+
+  (setq-local lsp--lens-modified-tick (buffer-modified-tick))
+  (setq-local lsp--lens-page (list (window-start) (window-end)))


cons? And line 1013

MaskRay · 2019-01-18T16:26:53Z

lsp-mode.el

+                                  it
+                                (lsp-request "codeLens/resolve" it)))
+                       lsp--lens-display)))
+    (--each lsp--lens-overlays


The (--each ...) is redundant

yes, copy/paste mistake, the only thing that is needed is the code in the let statement.

MaskRay · 2019-01-18T16:27:29Z

lsp-mode.el

+    (--each lsp--lens-overlays
+      (unless (-contains? overlays it)
+        (delete-overlay it)))
+    (setq-local lsp--lens-overlays overlays)))


setq-local is also redundant

yyoncho · 2019-01-18T17:21:19Z

Addressed everything except "Set front-advance but unset rear-advance" which is not clear to me.

MaskRay · 2019-01-19T06:05:37Z

lsp-mode.el

+`buffer-modified-tick' at the time of receiving the updates the
+updates must be discarted..
+CALLBACK - the callback for the lenses."
+  (--each (-filter 'lsp--lens-backend-not-loaded? lenses)


MaskRay · 2019-01-19T06:05:50Z

lsp-mode.el

+                         (when (= tick (buffer-modified-tick))
+                           (remhash "pending" it)
+                           (puthash "command" (gethash "command" lens) it)
+                           (when (-all? 'lsp--lens-backend-present?  lenses)


MaskRay · 2019-01-19T06:09:15Z

lsp-mode.el

+       (< pos (overlay-end ov))))
+
+(defun lsp--lens-idle-function (&optional buffer)
+  "Create iddle function for buffer BUFFER."


typo. idle

Fixes emacs-lsp#361 The lenses support is similar to what VScode has: - Lenses are displayed above the line - Lenses on the same line are grouped and displayed above the first text item. - Extension could register custom lences provider and add custom lenses, e. g. JDT LS has extensions that display the tests hints. - The placement code was adapted from https://github.com/cpitclaudel/quick-peek Tested against CCLS and JDT LS. CCLS has to register the proper handler(similar to what ccls vscode extension does). Some other servers like rls do claim that they support lenses but I was unable to trigger them. Further improvements: * Provide different methods for redering methods (e. g. in the end of the line) * Keyboard support for the lenses * Test more servers

yyoncho force-pushed the lens branch from 46a71ae to 4b95c4a Compare January 17, 2019 09:34

MaskRay reviewed Jan 18, 2019

View reviewed changes

yyoncho force-pushed the lens branch 2 times, most recently from cec57ff to b5b7cfd Compare January 18, 2019 13:21

MaskRay reviewed Jan 18, 2019

View reviewed changes

yyoncho force-pushed the lens branch 3 times, most recently from 988ebf7 to 3447600 Compare January 18, 2019 17:18

MaskRay approved these changes Jan 19, 2019

View reviewed changes

MaskRay reviewed Jan 19, 2019

View reviewed changes

yyoncho force-pushed the lens branch from 3447600 to 82526c6 Compare January 19, 2019 07:14

yyoncho merged commit d4c4e10 into emacs-lsp:master Jan 19, 2019

Uh oh!

Implemented code lenses support in lsp-mode #595

Implemented code lenses support in lsp-mode #595

Uh oh!

Conversation

yyoncho commented Jan 14, 2019

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

yyoncho commented Jan 18, 2019

Uh oh!

Choose a reason for hiding this comment

Uh oh!

MaskRay commented Jan 18, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

MaskRay Jan 18, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

yyoncho commented Jan 18, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

MaskRay commented Jan 18, 2019 •

edited

Loading

MaskRay Jan 18, 2019 •

edited

Loading

yyoncho commented Jan 18, 2019 •

edited

Loading