MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-06 11:50:54 +07:00
Code Issues Packages Projects Releases Wiki Activity

[jps build] store information about enabled instrumenters by in JPS caches by default (IJPL-163450, IJPL-171493)

Browse Source 
(cherry picked from commit e999d59db54671c107f49e46acad6609040d238d)

IJ-CR-156416

GitOrigin-RevId: 341e4c6e4423aee99c83a2f24a5e1256f1b18785
This commit is contained in:
Nikolay Chashnikov
2025-02-28 15:57:18 +01:00
committed by intellij-monorepo-bot
parent dca641f0c1
commit c5f0d00362
3 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jps/jps-builders/src/org/jetbrains/jps/incremental/ModuleBuildTarget.java
View File

@@ -228,7 +228,7 @@ public class ModuleBuildTarget extends JVMModuleBuildTarget<JavaSourceRootDescri
hash.putString(encoding);
}
if (SystemProperties.getBooleanProperty("jps.rebuild.on.change.in.instrumenters", false)) {
if (SystemProperties.getBooleanProperty("jps.rebuild.on.change.in.instrumenters", true)) {
for (JvmClassFileInstrumenter instrumenter : BuilderRegistry.getInstance().getClassFileInstrumenters()) {
if (instrumenter.isEnabled(projectDescriptor, module)) {
hash.putString(instrumenter.getId());

2
plugins/ui-designer/jps-plugin/tests/testSrc/org/jetbrains/jps/uiDesigner/build/FormsBuilderTest.java
View File

@@ -63,7 +63,7 @@ public class FormsBuilderTest extends JpsBuildTestCase {
assertInstrumented(m, "xxx/MyForm.class");
JpsUiDesignerExtensionService.getInstance().getOrCreateUiDesignerConfiguration(myProject).setInstrumentClasses(false);
rebuildAllModules();//todo perhaps we shouldn't require rebuild to remove instrumented code
buildAllModules();
assertNotInstrumented(m, "xxx/MyForm.class");
}

11
plugins/ui-designer/testSrc/com/intellij/uiDesigner/make/UiDesignerExternalBuildTest.java
View File

@@ -16,7 +16,6 @@
package com.intellij.uiDesigner.make;
import com.intellij.compiler.artifacts.ArtifactCompilerTestCase;
import com.intellij.compiler.server.BuildProcessParametersProvider;
import com.intellij.compiler.server.CompileServerPlugin;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.application.ex.PathManagerEx;
@@ -30,7 +29,6 @@ import com.intellij.testFramework.ExtensionTestUtil;
import com.intellij.uiDesigner.GuiDesignerConfiguration;
import com.intellij.uiDesigner.core.AbstractLayout;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
import java.io.File;
import java.io.IOException;
@@ -81,15 +79,6 @@ public class UiDesignerExternalBuildTest extends ArtifactCompilerTestCase {
}
public void testDisableAndEnableSwingUiDesignerPlugin() throws IOException {
BuildProcessParametersProvider.EP_NAME.getPoint(myProject).registerExtension(
new BuildProcessParametersProvider() {
@Override
public @NotNull List<String> getVMArguments() {
return List.of("-Djps.rebuild.on.change.in.instrumenters=true");
}
},
getTestRootDisposable());
VirtualFile javaFileWithoutForm = createFile("src/A.java", "class A{}");
VirtualFile srcRoot = javaFileWithoutForm.getParent();
copyClassWithForm(srcRoot);