Do not exit if client and server are the same process.

Author: mickaelistria

org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/LanguageServerApplication.java

@@ -23,7 +23,6 @@ public class LanguageServerApplication implements IApplication {
 
 	@Override
 	public Object start(IApplicationContext context) throws Exception {
-
 		JavaLanguageServerPlugin.startLanguageServer(this);
 		synchronized (waitLock) {
 			while (!shutdown) {
@@ -61,7 +60,7 @@ public void setParentProcessId(long pid) {
 	/**
 	 * @return the parentProcessId
 	 */
-	long getParentProcessId() {
+	public long getParentProcessId() {
 		return parentProcessId;
 	}
 }

org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/JDTLanguageServer.java

@@ -46,6 +46,7 @@
 import org.eclipse.jdt.ls.core.internal.JavaClientConnection.JavaLanguageClient;
 import org.eclipse.jdt.ls.core.internal.JavaLanguageServerPlugin;
 import org.eclipse.jdt.ls.core.internal.JobHelpers;
+import org.eclipse.jdt.ls.core.internal.LanguageServerApplication;
 import org.eclipse.jdt.ls.core.internal.LanguageServerWorkingCopyOwner;
 import org.eclipse.jdt.ls.core.internal.ServiceStatus;
 import org.eclipse.jdt.ls.core.internal.codemanipulation.GenerateGetterSetterOperation.AccessorField;
@@ -445,10 +446,13 @@ public CompletableFuture<Object> shutdown() {
 	@Override
 	public void exit() {
 		logInfo(">> exit");
-		Executors.newSingleThreadScheduledExecutor().schedule(() -> {
-			logInfo("Forcing exit after 1 min.");
-			System.exit(FORCED_EXIT_CODE);
-		}, 1, TimeUnit.MINUTES);
+		LanguageServerApplication application = JavaLanguageServerPlugin.getLanguageServer();
+		if (application != null && application.getParentProcessId() != ProcessHandle.current().pid()) {
+			Executors.newSingleThreadScheduledExecutor().schedule(() -> {
+				logInfo("Forcing exit after 1 min.");
+				System.exit(FORCED_EXIT_CODE);
+			}, 1, TimeUnit.MINUTES);
+		}
 		if (!shutdownReceived) {
 			shutdownJob.schedule();
 		}