Improve Syntaxes, preferences & prompts logic

- Support for Kotlin and Markdown syntaxes
- Reset Layout when reseting preferences
- Patches for RSyntaxArea 3.3.0
- Move all JOptionPane prompts to centralized methods. This simplifies code and would simplify migration to e.g., UIService, or hacking the Swing L&F to match that of the RSyntaxArea theme

Author: tferr

pom.xml

@@ -164,10 +164,12 @@
 		<dependency>
 			<groupId>com.fifesoft</groupId>
 			<artifactId>rsyntaxtextarea</artifactId>
+			<version>3.3.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.fifesoft</groupId>
 			<artifactId>languagesupport</artifactId>
+			<version>3.3.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.miglayout</groupId>
@@ -199,6 +201,10 @@
 			<artifactId>scripting-groovy</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>com.formdev</groupId>
+			<artifactId>flatlaf</artifactId>
+		</dependency>
 	</dependencies>
 
 	<repositories>

src/main/java/org/scijava/ui/swing/script/EditorPane.java

@@ -56,7 +56,6 @@
 import javax.swing.ButtonGroup;
 import javax.swing.JMenu;
 import javax.swing.JMenuItem;
-import javax.swing.JOptionPane;
 import javax.swing.JPopupMenu;
 import javax.swing.JRadioButtonMenuItem;
 import javax.swing.JScrollPane;
@@ -314,7 +313,9 @@ private JMenu geSyntaxForNoneLang() {
 		menu.add(getSyntaxItem(bg, "Dockerfile", SYNTAX_STYLE_DOCKERFILE));
 		menu.add(getSyntaxItem(bg, "HTML", SYNTAX_STYLE_HTML));
 		menu.add(getSyntaxItem(bg, "JSON", SYNTAX_STYLE_JSON));
+		menu.add(getSyntaxItem(bg, "Kotlin", SYNTAX_STYLE_KOTLIN));
 		menu.add(getSyntaxItem(bg, "Makefile", SYNTAX_STYLE_MAKEFILE));
+		menu.add(getSyntaxItem(bg, "Markdown", SYNTAX_STYLE_MARKDOWN));
 		menu.add(getSyntaxItem(bg, "SH", SYNTAX_STYLE_UNIX_SHELL));
 		menu.add(getSyntaxItem(bg, "XML", SYNTAX_STYLE_XML));
 		menu.add(getSyntaxItem(bg, "YAML", SYNTAX_STYLE_YAML));
@@ -337,7 +338,7 @@ private JMenuItem getSyntaxItem(final ButtonGroup bg, final String label, final
 	}
 
 	void error(final String message) {
-		JOptionPane.showMessageDialog(this, message, "Error", JOptionPane.ERROR_MESSAGE);
+		TextEditor.GuiUtils.error(this, message);
 	}
 
 	private void updateNoneLangSyntaxMenu(final ScriptLanguage language) {
@@ -948,8 +949,7 @@ public void toggleBookmark(final int line) {
 			}
 			catch (final BadLocationException e) {
 				/* ignore */
-				JOptionPane.showMessageDialog(this, "Cannot toggle bookmark at this location.", "Error",
-						JOptionPane.ERROR_MESSAGE);
+				error("Cannot toggle bookmark at this location.");
 			}
 		}
 	}
@@ -1099,7 +1099,7 @@ public void loadPreferences() {
 	 */
 	public void applyTheme(final String theme) throws IllegalArgumentException {
 		try {
-			applyTheme(getTheme(theme));
+			applyTheme(TextEditor.getTheme(theme));
 		} catch (final Exception ex) {
 			throw new IllegalArgumentException(ex);
 		}
@@ -1117,15 +1117,6 @@ private void applyTheme(final Theme th) throws IllegalArgumentException {
 		GutterUtils.updateIcons(gutter);
 	}
 
-	private static Theme getTheme(final String theme) throws IllegalArgumentException {
-		try {
-			return Theme
-					.load(TextEditor.class.getResourceAsStream("/org/fife/ui/rsyntaxtextarea/themes/" + theme + ".xml"));
-		} catch (final Exception ex) {
-			throw new IllegalArgumentException(ex);
-		}
-	}
-
 	public String loadFolders() {
 		return prefService.get(getClass(), FOLDERS_PREFS, System.getProperty("user.home"));
 	}

src/main/java/org/scijava/ui/swing/script/FileSystemTreePanel.java

@@ -54,7 +54,6 @@
 import javax.swing.JCheckBoxMenuItem;
 import javax.swing.JFileChooser;
 import javax.swing.JMenuItem;
-import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JPopupMenu;
 import javax.swing.JScrollPane;
@@ -119,14 +118,11 @@ class FileSystemTreePanel extends JPanel {
 			final List<File> dirs = Arrays.asList(files).stream().filter(f -> f.isDirectory())
 					.collect(Collectors.toList());
 			if (dirs.isEmpty()) {
-				JOptionPane.showMessageDialog(this, "Only folders can be dropped into the file tree.",
-						"Invalid Drop", JOptionPane.WARNING_MESSAGE);
+				TextEditor.GuiUtils.warn(this, "Only folders can be dropped into the file tree.");
 				return;
 			}
-			final boolean confirm = dirs.size() < 4 || (JOptionPane.showConfirmDialog(this,
-					"Confirm loading of " + dirs.size() + " folders?", "Confirm?",
-					JOptionPane.OK_CANCEL_OPTION) == JOptionPane.OK_OPTION);
-			if (confirm) {
+			if (TextEditor.GuiUtils.confirm(this, "Confirm loading of " + dirs.size() + " folders?", "Confirm?",
+					"Confirm")) {
 				dirs.forEach(dir -> tree.addRootDirectory(dir.getAbsolutePath(), true));
 			}
 		});
@@ -256,17 +252,15 @@ private JButton removeDirectoryButton() {
 		remove_directory.addActionListener(e -> {
 			final TreePath p = tree.getSelectionPath();
 			if (null == p) {
-				JOptionPane.showMessageDialog(this, "Select a top-level folder first.", "Invalid Folder",
-						JOptionPane.ERROR_MESSAGE);
+				TextEditor.GuiUtils.error(this, "Select a top-level folder first.");
 				return;
 			}
 			if (2 == p.getPathCount()) {
 				// Is a child of the root, so it's a top-level folder
 				tree.getModel().removeNodeFromParent(//
 						(FileSystemTree.Node) p.getLastPathComponent());
 			} else {
-				JOptionPane.showMessageDialog(this, "Can only remove top-level folders.", "Invalid Folder",
-						JOptionPane.ERROR_MESSAGE);
+				TextEditor.GuiUtils.error(this, "Can only remove top-level folders.");
 			}
 		});
 		return remove_directory;
@@ -326,34 +320,30 @@ private void addContextualMenuToTree() {
 		jmi.addActionListener(e -> {
 			final TreePath path = tree.getSelectionPath();
 			if (path == null) {
-				JOptionPane.showMessageDialog(this, "No items are currently selected.", "Invalid Selection",
-						JOptionPane.INFORMATION_MESSAGE);
+				TextEditor.GuiUtils.info(this, "No items are currently selected.", "Invalid Selection");
 				return;
 			}
 			try {
 				final String filepath = (String) ((FileSystemTree.Node) path.getLastPathComponent()).getUserObject();
 				final File f = new File(filepath);
 				Desktop.getDesktop().open((f.isDirectory()) ? f : f.getParentFile());
 			} catch (final Exception | Error ignored) {
-				JOptionPane.showMessageDialog(this, "Folder of selected item does not seem to be accessible.", "Error",
-						JOptionPane.ERROR_MESSAGE);
+				TextEditor.GuiUtils.error(this, "Folder of selected item does not seem to be accessible.");
 			}
 		});
 		popup.add(jmi);
 		jmi = new JMenuItem("Open in Terminal");
 		jmi.addActionListener(e -> {
 			final TreePath path = tree.getSelectionPath();
 			if (path == null) {
-				JOptionPane.showMessageDialog(this, "No items are currently selected.", "Invalid Selection",
-						JOptionPane.INFORMATION_MESSAGE);
+				TextEditor.GuiUtils.info(this,  "No items are currently selected.", "Invalid Selection");
 				return;
 			}
 			try {
 				final String filepath = (String) ((FileSystemTree.Node) path.getLastPathComponent()).getUserObject();
 				TextEditor.GuiUtils.openTerminal(new File(filepath));
 			} catch (final Exception ignored) {
-				JOptionPane.showMessageDialog(this, "Could not open path in Terminal.", "Error",
-						JOptionPane.ERROR_MESSAGE);
+				TextEditor.GuiUtils.error(this, "Could not open path in Terminal.");
 			}
 		});
 		popup.add(jmi);
@@ -381,7 +371,7 @@ private void expandImmediateNodes() {
 	}
 
 	private void showHelpMsg() {
-		final String msg = "<HTML><div WIDTH=500>" //
+		final String msg = "<HTML>" //
 				+ "<p><b>Overview</b></p>" //
 				+ "<p>The File Explorer pane provides a direct view of selected folders. Changes in " //
 				+ "the native file system are synchronized in real time.</p>" //
@@ -410,7 +400,7 @@ private void showHelpMsg() {
 				+ "   <td>Display filenames starting with <i>Demo</i></td>" //
 				+ "  </tr>" //
 				+ "</table>";
-		JOptionPane.showMessageDialog(this, msg, "File Explorer Pane", JOptionPane.PLAIN_MESSAGE);
+		TextEditor.GuiUtils.showHTMLDialog(this.getRootPane(), "File Explorer Pane", msg);
 	}
 
 	private boolean isCaseSensitive() {

src/main/java/org/scijava/ui/swing/script/GutterUtils.java

@@ -49,9 +49,12 @@ public class GutterUtils {
 	GutterUtils(final Gutter gutter) {
 		this.gutter = gutter;
 		gutter.setSpacingBetweenLineNumbersAndFoldIndicator(0);
+		//gutter.setFoldIndicatorStyle(org.fife.ui.rtextarea.FoldIndicatorStyle.MODERN); // DEFAULT
+		gutter.setShowCollapsedRegionToolTips(true);
 	}
 
-	private void updateFoldIcons() {
+	@SuppressWarnings("unused")
+	private void updateFoldIcons() { // no longer needed since v3.3.0
 		int size;
 		try {
 			size = (int) new FoldIndicator(null).getPreferredSize().getWidth();
@@ -63,7 +66,7 @@ private void updateFoldIcons() {
 		final int fontSize = gutter.getLineNumberFont().getSize();
 		if (size > fontSize)
 			size = fontSize;
-		gutter.setFoldIcons(new FoldIcon(true, size), new FoldIcon(false, size));
+		//gutter.setFoldIcons(new FoldIcon(true, size), new FoldIcon(false, size));
 	}
 
 	private ImageIcon getBookmarkIcon() {
@@ -94,10 +97,11 @@ private void updateBookmarkIcon() {
 
 	public static void updateIcons(final Gutter gutter) {
 		final GutterUtils utils = new GutterUtils(gutter);
-		utils.updateFoldIcons();
+		//utils.updateFoldIcons();
 		utils.updateBookmarkIcon();
 	}
 
+	@SuppressWarnings("unused")
 	private class FoldIcon implements Icon {
 
 		private final boolean collapsed;

src/main/java/org/scijava/ui/swing/script/Main.java

@@ -38,6 +38,9 @@
 import org.scijava.script.ScriptLanguage;
 import org.scijava.script.ScriptService;
 
+import com.formdev.flatlaf.FlatDarkLaf;
+import com.formdev.flatlaf.FlatLightLaf;
+
 /**
  * Main entry point for launching the script editor standalone.
  *
@@ -65,6 +68,7 @@ public void windowClosed(final WindowEvent e) {
 		editor.setVisible(true);
 	}
 	public static void main(String[] args) throws Exception {
+		FlatDarkLaf.setup();
 		String lang = args.length == 0 ? "Java" : args[0];
 		launch(lang);
 	}