From d684f3acd2749d99d46ee05e06ac7dd08389ca4e Mon Sep 17 00:00:00 2001
From: dgelessus <dgelessus@users.noreply.github.com>
Date: Thu, 23 Nov 2023 11:16:14 +0100
Subject: [PATCH] Update ProB Java API to current 4.12.3-SNAPSHOT
And adjust bExpressionCompleter for incompatible API change.
---
build.gradle | 2 +-
src/main/java/de/prob2/jupyter/CommandUtils.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/build.gradle b/build.gradle
index d9d98d2..742ddb6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -33,7 +33,7 @@ configurations.all {
dependencies {
implementation(group: "ch.qos.logback", name: "logback-classic", version: "1.3.7")
implementation(group: "com.google.guava", name: "guava", version: "31.1-jre")
- implementation(group: "de.hhu.stups", name: "de.prob2.kernel", version: "4.12.2-SNAPSHOT")
+ implementation(group: "de.hhu.stups", name: "de.prob2.kernel", version: "4.12.3-SNAPSHOT")
implementation(group: "io.github.spencerpark", name: "jupyter-jvm-basekernel", version: "2.3.0")
implementation(group: "org.jetbrains", name: "annotations", version: "24.0.1")
implementation(group: "se.sawano.java", name: "alphanumeric-comparator", version: "1.4.1")
diff --git a/src/main/java/de/prob2/jupyter/CommandUtils.java b/src/main/java/de/prob2/jupyter/CommandUtils.java
index 5ac584f..1c173bd 100644
--- a/src/main/java/de/prob2/jupyter/CommandUtils.java
+++ b/src/main/java/de/prob2/jupyter/CommandUtils.java
@@ -406,14 +406,14 @@ public final class CommandUtils {
}
final CompleteIdentifierCommand cmdExact = new CompleteIdentifierCommand(prefix);
- cmdExact.setIncludeKeywords(true);
+ cmdExact.setKeywords(CompleteIdentifierCommand.KeywordContext.ALL);
trace.getStateSpace().execute(cmdExact);
// Use LinkedHashSet to remove duplicates while maintaining order.
final Set<String> completions = new LinkedHashSet<>(cmdExact.getCompletions());
final CompleteIdentifierCommand cmdIgnoreCase = new CompleteIdentifierCommand(prefix);
cmdIgnoreCase.setIgnoreCase(true);
- cmdIgnoreCase.setIncludeKeywords(true);
+ cmdIgnoreCase.setKeywords(CompleteIdentifierCommand.KeywordContext.ALL);
trace.getStateSpace().execute(cmdIgnoreCase);
completions.addAll(cmdIgnoreCase.getCompletions());
--
GitLab