Fix IndexOutOfBoundsException when running on mismatched Eclipse

Update `spring-javaformat-formatter-elcipse` so that all of `org.eclipse.jdt` is shaded into `io.spring.javaformat.eclipse.jdt`. This update ensures that the version of the AST parsing classes are aligned with the version of the formatter. Prior to this commit the misalignment would cause `IndexOutOfBounds` exceptions. Fixes gh-288

Author: philwebb

spring-javaformat-eclipse/io.spring.javaformat.eclipse/src/io/spring/javaformat/eclipse/Activator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,8 @@
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
 
+import io.spring.javaformat.eclipse.jdt.core.JavaCore;
+
 /**
  * The activator class controls the plug-in life cycle.
  *
@@ -33,17 +35,22 @@ public class Activator extends AbstractUIPlugin {
 
 private static Activator plugin;
 
+private JavaCore javaCore;
+
 public Activator() {
+this.javaCore = new JavaCore();
 }
 
 @Override
 public void start(BundleContext context) throws Exception {
 super.start(context);
 plugin = this;
+this.javaCore.start(context);
 }
 
 @Override
 public void stop(BundleContext context) throws Exception {
+this.javaCore.stop(context);
 plugin = null;
 super.stop(context);
 }

spring-javaformat-gradle/spring-javaformat-gradle-plugin/src/test/java/io/spring/javaformat/gradle/testkit/GradleBuild.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,8 +40,8 @@
 import org.junit.runners.model.Statement;
 import org.xml.sax.InputSource;
 
+import io.spring.javaformat.eclipse.jdt.internal.formatter.Preparator;
 import io.spring.javaformat.formatter.Formatter;
-import io.spring.javaformat.formatter.eclipse.Preparator;
 import io.spring.javaformat.org.eclipse.jdt.core.formatter.CodeFormatter;
 
 /**

spring-javaformat/spring-javaformat-checkstyle/src/test/java/io/spring/javaformat/checkstyle/AssertionsAuditListener.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -110,8 +110,8 @@ private void recordLevel(AuditEvent event) {
 }
 
 private void recordLocalizedMessage(String message, String... args) {
-recordMessage(new Violation(0, Definitions.CHECKSTYLE_BUNDLE, message, args, null,
-Violation.class, null).getViolation());
+recordMessage(new Violation(0, Definitions.CHECKSTYLE_BUNDLE, message, args, null, Violation.class, null)
+.getViolation());
 }
 
 private void recordMessage(String message) {

spring-javaformat/spring-javaformat-formatter-eclipse/pom.xml

@@ -50,14 +50,14 @@
 <filter>
 <artifact>io.spring.javaformat:spring-javaformat-formatter-eclipse-runtime</artifact>
 <includes>
-<include>org/eclipse/jdt/internal/formatter/**</include>
+<include>org/eclipse/jdt/**</include>
 </includes>
 </filter>
 </filters>
 <relocations>
 <relocation>
-<pattern>org.eclipse.jdt.internal.formatter</pattern>
-<shadedPattern>io.spring.javaformat.formatter.eclipse</shadedPattern>
+<pattern>org.eclipse.jdt</pattern>
+<shadedPattern>io.spring.javaformat.eclipse.jdt</shadedPattern>
 </relocation>
 </relocations>
 <createDependencyReducedPom>false</createDependencyReducedPom>

spring-javaformat/spring-javaformat-formatter/src/main/java/io/spring/javaformat/formatter/Formatter.java

@@ -22,14 +22,14 @@
 import java.util.Map;
 import java.util.Properties;
 
-import org.eclipse.jdt.core.formatter.CodeFormatter;
 import org.eclipse.jface.text.IRegion;
 import org.eclipse.text.edits.TextEdit;
 
 import io.spring.javaformat.config.IndentationStyle;
 import io.spring.javaformat.config.JavaFormatConfig;
-import io.spring.javaformat.formatter.eclipse.ExtendedCodeFormatter;
-import io.spring.javaformat.formatter.eclipse.Preparator;
+import io.spring.javaformat.eclipse.jdt.core.formatter.CodeFormatter;
+import io.spring.javaformat.eclipse.jdt.internal.formatter.ExtendedCodeFormatter;
+import io.spring.javaformat.eclipse.jdt.internal.formatter.Preparator;
 import io.spring.javaformat.formatter.preparator.Preparators;
 
 /**
@@ -195,7 +195,7 @@ private static Map<String, String> loadOptions(JavaFormatConfig javaFormatConfig
 
 private static void applyConfig(Properties properties, JavaFormatConfig javaFormatConfig) {
 if (javaFormatConfig.getIndentationStyle() == IndentationStyle.SPACES) {
-properties.put("org.eclipse.jdt.core.formatter.tabulation.char", "space");
+properties.put("io.spring.javaformat.eclipse.jdt.core.formatter.tabulation.char", "space");
 }
 }
 

spring-javaformat/spring-javaformat-formatter/src/main/java/io/spring/javaformat/formatter/preparator/CodeLineBreakPreparator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,20 +16,19 @@
 
 package io.spring.javaformat.formatter.preparator;
 
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.ASTVisitor;
-import org.eclipse.jdt.core.dom.AbstractTypeDeclaration;
-import org.eclipse.jdt.core.dom.AnnotationTypeDeclaration;
-import org.eclipse.jdt.core.dom.EnumDeclaration;
-import org.eclipse.jdt.core.dom.FieldDeclaration;
-import org.eclipse.jdt.core.dom.SimpleName;
-import org.eclipse.jdt.core.dom.TypeDeclaration;
-import org.eclipse.jdt.core.formatter.CodeFormatter;
-import org.eclipse.jdt.internal.compiler.parser.TerminalTokens;
-
-import io.spring.javaformat.formatter.eclipse.Preparator;
-import io.spring.javaformat.formatter.eclipse.Token;
-import io.spring.javaformat.formatter.eclipse.TokenManager;
+import io.spring.javaformat.eclipse.jdt.core.dom.ASTNode;
+import io.spring.javaformat.eclipse.jdt.core.dom.ASTVisitor;
+import io.spring.javaformat.eclipse.jdt.core.dom.AbstractTypeDeclaration;
+import io.spring.javaformat.eclipse.jdt.core.dom.AnnotationTypeDeclaration;
+import io.spring.javaformat.eclipse.jdt.core.dom.EnumDeclaration;
+import io.spring.javaformat.eclipse.jdt.core.dom.FieldDeclaration;
+import io.spring.javaformat.eclipse.jdt.core.dom.SimpleName;
+import io.spring.javaformat.eclipse.jdt.core.dom.TypeDeclaration;
+import io.spring.javaformat.eclipse.jdt.core.formatter.CodeFormatter;
+import io.spring.javaformat.eclipse.jdt.internal.compiler.parser.TerminalTokens;
+import io.spring.javaformat.eclipse.jdt.internal.formatter.Preparator;
+import io.spring.javaformat.eclipse.jdt.internal.formatter.Token;
+import io.spring.javaformat.eclipse.jdt.internal.formatter.TokenManager;
 
 /**
  * {@link Preparator} to fine tune curly-brace line breaks.

spring-javaformat/spring-javaformat-formatter/src/main/java/io/spring/javaformat/formatter/preparator/JavadocLineBreakPreparator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,20 +20,19 @@
 import java.util.Collections;
 import java.util.List;
 
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.ASTVisitor;
-import org.eclipse.jdt.core.dom.Comment;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.Javadoc;
-import org.eclipse.jdt.core.dom.TagElement;
-import org.eclipse.jdt.core.dom.TextElement;
-import org.eclipse.jdt.core.dom.TypeDeclaration;
-import org.eclipse.jdt.core.formatter.CodeFormatter;
-import org.eclipse.jdt.internal.compiler.parser.TerminalTokens;
-
-import io.spring.javaformat.formatter.eclipse.Preparator;
-import io.spring.javaformat.formatter.eclipse.Token;
-import io.spring.javaformat.formatter.eclipse.TokenManager;
+import io.spring.javaformat.eclipse.jdt.core.dom.ASTNode;
+import io.spring.javaformat.eclipse.jdt.core.dom.ASTVisitor;
+import io.spring.javaformat.eclipse.jdt.core.dom.Comment;
+import io.spring.javaformat.eclipse.jdt.core.dom.CompilationUnit;
+import io.spring.javaformat.eclipse.jdt.core.dom.Javadoc;
+import io.spring.javaformat.eclipse.jdt.core.dom.TagElement;
+import io.spring.javaformat.eclipse.jdt.core.dom.TextElement;
+import io.spring.javaformat.eclipse.jdt.core.dom.TypeDeclaration;
+import io.spring.javaformat.eclipse.jdt.core.formatter.CodeFormatter;
+import io.spring.javaformat.eclipse.jdt.internal.compiler.parser.TerminalTokens;
+import io.spring.javaformat.eclipse.jdt.internal.formatter.Preparator;
+import io.spring.javaformat.eclipse.jdt.internal.formatter.Token;
+import io.spring.javaformat.eclipse.jdt.internal.formatter.TokenManager;
 
 /**
  * {@link Preparator} to fine tune Javadoc whitespace.

spring-javaformat/spring-javaformat-formatter/src/main/java/io/spring/javaformat/formatter/preparator/Preparators.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
 
 import java.util.function.Consumer;
 
-import io.spring.javaformat.formatter.eclipse.Preparator;
+import io.spring.javaformat.eclipse.jdt.internal.formatter.Preparator;
 
 /**
  * {@link Preparator} instances that can be added.