From 240cf2d96ddb2f15b43fbd9321cadfd187d10cee Mon Sep 17 00:00:00 2001
From: Janne Valkealahti <janne.valkealahti@gmail.com>
Date: Sat, 19 Feb 2022 13:49:02 +0000
Subject: [PATCH] Add new highlight style tag

---
 .../shell/style/ThemeSettings.java            | 36 +++++++++++++++++++
 .../shell/style/ThemeSettingsTests.java       | 24 ++++++++++++-
 2 files changed, 59 insertions(+), 1 deletion(-)

diff --git a/spring-shell-core/src/main/java/org/springframework/shell/style/ThemeSettings.java b/spring-shell-core/src/main/java/org/springframework/shell/style/ThemeSettings.java
index 6bfe921a..be3ea875 100644
--- a/spring-shell-core/src/main/java/org/springframework/shell/style/ThemeSettings.java
+++ b/spring-shell-core/src/main/java/org/springframework/shell/style/ThemeSettings.java
@@ -15,6 +15,8 @@
  */
 package org.springframework.shell.style;
 
+import java.util.Arrays;
+
 /**
  * {@link ThemeSettings} is storing {@link Theme} related settings together and
  * is base class for further customizations.
@@ -89,6 +91,11 @@ public abstract class ThemeSettings {
 	 */
 	public final static String TAG_ITEM_SELECTOR = "item-selector";
 
+	/**
+	 * Styling for something which is highlighted.
+	 */
+	public final static String TAG_HIGHLIGHT = "highlight";
+
 	public String title() {
 		return "bold,fg:bright-white";
 	}
@@ -137,6 +144,10 @@ public abstract class ThemeSettings {
 		return "bold,fg:bright-cyan";
 	}
 
+	public String highlight() {
+		return "bold";
+	}
+
 	/**
 	 * Resolve a theme setting from a given tag.
 	 *
@@ -169,6 +180,8 @@ public abstract class ThemeSettings {
 				return itemUnselected();
 			case TAG_ITEM_SELECTOR:
 				return itemSelector();
+			case TAG_HIGHLIGHT:
+				return highlight();
 		}
 		throw new IllegalArgumentException(String.format("Unknown tag '%s'", tag));
 	}
@@ -182,6 +195,29 @@ public abstract class ThemeSettings {
 		return new DefaultThemeSettings();
 	}
 
+	/**
+	 * Gets all tags.
+	 *
+	 * @return array of all tags
+	 */
+	public static String[] tags() {
+		return new String[] {
+				TAG_TITLE,
+				TAG_VALUE,
+				TAG_LIST_KEY,
+				TAG_LIST_VALUE,
+				TAG_LEVEL_INFO,
+				TAG_LEVEL_WARN,
+				TAG_LEVEL_ERROR,
+				TAG_ITEM_ENABLED,
+				TAG_ITEM_DISABLED,
+				TAG_ITEM_SELECTED,
+				TAG_ITEM_UNSELECTED,
+				TAG_ITEM_SELECTOR,
+				TAG_HIGHLIGHT
+		};
+	}
+
 	private static class DefaultThemeSettings extends ThemeSettings {
 	}
 }
diff --git a/spring-shell-core/src/test/java/org/springframework/shell/style/ThemeSettingsTests.java b/spring-shell-core/src/test/java/org/springframework/shell/style/ThemeSettingsTests.java
index 5f15b668..2950cd4e 100644
--- a/spring-shell-core/src/test/java/org/springframework/shell/style/ThemeSettingsTests.java
+++ b/spring-shell-core/src/test/java/org/springframework/shell/style/ThemeSettingsTests.java
@@ -20,13 +20,15 @@ import org.jline.style.StyleResolver;
 import org.jline.style.StyleSource;
 import org.jline.utils.AttributedStyle;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class ThemeSettingsTests {
 
 	@Test
-	public void test() {
+	public void testGeneratedStyle() {
 		ThemeSettings themeSettings = ThemeSettings.themeSettings();
 		String resolveTag = themeSettings.resolveTag(ThemeSettings.TAG_TITLE);
 		assertThat(resolveTag).isEqualTo("bold,fg:bright-white");
@@ -38,4 +40,24 @@ public class ThemeSettingsTests {
 				.isEqualTo(AttributedStyle.DEFAULT.foreground(AttributedStyle.BRIGHT + AttributedStyle.WHITE).bold());
 	}
 
+	@ParameterizedTest
+	@ValueSource(strings = {
+			ThemeSettings.TAG_TITLE,
+			ThemeSettings.TAG_VALUE,
+			ThemeSettings.TAG_LIST_KEY,
+			ThemeSettings.TAG_LIST_VALUE,
+			ThemeSettings.TAG_LEVEL_INFO,
+			ThemeSettings.TAG_LEVEL_WARN,
+			ThemeSettings.TAG_LEVEL_ERROR,
+			ThemeSettings.TAG_ITEM_ENABLED,
+			ThemeSettings.TAG_ITEM_DISABLED,
+			ThemeSettings.TAG_ITEM_SELECTED,
+			ThemeSettings.TAG_ITEM_UNSELECTED,
+			ThemeSettings.TAG_ITEM_SELECTOR,
+			ThemeSettings.TAG_HIGHLIGHT })
+	public void testTags(String tag) {
+		ThemeSettings themeSettings = ThemeSettings.themeSettings();
+		String resolveTag = themeSettings.resolveTag(ThemeSettings.TAG_TITLE);
+		assertThat(resolveTag).isNotNull();
+	}
 }