Remove CommandUtils.(inspect|complete)In(BExpression|Preference)

All code now uses the (bExpression|preference)(Inspector|Completer)
methods instead.

src/main/java/de/prob2/jupyter/CommandUtils.java

@@ -393,7 +393,8 @@ public final class CommandUtils {
 		return result;
 	}
 	
-	public static @Nullable DisplayData inspectInBExpression(final @NotNull Trace trace, final @NotNull String code, final int at) {
+	public static @NotNull Inspector bExpressionInspector(final @NotNull Trace trace) {
+		return (code, at) -> {
 			final Matcher identifierMatcher = CommandUtils.matchBIdentifierAt(code, at);
 			if (identifierMatcher == null) {
 				return null;
@@ -404,13 +405,11 @@ public final class CommandUtils {
 			final AbstractEvalResult currentValue = trace.evalCurrent(formula);
 			
 			return formatBExpressionInspectText(identifier, type, currentValue);
+		};
 	}
 	
-	public static @NotNull Inspector bExpressionInspector(final @NotNull Trace trace) {
-		return (code, at) -> inspectInBExpression(trace, code, at);
-	}
-	
-	public static @NotNull ReplacementOptions completeInBExpression(final @NotNull Trace trace, final @NotNull String code, final int at) {
+	public static @NotNull Completer bExpressionCompleter(final @NotNull Trace trace) {
+		return (code, at) -> {
 			final Matcher identifierMatcher = matchBIdentifierAt(code, at);
 			// Try to find the identifier that the cursor is in.
 			// If the cursor is not on an identifier, default to empty string, i. e. show all possible completions.
@@ -440,10 +439,7 @@ public final class CommandUtils {
 			completions.addAll(cmdIgnoreCase.getCompletions());
 			
 			return new ReplacementOptions(new ArrayList<>(completions), start, end);
-	}
-	
-	public static @NotNull Completer bExpressionCompleter(final @NotNull Trace trace) {
-		return (code, at) -> completeInBExpression(trace, code, at);
+		};
 	}
 	
 	private static @NotNull DisplayData formatPreferenceInspectText(final String name, final String currentValue, final ProBPreference pref) {
@@ -486,7 +482,8 @@ public final class CommandUtils {
 		return result;
 	}
 	
-	public static @Nullable DisplayData inspectInPreference(final @NotNull Trace trace, final @NotNull String code, final int at) {
+	public static @NotNull Inspector preferenceInspector(final @NotNull Trace trace) {
+		return (code, at) -> {
 			final Matcher prefNameMatcher = B_IDENTIFIER_PATTERN.matcher(code);
 			if (prefNameMatcher.lookingAt() && at <= prefNameMatcher.end()) {
 				final String name = prefNameMatcher.group();
@@ -504,13 +501,11 @@ public final class CommandUtils {
 			} else {
 				return null;
 			}
+		};
 	}
 	
-	public static @NotNull Inspector preferenceInspector(final @NotNull Trace trace) {
-		return (code, at) -> inspectInPreference(trace, code, at);
-	}
-	
-	public static @Nullable ReplacementOptions completeInPreference(final @NotNull Trace trace, final @NotNull String code, final int at) {
+	public static @NotNull Completer preferenceCompleter(final @NotNull Trace trace) {
+		return (code, at) -> {
 			final Matcher prefNameMatcher = B_IDENTIFIER_PATTERN.matcher(code);
 			if (prefNameMatcher.lookingAt() && at <= prefNameMatcher.end()) {
 				final String prefix = code.substring(prefNameMatcher.start(), at);
@@ -521,9 +516,6 @@ public final class CommandUtils {
 			} else {
 				return null;
 			}
-	}
-	
-	public static @NotNull Completer preferenceCompleter(final @NotNull Trace trace) {
-		return (code, at) -> completeInPreference(trace, code, at);
+		};
 	}
 }