Merge pull request #237 from LumnitzF/feature/reintroduce_bundled_eclipse

Re-introduce bundled eclipse

Author: krasa

README.markdown

@@ -3,6 +3,8 @@
 Allows using Eclipse's Java code formatter directly from IntelliJ. Solves the problem of maintaining a common code style
 in team environments where both IDEA and Eclipse are used.
 
+***Note:*** This project utilizes (and in some manners modifies) code licensed under [EPL-2.0](https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html). For more information see [lib/eclipse](lib/eclipse/README.md).
+
 ---
 
 ### Sponsored by
@@ -19,10 +21,11 @@ Manage pull requests and conduct code reviews in your IDE with full source-tree
     - [Tutorial: Installing, Updating and Uninstalling Repository Plugins](http://www.jetbrains.com/idea/webhelp/installing-updating-and-uninstalling-repository-plugins.html)
     - [Plugin repository page](http://plugins.jetbrains.com/plugin/?idea&id=6546)
 2. Configure it
-    1. Configure Eclipse location
+    1. Configure Eclipse location (optional)
         - Install Eclipse
         - Got To IntelliJ Settings | Other Settings | Adapter for Eclipse Code Formatter
         - Set `Eclipse installation folder` (`/Users/xxx/Eclipse.app/Contents/Eclipse` for Mac)
+        - Change `Java formatter version` to `Configured Eclipse installation folder`
     2. Configure formatter
         - Either, export formatter profiles to get a `*.xml` file
             1. Go to `Eclipse | Windows | Preferences | Java | Code Style | Formatter`

lib/eclipse/EPL-2.0.html

@@ -0,0 +1,7 @@
+This directory contains a repackaged version of [`org.eclipse.jdt.core`](https://www.eclipse.org/jdt/core/) (sources can be found [here](https://git.eclipse.org/c/jdt/eclipse.jdt.core.git/tree/org.eclipse.jdt.core)), which is licensed under [EPL-2.0](https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html).
+
+The original version was changed as follows:
+* It is repackaged together with all its dependencies into a single jar file ([`eclipse.jar`](eclipse.jar))
+* From all modules, the `META-INF/*.SF`, `META-INF/*.DSA`, `META-INF/*.RSA` and `plugin.xml` are removed
+
+The "modified" source code can be found in [`eclipse-sources.jar`](eclipse-sources.jar).

lib/eclipse/README.md

@@ -90,11 +90,11 @@ private EclipseFormatterAdapter newCodeFormatter(LanguageLevel level, VirtualFil
 
 		try {
 			ClassLoader classLoader;
-			// if (settings.getEclipseVersion() == Settings.FormatterVersion.CUSTOM) {
-			classLoader = getCustomClassloader(GlobalSettings.getInstance().getPathToEclipse());
-				// } else {
-				// classLoader = Classloaders.getEclipse();
-				// }
+			if (settings.getEclipseVersion() == Settings.FormatterVersion.CUSTOM) {
+				classLoader = getCustomClassloader(GlobalSettings.getInstance().getPathToEclipse());
+			} else {
+				classLoader = Classloaders.getEclipse();
+			}
 
 			Map<String, String> options = getEclipseProfileOptions(level, configFile, classLoader);
 

lib/eclipse/eclipse-sources.jar

@@ -53,22 +53,6 @@ public void actionPerformed(@NotNull AnActionEvent anActionEvent) {
 		showNotification(notification, psiFile.getProject());
 	}
 
-	public void notifyEclipseLocationNotSet(Project project) {
-		String content = "Please configure Eclipse's location for the Code Formatter plugin, bundled Eclipse was removed.";
-		Notification notification = ProjectComponent.GROUP_DISPLAY_ID_ERROR.createNotification(content,
-				NotificationType.WARNING);
-
-		notification.addAction(new AnAction("Open Settings") {
-			@Override
-			public void actionPerformed(@NotNull AnActionEvent anActionEvent) {
-				notification.expire();
-				ShowSettingsUtil.getInstance().showSettingsDialog(getEventProject(anActionEvent),
-						"Adapter for Eclipse Code Formatter");
-			}
-		});
-		showNotification(notification, project);
-	}
-
 	void notifyFormattingWasDisabled(PsiFile psiFile) {
 		Notification notification = ProjectComponent.GROUP_DISPLAY_ID_INFO.createNotification(
 				psiFile.getName() + " - formatting was disabled for this file type", NotificationType.WARNING);

lib/eclipse/eclipse.jar

@@ -116,6 +116,8 @@ public class ProjectSettingsForm {
 
 	public JTextField pathToCustomEclipse;
 	private JButton customEclipseLocationBrowse;
+	private JRadioButton useEclipseNewest;
+	private JRadioButton useEclipseCustom;
 	private JLabel javaFormatterVersionLabel;
 	private JRadioButton importOrdering451;
 	private JRadioButton importOrdering452;
@@ -139,18 +141,17 @@ private void updateComponents() {
 		enabledBy(new JComponent[]{eclipseSupportedFileTypesLabel, enableJavaFormatting, doNotFormatOtherFilesRadioButton,
 				formatOtherFilesWithExceptionsRadioButton,
 				importOrderPreferenceFileExample, importOrderConfigurationFromFileRadioButton,
-				importOrderConfigurationManualRadioButton,
+				importOrderConfigurationManualRadioButton, useEclipseNewest, useEclipseCustom,
 				formatSelectedTextInAllFileTypes, useForLiveTemplates, importOrdering451, importOrdering452}, useEclipseFormatter);
 
 		enabledBy(new JComponent[]{pathToEclipsePreferenceFileJava, schemeEclipseJC,
 				schemeEclipse, schemeCurrentProject,
 				schemeEclipse21,
 				schemeEclipseFile, eclipsePrefsExample, eclipsePreferenceFileJavaLabel, optimizeImportsCheckBox,
-				eclipsePreferenceFilePathJavaBrowse, javaFormatterProfileLabel, javaFormatterProfile,
-				importStyleLabel,
+				eclipsePreferenceFilePathJavaBrowse, javaFormatterProfileLabel, javaFormatterProfile, customEclipseLocationBrowse, pathToCustomEclipse,
+				useEclipseNewest, useEclipseCustom, javaFormatterVersionLabel, importStyleLabel,
 				importOrdering451, importOrdering452}, enableJavaFormatting);
 
-
 		enabledBy(new JComponent[]{importOrder, pathToImportOrderPreferenceFile, pathToImportOrderPreferenceFileBrowse, importOrderManualExample,
 						importOrderPreferenceFileExample, importOrderConfigurationFromFileRadioButton, importOrderConfigurationManualRadioButton},
 				optimizeImportsCheckBox);
@@ -458,6 +459,12 @@ public void actionPerformed(ActionEvent e) {
 				BareBonesBrowserLaunch.openURL("http://plugins.intellij.net/plugin/?idea&id=6546");
 			}
 		});
+		useEclipseNewest.addActionListener(new ActionListener() {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				importOrdering452.setSelected(true);
+			}
+		});
 		profileHelp.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
@@ -640,6 +647,8 @@ private void importFromInternal(Settings in) {
 		doNotFormatOtherFilesRadioButton.setSelected(!in.isFormatOtherFileTypesWithIntelliJ());
 		useDefaultFormatter.setSelected(Objects.equals(in.getFormatter(), Settings.Formatter.DEFAULT));
 		useEclipseFormatter.setSelected(Objects.equals(in.getFormatter(), Settings.Formatter.ECLIPSE));
+		useEclipseNewest.setSelected(Objects.equals(in.getEclipseVersion(), Settings.FormatterVersion.NEWEST));
+		useEclipseCustom.setSelected(Objects.equals(in.getEclipseVersion(), Settings.FormatterVersion.CUSTOM));
 		importOrdering451.setSelected(Objects.equals(in.getImportOrdering(), Settings.ImportOrdering.ECLIPSE_44));
 		importOrdering452.setSelected(Objects.equals(in.getImportOrdering(), Settings.ImportOrdering.ECLIPSE_452));
 		importOrderConfigurationFromFileRadioButton.setSelected(in.isImportOrderFromFile());
@@ -667,6 +676,11 @@ public Settings exportDisplayedSettings() {
 		} else if (importOrdering452.isSelected()) {
 			displayedSettings.setImportOrdering(Settings.ImportOrdering.ECLIPSE_452);
 		}
+		if (useEclipseNewest.isSelected()) {
+			displayedSettings.setEclipseVersion(Settings.FormatterVersion.NEWEST);
+		} else if (useEclipseCustom.isSelected()) {
+			displayedSettings.setEclipseVersion(Settings.FormatterVersion.CUSTOM);
+		}
 
 		if (schemeEclipse.isSelected()) {
 			displayedSettings.setConfigType(Settings.ConfigType.ECLIPSE);
@@ -719,7 +733,7 @@ public void validate() throws ConfigurationException {
 				throw new ConfigurationException("Path to Import Order file is not valid - the file does not exist");
 			}
 		}
-		if (pathToCustomEclipse.isEnabled()) {
+		if (pathToCustomEclipse.isEnabled() && useEclipseCustom.isSelected()) {
 			if (StringUtils.isBlank(pathToCustomEclipse.getText())) {
 				throw new ConfigurationException("Path to 'Eclipse installation folder' is not valid");
 			}
@@ -741,6 +755,12 @@ private boolean customIsModified(Settings data) {
 		if (useEclipseFormatter.isSelected() != Settings.Formatter.ECLIPSE.equals(data.getFormatter())) {
 			return true;
 		}
+		if (useEclipseNewest.isSelected() != Settings.FormatterVersion.NEWEST.equals(data.getEclipseVersion())) {
+			return true;
+		}
+		if (useEclipseCustom.isSelected() != Settings.FormatterVersion.CUSTOM.equals(data.getEclipseVersion())) {
+			return true;
+		}
 		if (importOrdering451.isSelected() != Settings.ImportOrdering.ECLIPSE_44.equals(data.getImportOrdering())) {
 			return true;
 		}

src/java/krasa/formatter/eclipse/JavaCodeFormatterFacade.java

@@ -80,11 +80,6 @@ public void projectOpened() {
 	}
 
 	public void installOrUpdate(@NotNull Settings settings) {
-		if (settings.isEnabled()) {
-			if (isBlank(GlobalSettings.getInstance().getPathToEclipse())) {
-				new Notifier().notifyEclipseLocationNotSet(project);
-			}
-		}
 		if (eclipseCodeStyleManager == null) {
 			eclipseCodeStyleManager = projectCodeStyle.install(settings);
 		} else {