Skip to content

Only build main project for build server project #503

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
jdneo merged 2 commits into from
Aug 4, 2023
Merged

Only build main project for build server project #503

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2d0ce0
Only build main project for build server project
jdneo Aug 1, 2023
8b9991d
Add a dedicated error code for build server
jdneo Aug 4, 2023
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
45 changes: 43 additions & 2 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
Expand Up @@ -18,9 +18,11 @@
import java.util.logging.Logger;

import org.apache.commons.lang3.StringUtils;
import org.eclipse.core.resources.IBuildConfiguration;
import org.eclipse.core.resources.IMarker;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IResourceStatus;
import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.resources.IncrementalProjectBuilder;
import org.eclipse.core.resources.ResourcesPlugin;
Expand All @@ -40,7 +42,42 @@
public class Compile {
private static final Logger logger = Logger.getLogger(Configuration.LOGGER_NAME);

public static BuildWorkspaceStatus compile(CompileParams params, IProgressMonitor monitor) {
private static final int GRADLE_BS_COMPILATION_ERROR = 100;

public static Object compile(CompileParams params, IProgressMonitor monitor) {
IProject mainProject = params == null ? null : ProjectUtils.getProject(params.getProjectName());
if (mainProject == null) {
try {
// Q: is infer project by main class name necessary? perf impact?
List<IJavaProject> javaProjects = ResolveClasspathsHandler.getJavaProjectFromType(params.getMainClass());
if (javaProjects.size() == 1) {
mainProject = javaProjects.get(0).getProject();
}
} catch (CoreException e) {
JavaLanguageServerPlugin.logException("Failed to resolve project from main class name.", e);
}
}

if (isBspProject(mainProject)) {
// Just need to trigger a build for the target project, the Gradle build server will
// handle the build dependencies for us.
try {
ResourcesPlugin.getWorkspace().build(
new IBuildConfiguration[]{mainProject.getActiveBuildConfig()},
IncrementalProjectBuilder.INCREMENTAL_BUILD,
false /*buildReference*/,
monitor
);
} catch (CoreException e) {
if (e.getStatus().getCode() == IResourceStatus.BUILD_FAILED) {
return GRADLE_BS_COMPILATION_ERROR;
} else {
return BuildWorkspaceStatus.FAILED;
}
}
return BuildWorkspaceStatus.SUCCEED;
}

try {
if (monitor.isCanceled()) {
return BuildWorkspaceStatus.CANCELLED;
Expand All @@ -55,7 +92,6 @@ public static BuildWorkspaceStatus compile(CompileParams params, IProgressMonito
}
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());
Expand Down Expand Up @@ -117,6 +153,11 @@ private static boolean isUnmanagedFolder(IProject project) {
&& ProjectUtils.isJavaProject(project);
}

private static boolean isBspProject(IProject project) {
return project != null && ProjectUtils.isJavaProject(project)
&& ProjectUtils.hasNature(project, "com.microsoft.gradle.bs.importer.GradleBuildServerProjectNature");
}

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