Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PT #165890357: Adopt exploded LS jar for all eclipse LSs

Browse Source
This commit is contained in:
BoykoAlex
2019-05-10 13:51:06 -04:00
parent e1c3124e65
commit c29b1043f8
15 changed files with 175 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
eclipse-language-servers/org.springframework.tooling.concourse.ls/pom.xml
View File

@@ -36,10 +36,10 @@
<version>2.10</version>
<executions>
<execution>
<id>copy</id>
<id>unpack-server</id>
<phase>prepare-package</phase>
<goals>
<goal>copy</goal>
<goal>unpack</goal>
</goals>
<configuration>
<artifactItems>
@@ -49,11 +49,11 @@
<version>${project.version}</version>
<classifier>exec</classifier>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/../servers</outputDirectory>
</artifactItem>
</artifactItems>
<overWriteReleases>true</overWriteReleases>
<overWriteSnapshots>true</overWriteSnapshots>
<outputDirectory>${project.build.directory}/../servers/concourse-language-server</outputDirectory>
</configuration>
</execution>
@@ -79,6 +79,17 @@
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<version>3.1.0</version>
<configuration>
<filesets>
<fileset>
<directory>servers</directory>
</fileset>
</filesets>
</configuration>
</plugin>
</plugins>
</build>

26
eclipse-language-servers/org.springframework.tooling.concourse.ls/src/org/springframework/tooling/concourse/ls/ConcourseLanguageServer.java
View File

@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2016, 2017 Pivotal, Inc.
* Copyright (c) 2016, 2019 Pivotal, Inc.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -12,10 +12,10 @@ package org.springframework.tooling.concourse.ls;
import static org.springframework.tooling.ls.eclipse.commons.preferences.LanguageServerConsolePreferenceConstants.CONCOURSE_SERVER;
import org.springframework.tooling.ls.eclipse.commons.JRE;
import org.springframework.tooling.ls.eclipse.commons.STS4LanguageServerProcessStreamConnector;
import java.nio.file.Paths;
import java.util.Arrays;
import com.google.common.collect.ImmutableList;
import org.springframework.tooling.ls.eclipse.commons.STS4LanguageServerProcessStreamConnector;
/**
* @author Martin Lippert
@@ -24,12 +24,18 @@ public class ConcourseLanguageServer extends STS4LanguageServerProcessStreamConn
public ConcourseLanguageServer() {
super(CONCOURSE_SERVER);
setCommands(JRE.currentJRE().jarLaunchCommand(getLanguageServerJARLocation(), ImmutableList.of(
//"-Xdebug",
//"-agentlib:jdwp=transport=dt_socket,address=8899,server=y,suspend=n",
"-Dlsp.lazy.completions.disable=true",
"-Dlsp.completions.indentation.enable=true"
)));
initExplodedJarCommand(
Paths.get("servers", "concourse-language-server"),
"org.springframework.ide.vscode.concourse.ConcourseLanguageServerBootApp",
"application.properties",
Arrays.asList(
"-Dlsp.lazy.completions.disable=true",
"-Dlsp.completions.indentation.enable=true",
"-noverify"
)
);
setWorkingDirectory(getWorkingDirLocation());
}