Improve compatibility with recent IDEA releases

Update `SpringFormatComponent` to use an alternative plugin registration
technique for recent versions of IDEA.

Closes gh-159

Author: philwebb

spring-javaformat-intellij/spring-javaformat-intellij-plugin/pom.xml

@@ -62,6 +62,12 @@
 			<version>${project.version}</version>
 			<scope>provided</scope>
 		</dependency>
+		<dependency>
+			<groupId>io.spring.javaformat.intellij</groupId>
+			<artifactId>platform-service-container</artifactId>
+			<version>${project.version}</version>
+			<scope>provided</scope>
+		</dependency>
 		<dependency>
 			<groupId>io.spring.javaformat.intellij</groupId>
 			<artifactId>util</artifactId>

spring-javaformat-intellij/spring-javaformat-intellij-plugin/src/main/java/io/spring/format/formatter/intellij/SpringFormatComponent.java

@@ -19,12 +19,17 @@
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
+import com.intellij.ide.plugins.IdeaPluginDescriptor;
+import com.intellij.ide.plugins.PluginManagerCore;
 import com.intellij.ide.util.PropertiesComponent;
+import com.intellij.openapi.application.ApplicationInfo;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.components.ProjectComponent;
 import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.extensions.PluginId;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.codeStyle.CodeStyleManager;
+import com.intellij.serviceContainer.PlatformComponentManagerImpl;
 import org.picocontainer.MutablePicoContainer;
 
 import io.spring.format.formatter.intellij.codestyle.SpringCodeStyleManager;
@@ -90,12 +95,12 @@ private void update(State state) {
 			}
 			if (state == State.ACTIVE && !(manager instanceof SpringCodeStyleManager)) {
 				logger.debug("Enabling SpringCodeStyleManager");
-				reregisterComponent(new SpringCodeStyleManager(manager));
+				registerCodeStyleManager(new SpringCodeStyleManager(manager));
 				this.properties.setValue(ACTIVE_PROPERTY, true);
 			}
 			if (state == State.NOT_ACTIVE && (manager instanceof SpringCodeStyleManager)) {
 				logger.debug("Disabling SpringCodeStyleManager");
-				reregisterComponent(((SpringCodeStyleManager) manager).getDelegate());
+				registerCodeStyleManager(((SpringCodeStyleManager) manager).getDelegate());
 				this.properties.setValue(ACTIVE_PROPERTY, false);
 			}
 			ApplicationManager.getApplication().invokeLater(() -> this.statusIndicator.update(state));
@@ -105,10 +110,17 @@ private void update(State state) {
 		}
 	}
 
-	private void reregisterComponent(CodeStyleManager manager) {
-		MutablePicoContainer container = (MutablePicoContainer) this.project.getPicoContainer();
-		container.unregisterComponent(CODE_STYLE_MANAGER_KEY);
-		container.registerComponentInstance(CODE_STYLE_MANAGER_KEY, manager);
+	private void registerCodeStyleManager(CodeStyleManager manager) {
+		if (ApplicationInfo.getInstance().getBuild().getBaselineVersion() >= 193) {
+			PlatformComponentManagerImpl platformComponentManager = (PlatformComponentManagerImpl) this.project;
+			IdeaPluginDescriptor plugin = PluginManagerCore.getPlugin(PluginId.getId("spring-javaformat"));
+			platformComponentManager.registerServiceInstance(CodeStyleManager.class, manager, plugin);
+		}
+		else {
+			MutablePicoContainer container = (MutablePicoContainer) this.project.getPicoContainer();
+			container.unregisterComponent(CODE_STYLE_MANAGER_KEY);
+			container.registerComponentInstance(CODE_STYLE_MANAGER_KEY, manager);
+		}
 	}
 
 }

spring-javaformat-intellij/spring-javaformat-intellij-runtime/pom.xml

@@ -90,6 +90,8 @@
 											name="*/platform/util/ui/src/**" />
 										<include
 											name="*/platform/extensions/src/**" />
+										<include
+											name="*/platform/service-container/src/**" />
 										<include
 											name="*/plugins/maven/src/**" />
 										<include
@@ -116,6 +118,9 @@
 								<zip
 									destfile="${project.build.directory}/intellij-source/extensions-sources.zip"
 									basedir="${project.build.directory}/intellij-source/platform/extensions/src" />
+								<zip
+									destfile="${project.build.directory}/intellij-source/platform-service-container-sources.zip"
+									basedir="${project.build.directory}/intellij-source/platform/service-container/src" />
 								<zip
 									destfile="${project.build.directory}/intellij-source/maven-sources.zip"
 									basedir="${project.build.directory}/intellij-source/plugins/maven/src" />
@@ -222,6 +227,23 @@
 							<generatePom>true</generatePom>
 						</configuration>
 					</execution>
+					<execution>
+						<id>install-intellij-platform-service-container</id>
+						<phase>install</phase>
+						<inherited>false</inherited>
+						<goals>
+							<goal>install-file</goal>
+						</goals>
+						<configuration>
+							<file>${project.build.directory}/intellij/platform-serviceContainer.jar</file>
+							<sources>${project.build.directory}/intellij-source/platform-service-container-sources.zip</sources>
+							<groupId>io.spring.javaformat.intellij</groupId>
+							<artifactId>platform-service-container</artifactId>
+							<version>${project.version}</version>
+							<packaging>jar</packaging>
+							<generatePom>true</generatePom>
+						</configuration>
+					</execution>
 					<execution>
 						<id>install-intellij-idea</id>
 						<phase>install</phase>