Skip to content

Commit 3eee982

Browse files
yyonchoyyoncho
committed
Cleanup fix flycheck errors
1 parent 96d5779 commit 3eee982

File tree

2 files changed

+161
-158
lines changed

2 files changed

+161
-158
lines changed

‎install/pom.xml

Lines changed: 155 additions & 154 deletions
Original file line numberDiff line numberDiff line change
@@ -1,156 +1,157 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4-
<modelVersion>4.0.0</modelVersion>
5-
<groupId>lsp-java</groupId>
6-
<artifactId>lsp-java</artifactId>
7-
<version>1.0.0-SNAPSHOT</version>
8-
<properties>
9-
<root.install.dir>${user.home}/.emacs.d/eclipse.jdt.ls</root.install.dir>
10-
</properties>
11-
<packaging>pom</packaging>
12-
<repositories>
13-
<repository>
14-
<releases>
15-
<enabled>true</enabled>
16-
</releases>
17-
<snapshots>
18-
<enabled>true</enabled>
19-
</snapshots>
20-
<id>codenvy-public-repo</id>
21-
<name>codenvy public</name>
22-
<url>https://maven.codenvycorp.com/content/groups/public/</url>
23-
</repository>
24-
</repositories>
25-
<build>
26-
<plugins>
27-
<plugin>
28-
<groupId>com.googlecode.maven-download-plugin</groupId>
29-
<artifactId>download-maven-plugin</artifactId>
30-
<version>1.3.0</version>
31-
<executions>
32-
<execution>
33-
<phase>process-resources</phase>
34-
<id>download-che</id>
35-
<goals>
36-
<goal>wget</goal>
37-
</goals>
38-
<configuration>
39-
<url>${jdt.download.url}</url>
40-
<outputFileName>jdt-language-server-latest.tar.gz</outputFileName>
41-
<skipCache>true</skipCache>
42-
<outputDirectory>${project.build.directory}</outputDirectory>
43-
</configuration>
44-
</execution>
45-
<execution>
46-
<phase>process-resources</phase>
47-
<id>download-vscode</id>
48-
<goals>
49-
<goal>wget</goal>
50-
</goals>
51-
<configuration>
52-
<url>https://github.com/emacs-lsp/lsp-java/releases/download/2.2/Pivotal.vscode-spring-boot-1.6.0.vsix</url>
53-
<outputFileName>vscode-extension.zip</outputFileName>
54-
<outputDirectory>${project.build.directory}</outputDirectory>
55-
</configuration>
56-
</execution>
57-
</executions>
58-
</plugin>
59-
<plugin>
60-
<groupId>org.apache.maven.plugins</groupId>
61-
<artifactId>maven-antrun-plugin</artifactId>
62-
<version>1.6</version>
63-
<executions>
64-
<execution>
65-
<id>prepare</id>
66-
<phase>process-resources</phase>
67-
<configuration>
68-
<tasks>
69-
<untar src="${project.build.directory}/jdt-language-server-latest.tar.gz" compression="gzip" dest="${jdt.js.server.root}"/>
70-
<unzip src="${project.build.directory}/vscode-extension.zip" dest="${project.build.directory}/vscode-extension-extracted"/>
71-
</tasks>
72-
</configuration>
73-
<goals>
74-
<goal>run</goal>
75-
</goals>
76-
</execution>
77-
</executions>
78-
</plugin>
79-
<plugin>
80-
<groupId>org.apache.maven.plugins</groupId>
81-
<artifactId>maven-dependency-plugin</artifactId>
82-
<version>3.1.1</version>
83-
<executions>
84-
<execution>
85-
<id>copy</id>
86-
<phase>package</phase>
87-
<goals>
88-
<goal>copy</goal>
89-
</goals>
90-
<configuration>
91-
<artifactItems>
92-
<artifactItem>
93-
<groupId>com.microsoft.java</groupId>
94-
<artifactId>com.microsoft.java.debug.plugin</artifactId>
95-
<version>0.11.0</version>
96-
<outputDirectory>${java.debug.root}</outputDirectory>
97-
<destFileName>java.debug.plugin.jar</destFileName>
98-
</artifactItem>
99-
<artifactItem>
100-
<groupId>org.junit.platform</groupId>
101-
<artifactId>junit-platform-console-standalone</artifactId>
102-
<version>1.3.0-M1</version>
103-
<outputDirectory>${junit.runner.root}</outputDirectory>
104-
<destFileName>${junit.runner.fileName}</destFileName>
105-
</artifactItem>
106-
</artifactItems>
107-
</configuration>
108-
</execution>
109-
</executions>
110-
</plugin>
111-
<plugin>
112-
<artifactId>maven-resources-plugin</artifactId>
113-
<version>3.1.0</version>
114-
<executions>
115-
<execution>
116-
<id>copy-boot-server</id>
117-
<phase>package</phase>
118-
<goals>
119-
<goal>copy-resources</goal>
120-
</goals>
121-
<configuration>
122-
<outputDirectory>${jdt.js.server.root}/boot-server/</outputDirectory>
123-
<resources>
124-
<resource>
125-
<directory>${project.build.directory}/vscode-extension-extracted/extension/jars/</directory>
126-
<includes>
127-
<include>spring-boot-language-server-*.jar</include>
128-
</includes>
129-
</resource>
130-
</resources>
131-
</configuration>
132-
</execution>
133-
<execution>
134-
<id>copy-bundles</id>
135-
<phase>package</phase>
136-
<goals>
137-
<goal>copy-resources</goal>
138-
</goals>
139-
<configuration>
140-
<outputDirectory>${jdt.js.server.root}/bundles/</outputDirectory>
141-
<resources>
142-
<resource>
143-
<directory>${project.build.directory}/vscode-extension-extracted/extension/jars/</directory>
144-
<includes>
145-
<include>jdt-ls-extension.jar</include>
146-
<include>jdt-ls-commons.jar</include>
147-
</includes>
148-
</resource>
149-
</resources>
150-
</configuration>
151-
</execution>
152-
</executions>
153-
</plugin>
154-
</plugins>
155-
</build>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<groupId>lsp-java</groupId>
5+
<artifactId>lsp-java</artifactId>
6+
<version>1.0.0-SNAPSHOT</version>
7+
<properties>
8+
<root.install.dir>${user.home}/.emacs.d/eclipse.jdt.ls</root.install.dir>
9+
</properties>
10+
<packaging>pom</packaging>
11+
<repositories>
12+
<repository>
13+
<releases>
14+
<enabled>true</enabled>
15+
</releases>
16+
<snapshots>
17+
<enabled>true</enabled>
18+
</snapshots>
19+
<id>codenvy-public-repo</id>
20+
<name>codenvy public</name>
21+
<url>https://maven.codenvycorp.com/content/groups/public/</url>
22+
</repository>
23+
</repositories>
24+
<build>
25+
<plugins>
26+
<plugin>
27+
<groupId>com.googlecode.maven-download-plugin</groupId>
28+
<artifactId>download-maven-plugin</artifactId>
29+
<version>1.3.0</version>
30+
<executions>
31+
<execution>
32+
<phase>process-resources</phase>
33+
<id>download-che</id>
34+
<goals>
35+
<goal>wget</goal>
36+
</goals>
37+
<configuration>
38+
<url>${jdt.download.url}</url>
39+
<outputFileName>jdt-language-server-latest.tar.gz</outputFileName>
40+
<skipCache>true</skipCache>
41+
<outputDirectory>${project.build.directory}</outputDirectory>
42+
</configuration>
43+
</execution>
44+
<execution>
45+
<phase>process-resources</phase>
46+
<id>download-vscode</id>
47+
<goals>
48+
<goal>wget</goal>
49+
</goals>
50+
<configuration>
51+
<url>https://github.com/emacs-lsp/lsp-java/releases/download/2.2/Pivotal.vscode-spring-boot-1.6.0.vsix</url>
52+
<outputFileName>vscode-extension.zip</outputFileName>
53+
<outputDirectory>${project.build.directory}</outputDirectory>
54+
</configuration>
55+
</execution>
56+
</executions>
57+
</plugin>
58+
<plugin>
59+
<groupId>org.apache.maven.plugins</groupId>
60+
<artifactId>maven-antrun-plugin</artifactId>
61+
<version>1.6</version>
62+
<executions>
63+
<execution>
64+
<id>prepare</id>
65+
<phase>process-resources</phase>
66+
<configuration>
67+
<tasks>
68+
<untar src="${project.build.directory}/jdt-language-server-latest.tar.gz" compression="gzip" dest="${jdt.js.server.root}" />
69+
<unzip src="${project.build.directory}/vscode-extension.zip" dest="${project.build.directory}/vscode-extension-extracted" />
70+
</tasks>
71+
</configuration>
72+
<goals>
73+
<goal>run</goal>
74+
</goals>
75+
</execution>
76+
</executions>
77+
</plugin>
78+
<plugin>
79+
<groupId>org.apache.maven.plugins</groupId>
80+
<artifactId>maven-dependency-plugin</artifactId>
81+
<version>3.1.1</version>
82+
<executions>
83+
<execution>
84+
<id>copy</id>
85+
<phase>package</phase>
86+
<goals>
87+
<goal>copy</goal>
88+
</goals>
89+
<configuration>
90+
<artifactItems>
91+
<artifactItem>
92+
<groupId>com.microsoft.java</groupId>
93+
<artifactId>com.microsoft.java.debug.plugin</artifactId>
94+
<version>0.11.0</version>
95+
<outputDirectory>${java.debug.root}</outputDirectory>
96+
<destFileName>java.debug.plugin.jar</destFileName>
97+
</artifactItem>
98+
<artifactItem>
99+
<groupId>org.junit.platform</groupId>
100+
<artifactId>junit-platform-console-standalone</artifactId>
101+
<version>1.3.0-M1</version>
102+
<outputDirectory>${junit.runner.root}</outputDirectory>
103+
<destFileName>${junit.runner.fileName}</destFileName>
104+
</artifactItem>
105+
</artifactItems>
106+
</configuration>
107+
</execution>
108+
</executions>
109+
</plugin>
110+
<plugin>
111+
<artifactId>maven-resources-plugin</artifactId>
112+
<version>3.1.0</version>
113+
<executions>
114+
<execution>
115+
<id>copy-boot-server</id>
116+
<phase>package</phase>
117+
<goals>
118+
<goal>copy-resources</goal>
119+
</goals>
120+
<configuration>
121+
<outputDirectory>${jdt.js.server.root}/boot-server/</outputDirectory>
122+
<resources>
123+
<resource>
124+
<directory>${project.build.directory}/vscode-extension-extracted/extension/jars/</directory>
125+
<includes>
126+
<include>spring-boot-language-server-*.jar</include>
127+
</includes>
128+
</resource>
129+
</resources>
130+
</configuration>
131+
</execution>
132+
<execution>
133+
<id>copy-bundles</id>
134+
<phase>package</phase>
135+
<goals>
136+
<goal>copy-resources</goal>
137+
</goals>
138+
<configuration>
139+
<outputDirectory>${jdt.js.server.root}/bundles/</outputDirectory>
140+
<resources>
141+
<resource>
142+
<directory>${project.build.directory}/vscode-extension-extracted/extension/jars/</directory>
143+
<includes>
144+
<include>jdt-ls-extension.jar</include>
145+
<include>jdt-ls-commons.jar</include>
146+
<include>org.reactivestreams.reactive-streams.jar</include>
147+
<include>io.projectreactor.reactor-core.jar</include>
148+
</includes>
149+
</resource>
150+
</resources>
151+
</configuration>
152+
</execution>
153+
</executions>
154+
</plugin>
155+
</plugins>
156+
</build>
156157
</project>

‎lsp-java-boot.el

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
;; Keywords: java
55
;; URL: https://github.com/emacs-lsp/lsp-java
66

7+
;; Package-Requires: ((emacs "25.1") (lsp-mode "6.0") (markdown-mode "2.3") (dash "2.14.1") (f "0.20.0") (ht "2.0") (dash-functional "1.2.0") (request "0.3.0"))
8+
79
;; This program is free software: you can redistribute it and/or modify
810
;; it under the terms of the GNU General Public License as published by
911
;; the Free Software Foundation, either version 3 of the License, or
@@ -46,7 +48,7 @@
4648
(error "Please configure either JAVA_HOME or lsp-java-boot-java-tools-jar"))
4749
tools-jar))
4850

49-
(defun lsp-java--sts-javadoc-hover-link (_workspace params)
51+
(defun lsp-java-boot--sts-javadoc-hover-link (_workspace params)
5052
"Handler for java doc hover."
5153
(with-lsp-workspace (lsp-find-workspace 'jdtls nil)
5254
(lsp-request "workspace/executeCommand"
@@ -89,7 +91,7 @@ Store CALLBACK to use it `sts/highlight'."
8991
(goto-char (lsp--position-to-point (first params)))
9092
(lsp-describe-thing-at-point))
9193

92-
(defun lsp-java-boot--sts/hightlight (workspace params)
94+
(defun lsp-java-boot--sts-hightlight (workspace params)
9395
"WORKSPACE PARAMS."
9496
(with-lsp-workspace workspace
9597
(-let (((&hash "doc" (&hash "uri" "version") "codeLenses" code-lenses) params))
@@ -129,8 +131,8 @@ Store CALLBACK to use it `sts/highlight'."
129131
(memq major-mode '(java-mode conf-javaprop-mode yaml-mode))
130132
(lsp-java-boot--server-jar)))
131133
:request-handlers (ht ("sts/addClasspathListener" #'lsp-java-boot--sts-add-classpath-listener)
132-
("sts/javadocHoverLink" #'lsp-java--sts-javadoc-hover-link))
133-
:notification-handlers (ht ("sts/highlight" #'lsp-java-boot--sts/hightlight)
134+
("sts/javadocHoverLink" #'lsp-java-boot--sts-javadoc-hover-link))
135+
:notification-handlers (ht ("sts/highlight" #'lsp-java-boot--sts-hightlight)
134136
("sts/progress" #'ignore))
135137
:initialized-fn (lambda (workspace)
136138
(puthash

0 commit comments

Comments
 (0)