From d70eca9774553ae0b235a8ed7a44c134e4d9a299 Mon Sep 17 00:00:00 2001
From: Karl Tauber <karl@jformdesigner.com>
Date: Thu, 31 Dec 2020 18:15:20 +0100
Subject: [PATCH] Theme Editor: added "error strip" to right side; removed
 scroll pane border

---
 .../flatlaf/themeeditor/FlatThemeEditorPane.java       | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemeEditorPane.java b/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemeEditorPane.java
index ade51c5d..28ca332f 100644
--- a/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemeEditorPane.java
+++ b/flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemeEditorPane.java
@@ -30,10 +30,13 @@ import javax.swing.JLayer;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+import javax.swing.border.MatteBorder;
 import org.fife.rsta.ui.CollapsibleSectionPanel;
 import org.fife.ui.autocomplete.AutoCompletion;
 import org.fife.ui.autocomplete.CompletionProvider;
 import org.fife.ui.rsyntaxtextarea.AbstractTokenMakerFactory;
+import org.fife.ui.rsyntaxtextarea.ErrorStrip;
 import org.fife.ui.rsyntaxtextarea.FileLocation;
 import org.fife.ui.rsyntaxtextarea.SyntaxScheme;
 import org.fife.ui.rsyntaxtextarea.TextEditorPane;
@@ -118,6 +121,7 @@ class FlatThemeEditorPane
 
 		// create scroll pane
 		scrollPane = new RTextScrollPane( viewPanel );
+		scrollPane.setBorder( null );
 		scrollPane.setLineNumbersEnabled( true );
 
 		// scale fonts
@@ -127,9 +131,13 @@ class FlatThemeEditorPane
 		// use same font for line numbers as in editor
 		scrollPane.getGutter().setLineNumberFont( textArea.getFont() );
 
+		// create error strip
+		ErrorStrip errorStrip = new ErrorStrip( textArea );
+
 		// create collapsible panel
 		collapsiblePanel = new CollapsibleSectionPanel();
 		collapsiblePanel.add( scrollPane );
+		collapsiblePanel.add( errorStrip, BorderLayout.LINE_END );
 		add( collapsiblePanel, BorderLayout.CENTER );
 	}
 
@@ -218,6 +226,8 @@ class FlatThemeEditorPane
 	void showFindReplaceBar() {
 		if( findReplaceBar == null ) {
 			findReplaceBar = new FlatFindReplaceBar( textArea );
+			findReplaceBar.setBorder( new MatteBorder( 1, 0, 0, 0,
+				UIManager.getColor( "Component.borderColor" ) ) );
 			collapsiblePanel.addBottomComponent( findReplaceBar );
 		}