GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — Support HCR for gradle build server projects (#555) · snjeza/java-debug@3657243

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

com.microsoft.java.debug.plugin/src/main/java/com/microsoft/java/debug/plugin/internal

Expand file treeCollapse file tree

Open diff view settings

Collapse file

`‎com.microsoft.java.debug.plugin/src/main/java/com/microsoft/java/debug/plugin/internal/Compile.java‎`

Copy file name to clipboardExpand all lines: com.microsoft.java.debug.plugin/src/main/java/com/microsoft/java/debug/plugin/internal/Compile.java

+41-37Lines changed: 41 additions & 37 deletions

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`package com.microsoft.java.debug.plugin.internal;`
`15`	`15`
`16`	`16`	`import java.util.ArrayList;`
	`17`	`+import java.util.LinkedList;`
`17`	`18`	`import java.util.List;`
`18`	`19`	`import java.util.logging.Logger;`
`19`	`20`
`@@ -28,14 +29,16 @@`
`28`	`29`	`import org.eclipse.core.resources.ResourcesPlugin;`
`29`	`30`	`import org.eclipse.core.runtime.CoreException;`
`30`	`31`	`import org.eclipse.core.runtime.IProgressMonitor;`
`31`		`-import org.eclipse.core.runtime.OperationCanceledException;`
`32`	`32`	`import org.eclipse.jdt.core.IJavaProject;`
`33`	`33`	`import org.eclipse.jdt.core.IType;`
`34`	`34`	`import org.eclipse.jdt.ls.core.internal.BuildWorkspaceStatus;`
`35`	`35`	`import org.eclipse.jdt.ls.core.internal.JavaLanguageServerPlugin;`
`36`	`36`	`import org.eclipse.jdt.ls.core.internal.ProjectUtils;`
`37`	`37`	`import org.eclipse.jdt.ls.core.internal.ResourceUtils;`
	`38`	`+import org.eclipse.jdt.ls.core.internal.handlers.BuildWorkspaceHandler;`
`38`	`39`	`import org.eclipse.jdt.ls.core.internal.managers.ProjectsManager;`
	`40`	`+import org.eclipse.lsp4j.TextDocumentIdentifier;`
	`41`	`+import org.eclipse.lsp4j.extended.ProjectBuildParams;`
`39`	`42`
`40`	`43`	`import com.microsoft.java.debug.core.Configuration;`
`41`	`44`
`@@ -45,20 +48,12 @@ public class Compile {`
`45`	`48`	`private static final int GRADLE_BS_COMPILATION_ERROR = 100;`
`46`	`49`
`47`	`50`	`public static Object compile(CompileParams params, IProgressMonitor monitor) {`
`48`		`- IProject mainProject = params == null ? null : ProjectUtils.getProject(params.getProjectName());`
`49`		`- if (mainProject == null) {`
`50`		`- try {`
`51`		`- // Q: is infer project by main class name necessary? perf impact?`
`52`		`- List<IJavaProject> javaProjects = ResolveClasspathsHandler.getJavaProjectFromType(params.getMainClass());`
`53`		`- if (javaProjects.size() == 1) {`
`54`		`- mainProject = javaProjects.get(0).getProject();`
`55`		`- }`
`56`		`- } catch (CoreException e) {`
`57`		`- JavaLanguageServerPlugin.logException("Failed to resolve project from main class name.", e);`
`58`		`- }`
	`51`	`+ if (params == null) {`
	`52`	`+ throw new IllegalArgumentException("The compile parameters should not be null.");`
`59`	`53`	`}`
`60`	`54`
`61`		`- if (isBspProject(mainProject) && !ProjectUtils.isGradleProject(mainProject)) {`
	`55`	`+ IProject mainProject = JdtUtils.getMainProject(params.getProjectName(), params.getMainClass());`
	`56`	`+ if (JdtUtils.isBspProject(mainProject) && !ProjectUtils.isGradleProject(mainProject)) {`
`62`	`57`	`// Just need to trigger a build for the target project, the Gradle build server will`
`63`	`58`	`// handle the build dependencies for us.`
`64`	`59`	`try {`
`@@ -78,20 +73,37 @@ public static Object compile(CompileParams params, IProgressMonitor monitor) {`
`78`	`73`	`return BuildWorkspaceStatus.SUCCEED;`
`79`	`74`	`}`
`80`	`75`
`81`		`- try {`
`82`		`- if (monitor.isCanceled()) {`
`83`		`- return BuildWorkspaceStatus.CANCELLED;`
`84`		`- }`
	`76`	`+ if (monitor.isCanceled()) {`
	`77`	`+ return BuildWorkspaceStatus.CANCELLED;`
	`78`	`+ }`
`85`	`79`
`86`		`- long compileAt = System.currentTimeMillis();`
`87`		`- if (params != null && params.isFullBuild()) {`
`88`		`- ResourcesPlugin.getWorkspace().build(IncrementalProjectBuilder.CLEAN_BUILD, monitor);`
`89`		`- ResourcesPlugin.getWorkspace().build(IncrementalProjectBuilder.FULL_BUILD, monitor);`
`90`		`- } else {`
`91`		`- ResourcesPlugin.getWorkspace().build(IncrementalProjectBuilder.INCREMENTAL_BUILD, monitor);`
	`80`	`+ ProjectBuildParams buildParams = new ProjectBuildParams();`
	`81`	`+ List<TextDocumentIdentifier> identifiers = new LinkedList<>();`
	`82`	`+ buildParams.setFullBuild(params.isFullBuild);`
	`83`	`+ for (IJavaProject javaProject : ProjectUtils.getJavaProjects()) {`
	`84`	`+ if (ProjectsManager.getDefaultProject().equals(javaProject.getProject())) {`
	`85`	`+ continue;`
`92`	`86`	`}`
`93`		`- logger.info("Time cost for ECJ: " + (System.currentTimeMillis() - compileAt) + "ms");`
	`87`	`+ // we only build project which is not a BSP project, in case that the compile request is triggered by`
	`88`	`+ // HCR with auto-build disabled, the build for BSP projects will be triggered by JavaHotCodeReplaceProvider.`
	`89`	`+ if (!JdtUtils.isBspProject(javaProject.getProject())) {`
	`90`	`+ identifiers.add(new TextDocumentIdentifier(javaProject.getProject().getLocationURI().toString()));`
	`91`	`+ }`
	`92`	`+ }`
	`93`	`+ if (identifiers.size() == 0) {`
	`94`	`+ return BuildWorkspaceStatus.SUCCEED;`
	`95`	`+ }`
`94`	`96`
	`97`	`+ buildParams.setIdentifiers(identifiers);`
	`98`	`+ long compileAt = System.currentTimeMillis();`
	`99`	`+ BuildWorkspaceHandler buildWorkspaceHandler = new BuildWorkspaceHandler(JavaLanguageServerPlugin.getProjectsManager());`
	`100`	`+ BuildWorkspaceStatus status = buildWorkspaceHandler.buildProjects(buildParams, monitor);`
	`101`	`+ logger.info("Time cost for ECJ: " + (System.currentTimeMillis() - compileAt) + "ms");`
	`102`	`+ if (status == BuildWorkspaceStatus.FAILED \|\| status == BuildWorkspaceStatus.CANCELLED) {`
	`103`	`+ return status;`
	`104`	`+ }`
	`105`	`+`
	`106`	`+ try {`
`95`	`107`	`IResource currentResource = mainProject;`
`96`	`108`	`if (isUnmanagedFolder(mainProject) && StringUtils.isNotBlank(params.getMainClass())) {`
`97`	`109`	`IType mainType = ProjectUtils.getJavaProject(mainProject).findType(params.getMainClass());`
`@@ -135,29 +147,21 @@ public static Object compile(CompileParams params, IProgressMonitor monitor) {`
`135`	`147`	`}`
`136`	`148`	`}`
`137`	`149`
`138`		`- if (problemMarkers.isEmpty()) {`
`139`		`- return BuildWorkspaceStatus.SUCCEED;`
	`150`	`+ if (!problemMarkers.isEmpty()) {`
	`151`	`+ return BuildWorkspaceStatus.WITH_ERROR;`
`140`	`152`	`}`
`141`		`-`
`142`		`- return BuildWorkspaceStatus.WITH_ERROR;`
`143`	`153`	`} catch (CoreException e) {`
`144`		`- JavaLanguageServerPlugin.logException("Failed to build workspace.", e);`
`145`		`- return BuildWorkspaceStatus.FAILED;`
`146`		`- } catch (OperationCanceledException e) {`
`147`		`- return BuildWorkspaceStatus.CANCELLED;`
	`154`	`+ JavaLanguageServerPlugin.log(e);`
`148`	`155`	`}`
	`156`	`+`
	`157`	`+ return BuildWorkspaceStatus.SUCCEED;`
`149`	`158`	`}`
`150`	`159`
`151`	`160`	`private static boolean isUnmanagedFolder(IProject project) {`
`152`	`161`	`return project != null && ProjectUtils.isUnmanagedFolder(project)`
`153`	`162`	`&& ProjectUtils.isJavaProject(project);`
`154`	`163`	`}`
`155`	`164`
`156`		`- private static boolean isBspProject(IProject project) {`
`157`		`- return project != null && ProjectUtils.isJavaProject(project)`
`158`		`- && ProjectUtils.hasNature(project, "com.microsoft.gradle.bs.importer.GradleBuildServerProjectNature");`
`159`		`- }`
`160`		`-`
`161`	`165`	`private static IProject getDefaultProject() {`
`162`	`166`	`return getWorkspaceRoot().getProject(ProjectsManager.DEFAULT_PROJECT_NAME);`
`163`	`167`	`}`

Collapse file

`‎com.microsoft.java.debug.plugin/src/main/java/com/microsoft/java/debug/plugin/internal/JavaHotCodeReplaceProvider.java‎`

Copy file name to clipboardExpand all lines: com.microsoft.java.debug.plugin/src/main/java/com/microsoft/java/debug/plugin/internal/JavaHotCodeReplaceProvider.java

+45Lines changed: 45 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -34,16 +34,20 @@`
`34`	`34`	`import java.util.logging.Level;`
`35`	`35`	`import java.util.logging.Logger;`
`36`	`36`
	`37`	`+import org.eclipse.core.resources.IBuildConfiguration;`
`37`	`38`	`import org.eclipse.core.resources.IFile;`
`38`	`39`	`import org.eclipse.core.resources.IMarker;`
	`40`	`+import org.eclipse.core.resources.IProject;`
`39`	`41`	`import org.eclipse.core.resources.IResource;`
`40`	`42`	`import org.eclipse.core.resources.IResourceChangeEvent;`
`41`	`43`	`import org.eclipse.core.resources.IResourceChangeListener;`
`42`	`44`	`import org.eclipse.core.resources.IResourceDelta;`
`43`	`45`	`import org.eclipse.core.resources.IResourceDeltaVisitor;`
	`46`	`+import org.eclipse.core.resources.IncrementalProjectBuilder;`
`44`	`47`	`import org.eclipse.core.resources.ResourcesPlugin;`
`45`	`48`	`import org.eclipse.core.runtime.CoreException;`
`46`	`49`	`import org.eclipse.core.runtime.IPath;`
	`50`	`+import org.eclipse.core.runtime.NullProgressMonitor;`
`47`	`51`	`import org.eclipse.core.runtime.Path;`
`48`	`52`	`import org.eclipse.jdt.core.ICompilationUnit;`
`49`	`53`	`import org.eclipse.jdt.core.IJavaElement;`
`@@ -55,6 +59,7 @@`
`55`	`59`	`import org.eclipse.jdt.core.util.ISourceAttribute;`
`56`	`60`	`import org.eclipse.jdt.internal.core.util.Util;`
`57`	`61`	`import org.eclipse.jdt.ls.core.internal.JobHelpers;`
	`62`	`+import org.eclipse.jdt.ls.core.internal.ProjectUtils;`
`58`	`63`
`59`	`64`	`import com.microsoft.java.debug.core.Configuration;`
`60`	`65`	`import com.microsoft.java.debug.core.DebugException;`
`@@ -63,6 +68,7 @@`
`63`	`68`	`import com.microsoft.java.debug.core.IDebugSession;`
`64`	`69`	`import com.microsoft.java.debug.core.StackFrameUtility;`
`65`	`70`	`import com.microsoft.java.debug.core.adapter.AdapterUtils;`
	`71`	`+import com.microsoft.java.debug.core.adapter.Constants;`
`66`	`72`	`import com.microsoft.java.debug.core.adapter.ErrorCode;`
`67`	`73`	`import com.microsoft.java.debug.core.adapter.HotCodeReplaceEvent;`
`68`	`74`	`import com.microsoft.java.debug.core.adapter.IDebugAdapterContext;`
`@@ -104,6 +110,8 @@ public class JavaHotCodeReplaceProvider implements IHotCodeReplaceProvider, IRes`
`104`	`110`
`105`	`111`	`private List<String> deltaClassNames = new ArrayList<>();`
`106`	`112`
	`113`	`+ private String mainProjectName = "";`
	`114`	`+`
`107`	`115`	`/**`
`108`	`116`	`* Visitor for resource deltas.`
`109`	`117`	`*/`
`@@ -269,6 +277,7 @@ public void initialize(IDebugAdapterContext context, Map<String, Object> options`
`269`	`277`	`}`
`270`	`278`	`this.context = context;`
`271`	`279`	`currentDebugSession = context.getDebugSession();`
	`280`	`+ this.mainProjectName = ((String) options.get(Constants.PROJECT_NAME));`
`272`	`281`	`}`
`273`	`282`
`274`	`283`	`@Override`
`@@ -319,6 +328,7 @@ public void onClassRedefined(Consumer<List<String>> consumer) {`
`319`	`328`
`320`	`329`	`@Override`
`321`	`330`	`public CompletableFuture<List<String>> redefineClasses() {`
	`331`	`+ triggerBuildForBspProject();`
`322`	`332`	`JobHelpers.waitForBuildJobs(10 * 1000);`
`323`	`333`	`return CompletableFuture.supplyAsync(() -> {`
`324`	`334`	`List<String> classNames = new ArrayList<>();`
`@@ -737,4 +747,39 @@ private List<StackFrame> getStackFrames(ThreadReference thread, boolean refresh)`
`737`	`747`	`}`
`738`	`748`	`});`
`739`	`749`	`}`
	`750`	`+`
	`751`	`+ /**`
	`752`	`+ * Trigger build separately if the main project is a BSP project.`
	`753`	`+ * This is because auto build for BSP project will not update the class files to disk.`
	`754`	`+ */`
	`755`	`+ private void triggerBuildForBspProject() {`
	`756`	`+ // check if the workspace contains BSP project first. This is for performance consideration.`
	`757`	`+ // Due to that getJavaProjectFromType() is a heavy operation.`
	`758`	`+ if (!containsBspProjects()) {`
	`759`	`+ return;`
	`760`	`+ }`
	`761`	`+`
	`762`	`+ IProject mainProject = JdtUtils.getMainProject(this.mainProjectName, context.getMainClass());`
	`763`	`+ if (mainProject != null && JdtUtils.isBspProject(mainProject)) {`
	`764`	`+ try {`
	`765`	`+ ResourcesPlugin.getWorkspace().build(`
	`766`	`+ new IBuildConfiguration[]{mainProject.getActiveBuildConfig()},`
	`767`	`+ IncrementalProjectBuilder.INCREMENTAL_BUILD,`
	`768`	`+ false /buildReference/,`
	`769`	`+ new NullProgressMonitor()`
	`770`	`+ );`
	`771`	`+ } catch (CoreException e) {`
	`772`	`+ // ignore compilation errors`
	`773`	`+ }`
	`774`	`+ }`
	`775`	`+ }`
	`776`	`+`
	`777`	`+ private boolean containsBspProjects() {`
	`778`	`+ for (IJavaProject javaProject : ProjectUtils.getJavaProjects()) {`
	`779`	`+ if (JdtUtils.isBspProject(javaProject.getProject())) {`
	`780`	`+ return true;`
	`781`	`+ }`
	`782`	`+ }`
	`783`	`+ return false;`
	`784`	`+ }`
`740`	`785`	`}`

Collapse file

`‎com.microsoft.java.debug.plugin/src/main/java/com/microsoft/java/debug/plugin/internal/JdtUtils.java‎`

Copy file name to clipboardExpand all lines: com.microsoft.java.debug.plugin/src/main/java/com/microsoft/java/debug/plugin/internal/JdtUtils.java

+34Lines changed: 34 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,8 @@`
`40`	`40`	`import org.eclipse.jdt.launching.JavaRuntime;`
`41`	`41`	`import org.eclipse.jdt.launching.sourcelookup.containers.JavaProjectSourceContainer;`
`42`	`42`	`import org.eclipse.jdt.launching.sourcelookup.containers.PackageFragmentRootSourceContainer;`
	`43`	`+import org.eclipse.jdt.ls.core.internal.JavaLanguageServerPlugin;`
	`44`	`+import org.eclipse.jdt.ls.core.internal.ProjectUtils;`
`43`	`45`
`44`	`46`	`import com.microsoft.java.debug.core.DebugException;`
`45`	`47`	`import com.microsoft.java.debug.core.StackFrameUtility;`
`@@ -415,4 +417,36 @@ public static boolean isSameFile(IResource resource1, IResource resource2) {`
`415`	`417`
`416`	`418`	`return Objects.equals(resource1.getLocation(), resource2.getLocation());`
`417`	`419`	`}`
	`420`	`+`
	`421`	`+ /**`
	`422`	`+ * Check if the project is managed by Gradle Build Server.`
	`423`	`+ */`
	`424`	`+ public static boolean isBspProject(IProject project) {`
	`425`	`+ return project != null && ProjectUtils.isJavaProject(project)`
	`426`	`+ && ProjectUtils.hasNature(project, "com.microsoft.gradle.bs.importer.GradleBuildServerProjectNature");`
	`427`	`+ }`
	`428`	`+`
	`429`	`+ /**`
	`430`	`+ * Get main project according to the main project name or main class name,`
	`431`	`+ * or return <code>null</code> if the main project cannot be resolved.`
	`432`	`+ */`
	`433`	`+ public static IProject getMainProject(String mainProjectName, String mainClassName) {`
	`434`	`+ IProject mainProject = null;`
	`435`	`+ if (StringUtils.isNotBlank(mainProjectName)) {`
	`436`	`+ mainProject = ProjectUtils.getProject(mainProjectName);`
	`437`	`+ }`
	`438`	`+`
	`439`	`+ if (mainProject == null && StringUtils.isNotBlank(mainClassName)) {`
	`440`	`+ try {`
	`441`	`+ List<IJavaProject> javaProjects = ResolveClasspathsHandler.getJavaProjectFromType(mainClassName);`
	`442`	`+ if (javaProjects.size() == 1) {`
	`443`	`+ mainProject = javaProjects.get(0).getProject();`
	`444`	`+ }`
	`445`	`+ } catch (CoreException e) {`
	`446`	`+ JavaLanguageServerPlugin.logException("Failed to resolve project from main class name.", e);`
	`447`	`+ }`
	`448`	`+ }`
	`449`	`+`
	`450`	`+ return mainProject;`
	`451`	`+ }`
`418`	`452`	`}`

0 commit comments

Comments

0 (0)

You are visitor 01402520 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.