branch: elpa/geiser-kawa commit e4679f788953dcf8cdbaecb8bf7f5066bee78e0f Author: spellcard199 <spellcard...@protonmail.com> Commit: spellcard199 <spellcard...@protonmail.com>
pom.xml update kawa-devutil dep + fix code accordingly --- pom.xml | 2 +- src/main/java/kawageiser/Geiser.java | 2 +- src/main/java/kawageiser/java/GeiserCompleteJava.java | 9 ++++----- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 946888d..407c9b8 100644 --- a/pom.xml +++ b/pom.xml @@ -63,7 +63,7 @@ <dependency> <groupId>com.gitlab.spellcard199</groupId> <artifactId>kawa-devutil</artifactId> - <version>e29bdc7be6ebb5faad1ae1da397c2c8a76a15850</version> + <version>457dd8be41dd4d0a97097c3a56a6931878233fb2</version> </dependency> <!-- https://mvnrepository.com/artifact/org.testng/testng --> diff --git a/src/main/java/kawageiser/Geiser.java b/src/main/java/kawageiser/Geiser.java index 8f8e843..2a20ca3 100644 --- a/src/main/java/kawageiser/Geiser.java +++ b/src/main/java/kawageiser/Geiser.java @@ -6,7 +6,7 @@ package kawageiser; import gnu.expr.Language; -import kawadevutil.complete.CompletionDataForJavaPackage; +import kawadevutil.complete.java.data.CompletionDataForJavaPackage; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/kawageiser/java/GeiserCompleteJava.java b/src/main/java/kawageiser/java/GeiserCompleteJava.java index dd21220..653e2fe 100644 --- a/src/main/java/kawageiser/java/GeiserCompleteJava.java +++ b/src/main/java/kawageiser/java/GeiserCompleteJava.java @@ -12,7 +12,7 @@ import gnu.lists.LList; import gnu.mapping.Environment; import gnu.math.IntNum; import kawadevutil.ast.AstElemWrapper; -import kawadevutil.complete.*; +import kawadevutil.complete.java.data.*; import java.io.IOException; import java.util.ArrayList; @@ -45,7 +45,7 @@ public class GeiserCompleteJava { // Get Data Optional<CompletionDataForJava> complDataMaybe = - kawadevutil.complete.Complete.complete( + kawadevutil.complete.java.CompleteJavaFMP.complete( codeStr.toString(), Integer.valueOf(cursorIndex.toString()), lang, @@ -58,8 +58,7 @@ public class GeiserCompleteJava { } public static LList - complDataForJavaToLList( - CompletionDataForJava complData) { + complDataForJavaToLList(CompletionDataForJava complData) { // Wrap data of interest in Scheme's LList LList complDataAsLList = null; if (complData.getClass().equals(CompletionDataForJavaField.class) @@ -128,7 +127,7 @@ public class GeiserCompleteJava { Environment env) throws IOException { Optional<CompletionDataForJava> complDataMaybe = - kawadevutil.complete.Complete.complete( + kawadevutil.complete.java.CompleteJavaFMP.complete( codeStr.toString(), Integer.valueOf(cursorIndex.toString()), lang,