From 1fc33b12e1bec575d61f4112ade32f8ab6965e8c Mon Sep 17 00:00:00 2001 From: Emmanuel CASTRO Date: Fri, 27 Dec 2024 14:52:48 +0100 Subject: [PATCH] Add styling BOLD_RESET_FG (black un Jupyter Lab, white un VSCode) Change use of BOLD_BLACK_FG to BOLD_RESET_FG for improved visibility --- jjava/src/main/java/org/dflib/jjava/JavaKernel.java | 6 +++--- .../java/org/dflib/jjava/jupyter/kernel/BaseKernel.java | 4 ++-- .../java/org/dflib/jjava/jupyter/kernel/util/TextColor.java | 2 ++ 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/jjava/src/main/java/org/dflib/jjava/JavaKernel.java b/jjava/src/main/java/org/dflib/jjava/JavaKernel.java index 5971ef8..b84c9c8 100644 --- a/jjava/src/main/java/org/dflib/jjava/JavaKernel.java +++ b/jjava/src/main/java/org/dflib/jjava/JavaKernel.java @@ -146,12 +146,12 @@ public JavaKernel(String version) { ); this.errorStyler = new StringStyler.Builder() - .addPrimaryStyle(TextColor.BOLD_BLACK_FG) + .addPrimaryStyle(TextColor.BOLD_RESET_FG) .addSecondaryStyle(TextColor.BOLD_RED_FG) - .addHighlightStyle(TextColor.BOLD_BLACK_FG) + .addHighlightStyle(TextColor.BOLD_RESET_FG) .addHighlightStyle(TextColor.RED_BG) //TODO map snippet ids to code cells and put the proper line number in the margin here - .withLinePrefix(TextColor.BOLD_BLACK_FG + "| ") + .withLinePrefix(TextColor.BOLD_RESET_FG + "| ") .build(); this.mavenResolver.initImplicitExtensions(); diff --git a/jupyter-jvm-basekernel/src/main/java/org/dflib/jjava/jupyter/kernel/BaseKernel.java b/jupyter-jvm-basekernel/src/main/java/org/dflib/jjava/jupyter/kernel/BaseKernel.java index ef51a56..864cf2c 100644 --- a/jupyter-jvm-basekernel/src/main/java/org/dflib/jjava/jupyter/kernel/BaseKernel.java +++ b/jupyter-jvm-basekernel/src/main/java/org/dflib/jjava/jupyter/kernel/BaseKernel.java @@ -107,9 +107,9 @@ public BaseKernel(Charset charset) { Text.registerAll(this.renderer); this.errorStyler = new StringStyler.Builder() - .addPrimaryStyle(TextColor.BOLD_BLACK_FG) + .addPrimaryStyle(TextColor.BOLD_RESET_FG) .addSecondaryStyle(TextColor.BOLD_RED_FG) - .addHighlightStyle(TextColor.BOLD_BLACK_FG) + .addHighlightStyle(TextColor.BOLD_RESET_FG) .addHighlightStyle(TextColor.RED_BG) .build(); } diff --git a/jupyter-jvm-basekernel/src/main/java/org/dflib/jjava/jupyter/kernel/util/TextColor.java b/jupyter-jvm-basekernel/src/main/java/org/dflib/jjava/jupyter/kernel/util/TextColor.java index 245d9bb..78f2b1c 100644 --- a/jupyter-jvm-basekernel/src/main/java/org/dflib/jjava/jupyter/kernel/util/TextColor.java +++ b/jupyter-jvm-basekernel/src/main/java/org/dflib/jjava/jupyter/kernel/util/TextColor.java @@ -32,6 +32,8 @@ public enum TextColor { WHITE_BG(47), RESET_BG(49), + BOLD_RESET_FG(39, 1), + BOLD(1), UNDERLINE(4), SWAP_FG_BG(7),