Skip to content

Commit 5587b67

Browse files
yyonchoyyoncho
committed
Migrate to lsp.el
1 parent 83c64a4 commit 5587b67

File tree

4 files changed

+103
-228
lines changed

4 files changed

+103
-228
lines changed

‎README.md‎

Lines changed: 12 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ Minimal configuration with [company-lsp](https://github.com/tigersoldier/company
4949
5050
(condition-case nil
5151
(require 'use-package)
52-
(add-to-list 'package-archives '("melpa" . "http://melpa.org/packages/"))
5352
(file-error
5453
(require 'package)
5554
(add-to-list 'package-archives '("melpa" . "http://melpa.org/packages/"))
@@ -58,61 +57,25 @@ Minimal configuration with [company-lsp](https://github.com/tigersoldier/company
5857
(package-install 'use-package)
5958
(require 'use-package)))
6059
61-
(use-package projectile
62-
:ensure t)
63-
64-
(use-package treemacs
65-
:ensure t)
66-
67-
(use-package yasnippet
68-
:ensure t
69-
:config
70-
(yas-global-mode))
71-
72-
(use-package lsp-mode
73-
:ensure t
74-
:init (setq lsp-eldoc-render-all nil
75-
lsp-highlight-symbol-at-point nil))
76-
77-
(use-package hydra
78-
:ensure t)
79-
80-
(use-package company-lsp
81-
:after company
82-
:ensure t
83-
:config
84-
(setq company-lsp-cache-candidates t
85-
company-lsp-async t))
86-
87-
(use-package lsp-ui
88-
:ensure t
89-
:config
90-
(setq lsp-ui-sideline-update-mode 'point))
91-
92-
(use-package lsp-java
93-
:ensure t
94-
:config
95-
(add-hook 'java-mode-hook
96-
(lambda ()
97-
(setq-local company-backends (list 'company-lsp))))
98-
99-
(add-hook 'java-mode-hook 'lsp-java-enable)
100-
(add-hook 'java-mode-hook 'flycheck-mode)
101-
(add-hook 'java-mode-hook 'company-mode)
102-
(add-hook 'java-mode-hook 'lsp-ui-mode))
60+
(use-package projectile :ensure t)
61+
(use-package treemacs :ensure t)
62+
(use-package yasnippet :ensure t)
63+
(use-package lsp-mode :ensure t)
64+
(use-package hydra :ensure t)
65+
(use-package company-lsp :ensure t)
66+
(use-package lsp-ui :ensure t)
67+
(use-package lsp-java :ensure t :after lsp
68+
:config (add-hook 'java-mode-hook 'lsp))
10369
10470
(use-package dap-mode
105-
:ensure t
106-
:after lsp-mode
71+
:ensure t :after lsp-mode
10772
:config
10873
(dap-mode t)
10974
(dap-ui-mode t))
11075
111-
(use-package dap-java
112-
:after (lsp-java))
76+
(use-package dap-java :after (lsp-java))
77+
(use-package lsp-java-treemacs :after (treemacs))
11378
114-
(use-package lsp-java-treemacs
115-
:after (treemacs))
11679
```
11780
## Supported commands
11881
### LSP Mode commands

‎features/step-definitions/lsp-java-steps.el‎

Lines changed: 52 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -40,20 +40,20 @@
4040
(message "The function failed, attempt %s" retry-count)))))))
4141

4242
(Given "^I have maven project \"\\([^\"]+\\)\" in \"\\([^\"]+\\)\"$"
43-
(lambda (project-name dir-name)
44-
(setq default-directory lsp-java-test-root)
43+
(lambda (project-name dir-name)
44+
(setq default-directory lsp-java-test-root)
4545

46-
;; delete old directory
47-
(when (file-exists-p dir-name)
48-
(delete-directory dir-name t))
46+
;; delete old directory
47+
(when (file-exists-p dir-name)
48+
(delete-directory dir-name t))
4949

50-
;; create directory structure
51-
(mkdir (expand-file-name
52-
(f-join dir-name project-name "src" "main" "java" "temp")) t)
50+
;; create directory structure
51+
(mkdir (expand-file-name
52+
(f-join dir-name project-name "src" "main" "java" "temp")) t)
5353

54-
;; add pom.xml
55-
(with-temp-file (expand-file-name "pom.xml" (f-join dir-name project-name))
56-
(insert "
54+
;; add pom.xml
55+
(with-temp-file (expand-file-name "pom.xml" (f-join dir-name project-name))
56+
(insert "
5757
<project xmlns=\"http://maven.apache.org/POM/4.0.0\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"
5858
xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd\">
5959
<modelVersion>4.0.0</modelVersion>
@@ -71,64 +71,63 @@
7171
</project>"))))
7272

7373
(And "^I have a java file \"\\([^\"]+\\)\"$"
74-
(lambda (file-name)
75-
(setq default-directory lsp-java-test-root)
76-
(find-file file-name)
77-
(save-buffer)))
74+
(lambda (file-name)
75+
(setq default-directory lsp-java-test-root)
76+
(find-file file-name)
77+
(save-buffer)))
7878

7979
(And "^I add project \"\\([^\"]+\\)\" folder \"\\([^\"]+\\)\" to the list of workspace folders$"
80-
(lambda (project dir-name)
81-
(mkdir lsp-java-workspace-dir t)
82-
(lsp--persist (f-join lsp-java-workspace-dir ".folders")
83-
(list (f-join lsp-java-test-root dir-name project)))))
80+
(lambda (project dir-name)
81+
(mkdir lsp-java-workspace-dir t)
82+
(lsp--persist (f-join lsp-java-workspace-dir ".folders")
83+
(list (f-join lsp-java-test-root dir-name project)))))
8484

8585
(And "^I start lsp-java$"
86-
(lambda ()
87-
(lsp-java-enable)))
86+
(lambda () (lsp)))
8887

8988
(Then "^The server status must become \"\\([^\"]+\\)\"$"
90-
(lambda (status callback)
91-
(lsp-java-steps-async-wait
92-
(lambda ()
93-
(if (s-equals? (s-trim (lsp-mode-line)) status)
94-
t
95-
(progn
96-
(message "Server status is %s" (lsp-mode-line))
97-
nil)))
98-
callback)))
89+
(lambda (status callback)
90+
(lsp-java-steps-async-wait
91+
(lambda ()
92+
(if (s-equals? (s-trim (lsp-mode-line)) status)
93+
t
94+
(progn
95+
(message "Server status is %s" (lsp-mode-line))
96+
nil)))
97+
callback)))
9998

10099
(And "^I use formatter profile \"\\([^\"]+\\)\" from \"\\([^\"]+\\)\"$"
101-
(lambda (formatter-name formatter-file)
102-
(setq lsp-java-format-settings-url (lsp--path-to-uri
103-
(f-join lsp-java-root-path "features/fixtures" formatter-file)))
104-
(setq lsp-java-format-settings-profile formatter-name)))
100+
(lambda (formatter-name formatter-file)
101+
(setq lsp-java-format-settings-url (lsp--path-to-uri
102+
(f-join lsp-java-root-path "features/fixtures" formatter-file)))
103+
(setq lsp-java-format-settings-profile formatter-name)))
105104

106105
(And "^There must be \"\\([^\"]+\\)\" actionable notification$"
107-
(lambda (count callback)
108-
(lsp-java-steps-async-wait
109-
(lambda ()
110-
(= (string-to-number count)
111-
(hash-table-count (lsp-workspace-get-metadata "actionable-notifications"))))
112-
callback)))
106+
(lambda (count callback)
107+
(lsp-java-steps-async-wait
108+
(lambda ()
109+
(= (string-to-number count)
110+
(hash-table-count (lsp-workspace-get-metadata "actionable-notifications"))))
111+
callback)))
113112

114113
(When "^I indent buffer$"
115-
(lambda ()
116-
(indent-region (point-min) (point-marker))))
114+
(lambda ()
115+
(indent-region (point-min) (point-marker))))
117116

118117
(When "^I invoke \"\\([^\"]+\\)\" I should see error message \"\\([^\"]+\\)\"$"
119-
(lambda (command message)
120-
(condition-case err
121-
(funcall (intern command))
122-
(error (cl-assert (string= message (error-message-string err)) t (error-message-string err))))))
118+
(lambda (command message)
119+
(condition-case err
120+
(funcall (intern command))
121+
(error (cl-assert (string= message (error-message-string err)) t (error-message-string err))))))
123122

124123
(When "^I call \"\\([^\"]+\\)\" and see:$"
125-
(lambda (command text callback)
126-
(lsp-java-steps-async-wait
127-
(lambda ()
128-
(save-window-excursion
129-
(funcall (intern command))
130-
(s-contains? text (buffer-string) t)))
131-
callback)))
124+
(lambda (command text callback)
125+
(lsp-java-steps-async-wait
126+
(lambda ()
127+
(save-window-excursion
128+
(funcall (intern command))
129+
(s-contains? text (buffer-string) t)))
130+
callback)))
132131

133132
(provide 'lsp-java-steps)
134133
;;; lsp-java-steps.el ends here

‎features/support/env.el‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@
2424
(let ((load-prefer-newer t))
2525
(require 'espuds)
2626
(require 'ert)
27-
(require 'lsp-java)
28-
(require 'lsp-mode))
27+
(require 'lsp-java))
2928

3029
(Setup
3130
(lsp-java-update-server))

0 commit comments

Comments
 (0)