Fix lineOffset for R

While at it allow selected text in stack traces to be searched in the main script

Author: tferr

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

@@ -194,6 +194,9 @@ private void parse(final String errorLog) {
 		// HACK scala code seems to always be pre-pended by some 10 lines of code(!?).
 		if ("Scala".equals(lang.getLanguageName()))
 			lineOffset += 10;
+		// HACK and R by one (!?)
+		else if ("R".equals(lang.getLanguageName()))	
+			lineOffset += 1;
 
 		errorLines = new TreeSet<>();
 		final StringTokenizer tokenizer = new StringTokenizer(errorLog, "\n");

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

@@ -3766,6 +3766,19 @@ protected void applyConsolePopupMenu(final JTextArea textArea) {
 			if (text != null) findDialog.setSearchPattern(text);
 			findDialog.show(false);
 		});
+		jmi = new JMenuItem("Search Script for Selected Text");
+		popup.add(jmi);
+		jmi.addActionListener(e -> {
+			final String text = textArea.getSelectedText();
+			if (text == null) {
+				UIManager.getLookAndFeel().provideErrorFeedback(textArea);
+			} else {
+				findDialog.setLocationRelativeTo(this);
+				findDialog.setRestrictToConsole(false);
+				if (text != null) findDialog.setSearchPattern(text);
+				findDialog.show(false);
+			}
+		});
 		popup.addSeparator();
 
 		jmi = new JMenuItem("Clear Selected Text...");
@@ -3776,6 +3789,8 @@ protected void applyConsolePopupMenu(final JTextArea textArea) {
 			else 
 				textArea.replaceSelection("");
 		});
+		final DefaultHighlighter highlighter =  (DefaultHighlighter)textArea.getHighlighter();
+		highlighter.setDrawsLayeredHighlights(false);
 		jmi = new JMenuItem("Highlight Selected Text...");
 		popup.add(jmi);
 		jmi.addActionListener(e -> {
@@ -3784,7 +3799,8 @@ protected void applyConsolePopupMenu(final JTextArea textArea) {
 				final DefaultHighlightPainter painter = new DefaultHighlighter.DefaultHighlightPainter(color);
 				textArea.getHighlighter().addHighlight(textArea.getSelectionStart(), textArea.getSelectionEnd(), painter);
 				textArea.setCaretPosition(textArea.getSelectionEnd());
-			} catch (BadLocationException ignored) {
+				textArea.getHighlighter();
+			} catch (final BadLocationException ignored) {
 				UIManager.getLookAndFeel().provideErrorFeedback(textArea);
 			}
 		});