Restore the more complex GrEclipse log manager.

Author: nedtwigg

build.gradle

@@ -1,6 +1,6 @@
 plugins {
 	// https://github.com/equodev/equo-ide/blob/main/plugin-gradle/CHANGELOG.md
-	id 'dev.equo.ide'                          version '0.16.0'
+	id 'dev.equo.ide'                          version '0.17.1'
 }
 equoIde {
 	branding().title('Spotless').icon(file('_images/spotless_logo.png'))

lib-extra/build.gradle

@@ -7,7 +7,7 @@ version = rootProject.spotlessChangelog.versionNext
 apply from: rootProject.file('gradle/java-setup.gradle')
 apply from: rootProject.file('gradle/java-publish.gradle')
 
-String VER_SOLSTICE = '0.18.0'
+String VER_SOLSTICE = '0.19.1'
 dependencies {
 	api project(':lib')
 	// misc useful utilities
@@ -72,8 +72,8 @@ p2deps {
 		install 'org.eclipse.jdt.core'
 	}
 	into 'groovyCompileOnly', {
-		p2repo 'https://download.eclipse.org/eclipse/updates/4.26/'
-		p2repo 'https://groovy.jfrog.io/artifactory/plugins-release/org/codehaus/groovy/groovy-eclipse-integration/4.8.0/e4.26/'
+		p2repo 'https://download.eclipse.org/eclipse/updates/4.23/'
+		p2repo 'https://groovy.jfrog.io/artifactory/plugins-release/org/codehaus/groovy/groovy-eclipse-integration/4.8.0/e4.23/'
 		install 'org.codehaus.groovy.eclipse.refactoring'
 		install 'org.codehaus.groovy.eclipse.core'
 		install 'org.eclipse.jdt.groovy.core'

lib-extra/src/groovy/java/com/diffplug/spotless/extra/glue/groovy/GrEclipseFormatterStepImpl.java

@@ -24,6 +24,9 @@
 import java.util.Map;
 import java.util.Properties;
 
+import org.codehaus.groovy.eclipse.GroovyLogManager;
+import org.codehaus.groovy.eclipse.IGroovyLogger;
+import org.codehaus.groovy.eclipse.TraceCategory;
 import org.codehaus.groovy.eclipse.core.GroovyCoreActivator;
 import org.codehaus.groovy.eclipse.refactoring.formatter.DefaultGroovyFormatter;
 import org.codehaus.groovy.eclipse.refactoring.formatter.FormatterPreferencesOnStore;
@@ -37,7 +40,10 @@
 import org.eclipse.jface.text.TextSelection;
 import org.eclipse.text.edits.TextEdit;
 
+import dev.equo.solstice.NestedJars;
+import dev.equo.solstice.ShimIdeBootstrapServices;
 import dev.equo.solstice.Solstice;
+import dev.equo.solstice.p2.CacheLocations;
 
 /** Spotless-Formatter step which calls out to the Groovy-Eclipse formatter. */
 public class GrEclipseFormatterStepImpl {
@@ -54,10 +60,15 @@ public class GrEclipseFormatterStepImpl {
 
 	public GrEclipseFormatterStepImpl(final Properties properties) throws Exception {
 		var solstice = Solstice.findBundlesOnClasspath();
+		NestedJars.setToWarnOnly();
+		NestedJars.onClassPath().confirmAllNestedJarsArePresentOnClasspath(CacheLocations.nestedJars());
 		solstice.warnAndModifyManifestsToFix();
-		solstice.openShim(Map.of());
+		var props = Map.<String, String> of();
+		solstice.openShim(props);
+		ShimIdeBootstrapServices.apply(props, solstice.getContext());
 		solstice.startAllWithLazy(false);
 		solstice.startWithoutTransitives("org.codehaus.groovy.eclipse.core");
+
 		PreferenceStore preferences = createPreferences(properties);
 		preferencesStore = new FormatterPreferencesOnStore(preferences);
 		ignoreFormatterProblems = Boolean.parseBoolean(properties.getProperty(IGNORE_FORMATTER_PROBLEMS, "false"));
@@ -80,8 +91,7 @@ public String format(String raw) throws Exception {
 	/**
 	 * Eclipse Groovy formatter does not signal problems by its return value, but by logging errors.
 	 */
-	private static class GroovyErrorListener implements ILogListener {
-
+	private static class GroovyErrorListener implements ILogListener, IGroovyLogger {
 		private final List<String> errors;
 
 		public GroovyErrorListener() {
@@ -92,6 +102,9 @@ public GroovyErrorListener() {
 			errors = Collections.synchronizedList(new ArrayList<String>());
 			ILog groovyLogger = GroovyCoreActivator.getDefault().getLog();
 			groovyLogger.addLogListener(this);
+			synchronized (GroovyLogManager.manager) {
+				GroovyLogManager.manager.addLogger(this);
+			}
 		}
 
 		@Override
@@ -102,6 +115,9 @@ public void logging(final IStatus status, final String plugin) {
 		public boolean errorsDetected() {
 			ILog groovyLogger = GroovyCoreActivator.getDefault().getLog();
 			groovyLogger.removeLogListener(this);
+			synchronized (GroovyLogManager.manager) {
+				GroovyLogManager.manager.removeLogger(this);
+			}
 			return 0 != errors.size();
 		}
 
@@ -120,6 +136,22 @@ public String toString() {
 
 			return string.toString();
 		}
+
+		@Override
+		public boolean isCategoryEnabled(TraceCategory cat) {
+			/*
+			 * Note that the compiler errors are just additionally caught here.
+			 * They are also printed directly to System.err.
+			 * See org.codehaus.jdt.groovy.internal.compiler.ast.GroovyCompilationUnitDeclaration.recordProblems
+			 * for details.
+			 */
+			return TraceCategory.COMPILER.equals(cat);
+		}
+
+		@Override
+		public void log(TraceCategory arg0, String arg1) {
+			errors.add(arg1);
+		}
 	}
 
 	private static PreferenceStore createPreferences(final Properties properties) throws IOException {
@@ -130,5 +162,4 @@ private static PreferenceStore createPreferences(final Properties properties) th
 		preferences.load(input);
 		return preferences;
 	}
-
 }

lib-extra/src/main/java/com/diffplug/spotless/extra/EquoBasedStepBuilder.java

@@ -70,12 +70,11 @@ EquoBasedStepBuilder.State get() throws Exception {
 		var query = model(formatterVersion).query(P2ClientCache.PREFER_OFFLINE, P2QueryCache.ALLOW);
 		var classpath = new ArrayList<File>();
 		var mavenDeps = new ArrayList<String>();
-		mavenDeps.add("dev.equo.ide:solstice:0.18.0");
+		mavenDeps.add("dev.equo.ide:solstice:0.19.1");
 		mavenDeps.addAll(query.getJarsOnMavenCentral());
 		classpath.addAll(mavenProvisioner.provisionWithTransitives(false, mavenDeps));
 		classpath.addAll(query.getJarsNotOnMavenCentral());
-		File nestedDir = new File("/Users/ntwigg/.equo/p2-blah");
-		for (var nested : NestedJars.inFiles(query.getJarsNotOnMavenCentral()).extractAllNestedJars(nestedDir)) {
+		for (var nested : NestedJars.inFiles(query.getJarsNotOnMavenCentral()).extractAllNestedJars()) {
 			classpath.add(nested.getValue());
 		}
 		var jarState = JarState.preserveOrder(classpath);