convert to using jline-style module

Author: jdillon

gshell-commands/gshell-shell/src/main/java/com/planet57/gshell/commands/shell/StyleAction.java

@@ -27,8 +27,8 @@
 import com.planet57.gshell.util.cli2.Argument;
 import com.planet57.gshell.util.cli2.Option;
 import com.planet57.gshell.util.io.IO;
-import com.planet57.gshell.util.style.StyleSource;
-import com.planet57.gshell.util.style.Styler;
+import org.jline.style.StyleSource;
+import org.jline.style.Styler;
 
 /**
  * Manage styles.

gshell-commands/gshell-standard/src/main/java/com/planet57/gshell/commands/standard/HistoryAction.java

@@ -25,9 +25,9 @@
 import com.planet57.gshell.util.io.IO;
 import com.planet57.gshell.command.CommandActionSupport;
 import com.planet57.gshell.util.cli2.Option;
-import com.planet57.gshell.util.style.StyleFactory;
-import com.planet57.gshell.util.style.Styler;
 import org.jline.reader.History;
+import org.jline.style.StyleFactory;
+import org.jline.style.Styler;
 import org.jline.utils.AttributedStringBuilder;
 
 import javax.annotation.Nonnull;

gshell-core/src/main/java/com/planet57/gshell/MainSupport.java

@@ -46,9 +46,7 @@
 import com.planet57.gshell.util.pref.Preference;
 import com.planet57.gshell.util.pref.PreferenceProcessor;
 import com.planet57.gshell.util.pref.Preferences;
-import com.planet57.gshell.util.style.MemoryStyleSource;
-import com.planet57.gshell.util.style.StyledIO;
-import com.planet57.gshell.util.style.Styler;
+import com.planet57.gshell.util.io.StyledIO;
 import com.planet57.gshell.variables.VariableNames;
 import com.planet57.gshell.variables.Variables;
 import com.planet57.gshell.variables.VariablesSupport;
@@ -59,6 +57,8 @@
 import org.eclipse.sisu.space.SpaceModule;
 import org.eclipse.sisu.space.URLClassSpace;
 import org.eclipse.sisu.wire.WireModule;
+import org.jline.style.MemoryStyleSource;
+import org.jline.style.Styler;
 import org.jline.terminal.Terminal;
 import org.jline.terminal.TerminalBuilder;
 import org.slf4j.Logger;

gshell-core/src/main/java/com/planet57/gshell/internal/CommandActionFunction.java

@@ -28,7 +28,7 @@
 import com.planet57.gshell.util.cli2.OpaqueArguments;
 import com.planet57.gshell.util.io.StreamSet;
 import com.planet57.gshell.util.pref.PreferenceProcessor;
-import com.planet57.gshell.util.style.StyledIO;
+import com.planet57.gshell.util.io.StyledIO;
 import com.planet57.gshell.variables.Variables;
 import com.planet57.gshell.variables.VariablesSupport;
 import org.apache.felix.gogo.runtime.CommandSessionImpl;

gshell-core/src/main/java/com/planet57/gshell/internal/ShellImpl.java

@@ -38,7 +38,6 @@
 import com.planet57.gshell.event.EventManager;
 import com.planet57.gshell.help.HelpPageManager;
 import com.planet57.gshell.util.jline.LoggingCompleter;
-import com.planet57.gshell.util.style.Styler;
 import com.planet57.gshell.variables.VariableNames;
 import com.planet57.gshell.variables.Variables;
 import org.apache.felix.gogo.jline.Expander;
@@ -56,6 +55,7 @@
 import org.jline.reader.LineReaderBuilder;
 import org.jline.reader.UserInterruptException;
 import org.jline.reader.impl.history.DefaultHistory;
+import org.jline.style.Styler;
 import org.jline.terminal.Terminal;
 import org.jline.terminal.Terminal.Signal;
 import org.jline.terminal.Terminal.SignalHandler;

gshell-maven-plugin/src/main/java/com/planet57/gshell/maven/RunMojo.java

@@ -29,7 +29,7 @@
 import com.planet57.gshell.shell.ShellBuilder;
 import com.planet57.gshell.util.io.PrintBuffer;
 import com.planet57.gshell.util.io.StreamSet;
-import com.planet57.gshell.util.style.StyledIO;
+import com.planet57.gshell.util.io.StyledIO;
 import com.planet57.gshell.variables.VariableNames;
 import com.planet57.gshell.variables.Variables;
 import com.planet57.gshell.variables.VariablesSupport;

gshell-util/pom.xml

@@ -61,6 +61,11 @@
       <artifactId>jline-terminal</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>org.jline</groupId>
+      <artifactId>jline-style</artifactId>
+    </dependency>
+
     <dependency>
       <groupId>org.jline</groupId>
       <artifactId>jline-reader</artifactId>

gshell-util/src/main/java/com/planet57/gshell/util/style/StyledIO.java gshell-util/src/main/java/com/planet57/gshell/util/io/StyledIO.java

@@ -13,14 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.planet57.gshell.util.style;
+package com.planet57.gshell.util.io;
 
 import java.io.InputStreamReader;
 import java.io.PrintWriter;
 import java.io.Reader;
 
-import com.planet57.gshell.util.io.IO;
-import com.planet57.gshell.util.io.StreamSet;
+import org.jline.style.StyleResolver;
+import org.jline.style.StyledWriter;
+import org.jline.style.Styler;
 import org.jline.terminal.Terminal;
 
 import static com.google.common.base.Preconditions.checkNotNull;