From c0c34ec2472e120a9888b631f879e92f70f777d2 Mon Sep 17 00:00:00 2001 From: Rob Lorch Date: Wed, 22 May 2024 11:35:53 -0500 Subject: [PATCH 1/2] Use version of simulation that processes program as string rather than filename --- src/main/java/edu/uiowa/kind2/lsp/Kind2LanguageServer.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/edu/uiowa/kind2/lsp/Kind2LanguageServer.java b/src/main/java/edu/uiowa/kind2/lsp/Kind2LanguageServer.java index 52f39d9..822c7e9 100644 --- a/src/main/java/edu/uiowa/kind2/lsp/Kind2LanguageServer.java +++ b/src/main/java/edu/uiowa/kind2/lsp/Kind2LanguageServer.java @@ -747,9 +747,12 @@ public CompletableFuture interpret(String uri, String main, return CompletableFuture.supplyAsync(() -> { try { Kind2Api api = getPresetKind2Api(); - return api.interpret(new URI(uri), main, json); + api.includeDir(Paths.get(new URI(uri)).getParent().toString()); + String filepath = computeRelativeFilepath(workingDirectory, uri); + api.setFakeFilepath(filepath); + return api.interpret(getText(uri), main, json); } catch (URISyntaxException | InterruptedException - | ExecutionException e) { + | ExecutionException | IOException e) { throw new ResponseErrorException(new ResponseError( ResponseErrorCode.InternalError, e.getMessage(), e)); } From 056abf343f95831005fc31236fd2c4515634df86 Mon Sep 17 00:00:00 2001 From: Daniel Larraz Date: Wed, 22 May 2024 12:20:41 -0500 Subject: [PATCH 2/2] Bump Kind 2 Java API version to 0.3.9 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 1ca4e93..39a879b 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ repositories { } dependencies { - implementation 'edu.uiowa.cs.clc:kind2-java-api:0.3.8' + implementation 'edu.uiowa.cs.clc:kind2-java-api:0.3.9' implementation 'org.eclipse.lsp4j:org.eclipse.lsp4j:0.13.0' testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.2' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.2'