Fix ImageJ macro language functionality

The language rename from "IJ1 Macro" to "ImageJ Macro"
(imagej/imagej-legacy@a031605) broke
the Script Editor's special handling, because internally, the name was
being used to check whether the language is the ImageJ macro language.

It's unfortunate that this component has any special handling for the
Image Macro language whatsoever -- it's supposed to be completely
agnostic to specific script languages -- but we are where we are, and
this commit fixes the immediate problem.

See also: https://forum.image.sc/t/71733

Author: ctrueden

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

@@ -1067,7 +1067,7 @@ public void loadPreferences() {
 			setTabsEmulated(false);
 			setPaintTabLines(false);
 			setAutoCompletion(true);
-			setKeylessAutoCompletion(true); // true for backwards compatibility with IJ1 macro auto-completion
+			setKeylessAutoCompletion(true); // true for backwards compatibility with ImageJ macro auto-completion
 			setFallbackAutoCompletion(false);
 			setMarkOccurrences(false);
 		} else {
@@ -1078,7 +1078,7 @@ public void loadPreferences() {
 			setWhitespaceVisible(prefService.getBoolean(getClass(), WHITESPACE_VISIBLE_PREFS, isWhitespaceVisible()));
 			setPaintTabLines(prefService.getBoolean(getClass(), TABLINES_VISIBLE_PREFS, getPaintTabLines()));
 			setAutoCompletion(prefService.getBoolean(getClass(), AUTOCOMPLETE_PREFS, true));
-			setKeylessAutoCompletion(prefService.getBoolean(getClass(), AUTOCOMPLETE_KEYLESS_PREFS, true)); // true for backwards compatibility with IJ1 macro
+			setKeylessAutoCompletion(prefService.getBoolean(getClass(), AUTOCOMPLETE_KEYLESS_PREFS, true)); // true for backwards compatibility with ImageJ macro
 			setFallbackAutoCompletion(prefService.getBoolean(getClass(), AUTOCOMPLETE_FALLBACK_PREFS, false));
 			setMarkOccurrences(prefService.getBoolean(getClass(), MARK_OCCURRENCES_PREFS, false));
 			setMarginLineEnabled(prefService.getBoolean(getClass(), MARGIN_VISIBLE_PREFS, false));

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

@@ -151,13 +151,15 @@ public void parse(final Throwable t) {
 		parse(sw.toString());
 	}
 
-	private boolean isIJ1Macro() {
+	private boolean isImageJMacro() {
 		final ScriptLanguage lang = editorPane.getCurrentLanguage();
-		return lang != null && "IJ1 Macro".equals(lang.getLanguageName());
+		if (lang == null) return false;
+		final String name = lang.getLanguageName();
+		return name.equals("ImageJ Macro") || name.equals("IJ1 Macro");
 	}
 
 	public boolean isLogDetailed() {
-		if (!isIJ1Macro()) return parsingSucceeded;
+		if (!isImageJMacro()) return parsingSucceeded;
 		for (final Window win : Window.getWindows()) {
 			if (win != null && win instanceof Dialog && "Macro Error".equals(((Dialog)win).getTitle())) {
 				return true; // hopefully there is something in the console
@@ -194,7 +196,7 @@ private void parse(final String errorLog) {
 			abort();
 			return;
 		}
-		final boolean isIJM = isIJ1Macro();
+		final boolean isIJM = isImageJMacro();
 		if (isIJM) {
 			abort("Execution errors handled by the Macro Interpreter. Use the Interpreter's Debug option for error tracking", false);
 			return;

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

@@ -3767,7 +3767,7 @@ private JMenu helpMenu() {
 		menu.add(helpMenuItem("Fiji on GitHub", "https://github.com/fiji"));
 		menu.add(helpMenuItem("SciJava on GitHub", "https://github.com/scijava/"));
 		menu.addSeparator();
-		menu.add(helpMenuItem("IJ1 Macro Functions", "https://imagej.nih.gov/ij/developer/macro/functions.html"));
+		menu.add(helpMenuItem("ImageJ Macro Functions", "https://imagej.nih.gov/ij/developer/macro/functions.html"));
 		menu.add(helpMenuItem("ImageJ Docs: Development", "https://imagej.net/develop/"));
 		menu.add(helpMenuItem("ImageJ Docs: Scripting", "https://imagej.net/scripting/"));
 		menu.addSeparator();

src/main/java/org/scijava/ui/swing/script/highliters/IJ1MacroHighlighter.java

@@ -33,12 +33,12 @@
 import org.scijava.ui.swing.script.SyntaxHighlighter;
 
 /**
- * SyntaxHighliter for ij1-macros.
+ * SyntaxHighliter for imagej-macros.
  *
  * @author Johannes Schindelin
  * @author Jonathan Hale
  */
-@Plugin(type = SyntaxHighlighter.class, name = "ij1-macro")
+@Plugin(type = SyntaxHighlighter.class, name = "imagej-macro")
 public class IJ1MacroHighlighter extends ImageJMacroTokenMaker implements
 	SyntaxHighlighter
 {