Skip to content

Commit

Permalink
Fix build on Windows
Browse files Browse the repository at this point in the history 
Signed-off-by: Snjezana Peco <[email protected]>
  • Loading branch information
@snjeza
snjeza committed Apr 23, 2019
1 parent b45e5b9 commit d8aceee
Show file tree
Hide file tree
Showing 6 changed files with 105 additions and 37 deletions.
36 changes: 25 additions & 11 deletions org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/JavaLanguageServerPlugin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,7 @@ private void startConnection() throws IOException {
Launcher<JavaLanguageClient> launcher;
ExecutorService executorService = Executors.newCachedThreadPool();
protocol = new JDTLanguageServer(projectsManager, preferenceManager);
Function<MessageConsumer, MessageConsumer> wrapper = getWrapper();
if (JDTEnvironmentUtils.inSocketStreamDebugMode()) {
String host = JDTEnvironmentUtils.getClientHost();
Integer port = JDTEnvironmentUtils.getClientPort();
Expand All @@ -288,27 +289,39 @@ private void startConnection() throws IOException {
AsynchronousSocketChannel socketChannel = serverSocket.accept().get();
InputStream in = Channels.newInputStream(socketChannel);
OutputStream out = Channels.newOutputStream(socketChannel);
Function<MessageConsumer, MessageConsumer> messageConsumer = it -> it;
launcher = Launcher.createIoLauncher(protocol, JavaLanguageClient.class, in, out, executorService, messageConsumer);
launcher = Launcher.createIoLauncher(protocol, JavaLanguageClient.class, in, out, executorService, wrapper);
} catch (InterruptedException | ExecutionException e) {
throw new RuntimeException("Error when opening a socket channel at " + host + ":" + port + ".", e);
}
} else {
ConnectionStreamFactory connectionFactory = new ConnectionStreamFactory();
InputStream in = connectionFactory.getInputStream();
OutputStream out = connectionFactory.getOutputStream();
Function<MessageConsumer, MessageConsumer> wrapper;
if ("false".equals(System.getProperty("watchParentProcess"))) {
wrapper = it -> it;
} else {
wrapper = new ParentProcessWatcher(this.languageServer);
}
launcher = Launcher.createLauncher(protocol, JavaLanguageClient.class, in, out, executorService, wrapper);
}
protocol.connectClient(launcher.getRemoteProxy());
launcher.startListening();
}

private Function<MessageConsumer, MessageConsumer> getWrapper() {
Function<MessageConsumer, MessageConsumer> wrapper;
int pollDelaySecs = ParentProcessWatcher.POLL_DELAY_SECS;
String watchParentProcess = System.getProperty("watchParentProcess");
if (watchParentProcess != null) {
try {
pollDelaySecs = Integer.parseInt(watchParentProcess);
} catch (Exception e) {
logException(e.getMessage(), e);
}
}
if (pollDelaySecs <= 0) {
wrapper = it -> it;
} else {
wrapper = new ParentProcessWatcher(this.languageServer, pollDelaySecs);
}
return wrapper;
}

/*
* (non-Javadoc)
* @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
Expand Down Expand Up @@ -377,18 +390,18 @@ static void startLanguageServer(LanguageServer newLanguageServer) throws IOExcep
* @return
*/
public static ProjectsManager getProjectsManager() {
return pluginInstance.projectsManager;
return pluginInstance == null ? null : pluginInstance.projectsManager;
}

public static DigestStore getDigestStore() {
return pluginInstance.digestStore;
return pluginInstance == null ? null : pluginInstance.digestStore;
}

/**
* @return
*/
public static ContentProviderManager getContentProviderManager() {
return pluginInstance.contentProviderManager;
return pluginInstance == null ? null : pluginInstance.contentProviderManager;
}

/**
Expand Down Expand Up @@ -478,4 +491,5 @@ public static void setPreferencesManager(PreferenceManager preferenceManager) {
pluginInstance.preferenceManager = preferenceManager;
}
}

}
29 changes: 21 additions & 8 deletions org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/ParentProcessWatcher.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import java.util.function.Function;

import org.eclipse.core.runtime.Platform;
import org.eclipse.jdt.ls.core.internal.managers.ProjectsManager;
import org.eclipse.lsp4j.jsonrpc.MessageConsumer;

import com.google.common.io.Closeables;
Expand All @@ -30,23 +31,29 @@ public final class ParentProcessWatcher implements Runnable, Function<MessageCon

private static final long INACTIVITY_DELAY_SECS = 30 *1000;
private static final boolean isJava1x = System.getProperty("java.version").startsWith("1.");
private static final int POLL_DELAY_SECS = 10;
public static final int POLL_DELAY_SECS = 10;
private volatile long lastActivityTime;
private final LanguageServer server;
private ScheduledFuture<?> task;
private ScheduledExecutorService service;
private String command;

public ParentProcessWatcher(LanguageServer server ) {
this(server, POLL_DELAY_SECS);
}

public ParentProcessWatcher(LanguageServer server, int pollDelaySecs) {
this.server = server;
service = Executors.newScheduledThreadPool(1);
task = service.scheduleWithFixedDelay(this, POLL_DELAY_SECS, POLL_DELAY_SECS, TimeUnit.SECONDS);
task = service.scheduleWithFixedDelay(this, pollDelaySecs, pollDelaySecs, TimeUnit.SECONDS);
}

@Override
public void run() {
if (!parentProcessStillRunning()) {
JavaLanguageServerPlugin.logInfo("Parent process stopped running, forcing server exit");
task.cancel(true);
ProjectsManager.saveWorkspace();
server.exit();
}
}
Expand All @@ -63,12 +70,7 @@ private boolean parentProcessStillRunning() {
if (pid == 0 || lastActivityTime > (System.currentTimeMillis() - INACTIVITY_DELAY_SECS)) {
return true;
}
String command;
if (Platform.OS_WIN32.equals(Platform.getOS())) {
command = "cmd /c \"tasklist /FI \"PID eq " + pid + "\" | findstr " + pid + "\"";
} else {
command = "ps -p " + pid;
}
String command = getCommand(pid);
Process process = null;
boolean finished = false;
try {
Expand Down Expand Up @@ -113,6 +115,17 @@ private boolean parentProcessStillRunning() {
}
}

private String getCommand(long pid) {
if (command == null) {
if (Platform.OS_WIN32.equals(Platform.getOS())) {
command = "cmd /c \"tasklist /FI \"PID eq " + pid + "\" | findstr " + pid + "\"";
} else {
command = "ps -p " + pid;
}
}
return command;
}

@Override
public MessageConsumer apply(final MessageConsumer consumer) {
//inject our own consumer to refresh the timestamp
Expand Down
32 changes: 28 additions & 4 deletions org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/InitHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.SubMonitor;
import org.eclipse.core.runtime.jobs.IJobManager;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jdt.ls.core.internal.JSONUtility;
import org.eclipse.jdt.ls.core.internal.JavaClientConnection;
Expand Down Expand Up @@ -241,7 +242,6 @@ public IStatus runInWorkspace(IProgressMonitor monitor) {
connection.sendStatus(ServiceStatus.Starting, "Init...");
SubMonitor subMonitor = SubMonitor.convert(monitor, 100);
try {
projectsManager.setAutoBuilding(false);
projectsManager.initializeProjects(roots, subMonitor);
projectsManager.setAutoBuilding(preferenceManager.getPreferences().isAutobuildEnabled());
JavaLanguageServerPlugin.logInfo("Workspace initialized in " + (System.currentTimeMillis() - start) + "ms");
Expand All @@ -264,9 +264,33 @@ public boolean belongsTo(Object family) {
}

};
job.setPriority(Job.BUILD);
job.setRule(ResourcesPlugin.getWorkspace().getRoot());
job.schedule();
Job refresh = new Job("Refreshing...") {

@Override
protected IStatus run(IProgressMonitor monitor) {
IJobManager jobManager = Job.getJobManager();
try {
jobManager.join(ResourcesPlugin.FAMILY_AUTO_REFRESH, monitor);
jobManager.join(ResourcesPlugin.FAMILY_MANUAL_BUILD, monitor);
jobManager.join(ResourcesPlugin.FAMILY_AUTO_BUILD, monitor);
} catch (OperationCanceledException | InterruptedException e) {
JavaLanguageServerPlugin.logException(e.getMessage(), e);
}
job.setPriority(Job.BUILD);
job.setRule(ResourcesPlugin.getWorkspace().getRoot());
job.schedule();
return Status.OK_STATUS;
}

/* (non-Javadoc)
* @see org.eclipse.core.runtime.jobs.Job#belongsTo(java.lang.Object)
*/
@Override
public boolean belongsTo(Object family) {
return JAVA_LS_INITIALIZATION_JOBS.equals(family);
}
};
refresh.schedule();
}

private Map<?, ?> getInitializationOptions(InitializeParams params) {
Expand Down
32 changes: 20 additions & 12 deletions org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/JDTLanguageServer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -236,14 +236,18 @@ public void initialized(InitializedParams params) {
public IStatus run(IProgressMonitor monitor) {
try {
IJobManager jobManager = Job.getJobManager();
jobManager.join(ResourcesPlugin.FAMILY_MANUAL_BUILD, null);
jobManager.join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
jobManager.join(ResourcesPlugin.FAMILY_MANUAL_BUILD, monitor);
jobManager.join(ResourcesPlugin.FAMILY_AUTO_BUILD, monitor);
logInfo(">> build jobs finished");
if (JavaLanguageServerPlugin.getInstance() == null) {
return Status.CANCEL_STATUS;
}
workspaceDiagnosticsHandler = new WorkspaceDiagnosticsHandler(JDTLanguageServer.this.client, pm);
workspaceDiagnosticsHandler.publishDiagnostics(monitor);
workspaceDiagnosticsHandler.addResourceChangeListener();
pm.registerWatchers();
logInfo(">> watchers registered");
ProjectsManager.saveWorkspace();
} catch (OperationCanceledException | InterruptedException | CoreException e) {
logException(e.getMessage(), e);
return Status.CANCEL_STATUS;
Expand Down Expand Up @@ -313,26 +317,30 @@ private CodeActionOptions getCodeActionOptions() {
public CompletableFuture<Object> shutdown() {
logInfo(">> shutdown");
return computeAsync((monitor) -> {
try {
JavaRuntime.removeVMInstallChangedListener(jvmConfigurator);
if (workspaceDiagnosticsHandler != null) {
workspaceDiagnosticsHandler.removeResourceChangeListener();
workspaceDiagnosticsHandler = null;
}
ResourcesPlugin.getWorkspace().save(true, monitor);
} catch (CoreException e) {
logException(e.getMessage(), e);
}
removeListeners();
ProjectsManager.saveWorkspace();
return new Object();
});
}

private void removeListeners() {
if (jvmConfigurator != null) {
JavaRuntime.removeVMInstallChangedListener(jvmConfigurator);
jvmConfigurator = null;
}
if (workspaceDiagnosticsHandler != null) {
workspaceDiagnosticsHandler.removeResourceChangeListener();
workspaceDiagnosticsHandler = null;
}
}

/* (non-Javadoc)
* @see org.eclipse.lsp4j.services.LanguageServer#exit()
*/
@Override
public void exit() {
logInfo(">> exit");
removeListeners();
JavaLanguageServerPlugin.getLanguageServer().exit();
Executors.newSingleThreadScheduledExecutor().schedule(() -> {
logInfo("Forcing exit after 1 min.");
Expand Down
2 changes: 0 additions & 2 deletions ...lipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/managers/MavenProjectImporter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@

import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.resources.WorkspaceJob;
Expand Down Expand Up @@ -174,7 +173,6 @@ private void updateProjects(Collection<IProject> projects, long lastWorkspaceSta
while (iterator.hasNext()) {
IProject project = iterator.next();
project.open(monitor);
project.refreshLocal(IResource.DEPTH_INFINITE, monitor);
if (!needsMavenUpdate(project, lastWorkspaceStateSaved)) {
iterator.remove();
}
Expand Down
11 changes: 11 additions & 0 deletions org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/managers/ProjectsManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -657,4 +657,15 @@ public File findFile(String formatterUrl) {
return null;
}

public static void saveWorkspace() {
try {
JavaLanguageServerPlugin.logInfo("Saving workspace");
long start = System.currentTimeMillis();
ResourcesPlugin.getWorkspace().save(true, null);
JavaLanguageServerPlugin.logInfo("Workspace saved. Took " + (System.currentTimeMillis() - start) + " ms");
} catch (CoreException e) {
JavaLanguageServerPlugin.logException(e.getMessage(), e);
}
}

}

0 comments on commit d8aceee

Please sign in to comment.