Skip to content

Only report build failure when the build errors are on the running project's classpath #459

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Jinbo Wang (testforstephen) merged 1 commit into from
Nov 21, 2022
Merged

Only report build failure when the build errors are on the running project's classpath #459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
145 changes: 145 additions & 0 deletions ...oft.java.debug.plugin/src/main/java/com/microsoft/java/debug/plugin/internal/Compile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,145 @@
/*******************************************************************************
* Copyright (c) 2022 Microsoft Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* Microsoft Corporation - initial API and implementation
*******************************************************************************/

package com.microsoft.java.debug.plugin.internal;

import java.util.ArrayList;
import java.util.List;
import java.util.logging.Logger;

import org.apache.commons.lang3.StringUtils;
import org.eclipse.core.resources.IMarker;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.resources.IncrementalProjectBuilder;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.ls.core.internal.BuildWorkspaceStatus;
import org.eclipse.jdt.ls.core.internal.JavaLanguageServerPlugin;
import org.eclipse.jdt.ls.core.internal.ProjectUtils;
import org.eclipse.jdt.ls.core.internal.ResourceUtils;
import org.eclipse.jdt.ls.core.internal.managers.ProjectsManager;

import com.microsoft.java.debug.core.Configuration;

public class Compile {
private static final Logger logger = Logger.getLogger(Configuration.LOGGER_NAME);

public static BuildWorkspaceStatus compile(CompileParams params, IProgressMonitor monitor) {
try {
if (monitor.isCanceled()) {
return BuildWorkspaceStatus.CANCELLED;
}

long compileAt = System.currentTimeMillis();
if (params != null && params.isFullBuild()) {
ResourcesPlugin.getWorkspace().build(IncrementalProjectBuilder.CLEAN_BUILD, monitor);
ResourcesPlugin.getWorkspace().build(IncrementalProjectBuilder.FULL_BUILD, monitor);
} else {
ResourcesPlugin.getWorkspace().build(IncrementalProjectBuilder.INCREMENTAL_BUILD, monitor);
}
logger.info("Time cost for ECJ: " + (System.currentTimeMillis() - compileAt) + "ms");

IProject mainProject = params == null ? null : ProjectUtils.getProject(params.getProjectName());
IResource currentResource = mainProject;
if (isUnmanagedFolder(mainProject) && StringUtils.isNotBlank(params.getMainClass())) {
IType mainType = ProjectUtils.getJavaProject(mainProject).findType(params.getMainClass());
if (mainType != null && mainType.getResource() != null) {
currentResource = mainType.getResource();
}
}

List<IMarker> problemMarkers = new ArrayList<>();
if (currentResource != null) {
List<IMarker> markers = ResourceUtils.getErrorMarkers(currentResource);
if (markers != null) {
problemMarkers.addAll(markers);
}

// Check if the referenced projects contain compilation errors.
if (currentResource instanceof IProject && ProjectUtils.isJavaProject((IProject) currentResource)) {
IJavaProject currentJavaProject = ProjectUtils.getJavaProject((IProject) currentResource);
IJavaProject[] javaProjects = ProjectUtils.getJavaProjects();
for (IJavaProject otherJavaProject : javaProjects) {
IProject other = otherJavaProject.getProject();
if (!other.equals(getDefaultProject()) && !other.equals((IProject) currentResource)
&& currentJavaProject.isOnClasspath(otherJavaProject)) {
markers = ResourceUtils.getErrorMarkers(other);
if (markers != null) {
problemMarkers.addAll(markers);
}
}
}
}
} else {
IJavaProject[] javaProjects = ProjectUtils.getJavaProjects();
for (IJavaProject javaProject : javaProjects) {
IProject project = javaProject.getProject();
if (!project.equals(getDefaultProject())) {
List<IMarker> markers = ResourceUtils.getErrorMarkers(project);
if (markers != null) {
problemMarkers.addAll(markers);
}
}
}
}

if (problemMarkers.isEmpty()) {
return BuildWorkspaceStatus.SUCCEED;
}

return BuildWorkspaceStatus.WITH_ERROR;
} catch (CoreException e) {
JavaLanguageServerPlugin.logException("Failed to build workspace.", e);
return BuildWorkspaceStatus.FAILED;
} catch (OperationCanceledException e) {
return BuildWorkspaceStatus.CANCELLED;
}
}

private static boolean isUnmanagedFolder(IProject project) {
return project != null && ProjectUtils.isUnmanagedFolder(project)
&& ProjectUtils.isJavaProject(project);
}

private static IProject getDefaultProject() {
return getWorkspaceRoot().getProject(ProjectsManager.DEFAULT_PROJECT_NAME);
}

private static IWorkspaceRoot getWorkspaceRoot() {
return ResourcesPlugin.getWorkspace().getRoot();
}

class CompileParams {
String projectName;
String mainClass;
boolean isFullBuild = false;

public String getMainClass() {
return mainClass;
}

public boolean isFullBuild() {
return isFullBuild;
}

public String getProjectName() {
return projectName;
}
}
}
10 changes: 7 additions & 3 deletions ...c/main/java/com/microsoft/java/debug/plugin/internal/JavaDebugDelegateCommandHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2017-2019 Microsoft Corporation and others.
* Copyright (c) 2017-2022 Microsoft Corporation and others.
* 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
Expand Down Expand Up @@ -64,8 +64,12 @@ public Object executeCommand(String commandId, List<Object> arguments, IProgress
ResolveMainClassHandler resolveMainClassHandler = new ResolveMainClassHandler();
return resolveMainClassHandler.resolveMainClass(arguments);
case BUILD_WORKSPACE:
// TODO
break;
Compile.CompileParams params = null;
if (arguments != null && !arguments.isEmpty()) {
params = JsonUtils.fromJson((String) arguments.get(0), Compile.CompileParams.class);
}

return Compile.compile(params, progress);
case FETCH_USER_DATA:
return UsageDataStore.getInstance().fetchAll();
case UPDATE_DEBUG_SETTINGS:
Expand Down