feat: basic semantics mapping and visualization

14 files changed, 240 insertions, 38 deletions

diff --git a/subprojects/language-web/build.gradle.kts b/subprojects/language-web/build.gradle.kts
index 562a1bd9..20e5780b 100644
--- a/subprojects/language-web/build.gradle.kts
+++ b/subprojects/language-web/build.gradle.kts
@@ -17,6 +17,8 @@ val webapp: Configuration by configurations.creating {
 dependencies {
         implementation(project(":refinery-language"))
         implementation(project(":refinery-language-ide"))
+        implementation(project(":refinery-language-semantics"))
+        implementation(project(":refinery-store-query-viatra"))
         implementation(libs.jetty.server)
         implementation(libs.jetty.servlet)
         implementation(libs.jetty.websocket.api)
diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/SemanticsErrorResult.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/SemanticsErrorResult.java
new file mode 100644
index 00000000..ce34ef6c
--- /dev/null
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/SemanticsErrorResult.java
@@ -0,0 +1,9 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.language.web.semantics;
+
+public record SemanticsErrorResult(String error) implements SemanticsResult {
+}
diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/SemanticsResult.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/SemanticsResult.java
new file mode 100644
index 00000000..92639578
--- /dev/null
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/SemanticsResult.java
@@ -0,0 +1,11 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.language.web.semantics;
+
+import org.eclipse.xtext.web.server.IServiceResult;
+
+public sealed interface SemanticsResult extends IServiceResult permits SemanticsSuccessResult, SemanticsErrorResult {
+}
diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/SemanticsService.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/SemanticsService.java
new file mode 100644
index 00000000..483d24f6
--- /dev/null
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/SemanticsService.java
@@ -0,0 +1,155 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.language.web.semantics;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+import com.google.inject.Inject;
+import com.google.inject.Provider;
+import com.google.inject.Singleton;
+import org.eclipse.xtext.service.OperationCanceledManager;
+import org.eclipse.xtext.util.CancelIndicator;
+import org.eclipse.xtext.web.server.model.AbstractCachedService;
+import org.eclipse.xtext.web.server.model.IXtextWebDocument;
+import org.eclipse.xtext.web.server.model.XtextWebDocument;
+import org.eclipse.xtext.web.server.validation.ValidationService;
+import org.jetbrains.annotations.Nullable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import tools.refinery.language.model.problem.Problem;
+import tools.refinery.language.semantics.model.ModelInitializer;
+import tools.refinery.language.semantics.model.SemanticsUtils;
+import tools.refinery.store.model.Model;
+import tools.refinery.store.model.ModelStore;
+import tools.refinery.store.query.viatra.ViatraModelQueryAdapter;
+import tools.refinery.store.reasoning.ReasoningAdapter;
+import tools.refinery.store.reasoning.ReasoningStoreAdapter;
+import tools.refinery.store.reasoning.literal.Concreteness;
+import tools.refinery.store.reasoning.representation.PartialRelation;
+import tools.refinery.store.representation.TruthValue;
+import tools.refinery.store.tuple.Tuple;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.TreeMap;
+
+@Singleton
+public class SemanticsService extends AbstractCachedService<SemanticsResult> {
+        private static final Logger LOG = LoggerFactory.getLogger(SemanticsService.class);
+
+        @Inject
+        private SemanticsUtils semanticsUtils;
+
+        @Inject
+        private ValidationService validationService;
+
+        @Inject
+        private Provider<ModelInitializer> initializerProvider;
+
+        @Inject
+        private OperationCanceledManager operationCanceledManager;
+
+        @Override
+        public SemanticsResult compute(IXtextWebDocument doc, CancelIndicator cancelIndicator) {
+                long start = System.currentTimeMillis();
+                Problem problem = getProblem(doc, cancelIndicator);
+                if (problem == null) {
+                        return null;
+                }
+                var initializer = initializerProvider.get();
+                var builder = ModelStore.builder()
+                                .with(ViatraModelQueryAdapter.builder());
+                operationCanceledManager.checkCanceled(cancelIndicator);
+                try {
+                        var modelSeed = initializer.createModel(problem, builder);
+                        operationCanceledManager.checkCanceled(cancelIndicator);
+                        var nodeTrace = getNodeTrace(initializer);
+                        operationCanceledManager.checkCanceled(cancelIndicator);
+                        var store = builder.build();
+                        operationCanceledManager.checkCanceled(cancelIndicator);
+                        var model = store.getAdapter(ReasoningStoreAdapter.class).createInitialModel(modelSeed);
+                        operationCanceledManager.checkCanceled(cancelIndicator);
+                        var partialInterpretation = getPartialInterpretation(initializer, model, cancelIndicator);
+                        long end = System.currentTimeMillis();
+                        LOG.info("Computed semantics for {} ({}) in {}ms", doc.getResourceId(), doc.getStateId(), end - start);
+                        return new SemanticsSuccessResult(nodeTrace, partialInterpretation);
+                } catch (RuntimeException e) {
+                        LOG.error("Error while computing semantics", e);
+                        return new SemanticsErrorResult(e.toString());
+                }
+        }
+
+        @Nullable
+        private Problem getProblem(IXtextWebDocument doc, CancelIndicator cancelIndicator) {
+                if (!(doc instanceof XtextWebDocument webDoc)) {
+                        throw new IllegalArgumentException("Unexpected IXtextWebDocument: " + doc);
+                }
+                var validationResult = webDoc.getCachedServiceResult(validationService, cancelIndicator, true);
+                boolean hasError = validationResult.getIssues().stream()
+                                .anyMatch(issue -> "error".equals(issue.getSeverity()));
+                if (hasError) {
+                        return null;
+                }
+                var contents = doc.getResource().getContents();
+                if (contents.isEmpty()) {
+                        return null;
+                }
+                var model = contents.get(0);
+                if (!(model instanceof Problem problem)) {
+                        return null;
+                }
+                return problem;
+        }
+
+        private List<String> getNodeTrace(ModelInitializer initializer) {
+                var nodeTrace = new String[initializer.getNodeCount()];
+                for (var entry : initializer.getNodeTrace().keyValuesView()) {
+                        var node = entry.getOne();
+                        var index = entry.getTwo();
+                        nodeTrace[index] = semanticsUtils.getName(node).orElse(null);
+                }
+                return Arrays.asList(nodeTrace);
+        }
+
+        private JsonObject getPartialInterpretation(ModelInitializer initializer, Model model,
+                                                                                                CancelIndicator cancelIndicator) {
+                var adapter = model.getAdapter(ReasoningAdapter.class);
+                var json = new JsonObject();
+                for (var entry : initializer.getRelationTrace().entrySet()) {
+                        var relation = entry.getKey();
+                        var partialSymbol = entry.getValue();
+                        var tuples = getTuplesJson(adapter, partialSymbol);
+                        var name = semanticsUtils.getName(relation).orElse(partialSymbol.name());
+                        json.add(name, tuples);
+                        operationCanceledManager.checkCanceled(cancelIndicator);
+                }
+                return json;
+        }
+
+        private static JsonArray getTuplesJson(ReasoningAdapter adapter, PartialRelation partialSymbol) {
+                var interpretation = adapter.getPartialInterpretation(Concreteness.PARTIAL, partialSymbol);
+                var cursor = interpretation.getAll();
+                var map = new TreeMap<Tuple, TruthValue>();
+                while (cursor.move()) {
+                        map.put(cursor.getKey(), cursor.getValue());
+                }
+                var tuples = new JsonArray();
+                for (var entry : map.entrySet()) {
+                        tuples.add(toArray(entry.getKey(), entry.getValue()));
+                }
+                return tuples;
+        }
+
+        private static JsonArray toArray(Tuple tuple, TruthValue value) {
+                int arity = tuple.getSize();
+                var json = new JsonArray(arity + 1);
+                for (int i = 0; i < arity; i++) {
+                        json.add(tuple.get(i));
+                }
+                json.add(value.toString());
+                return json;
+        }
+}
diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/SemanticsSuccessResult.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/SemanticsSuccessResult.java
new file mode 100644
index 00000000..15fd4b55
--- /dev/null
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/SemanticsSuccessResult.java
@@ -0,0 +1,13 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.language.web.semantics;
+
+import com.google.gson.JsonObject;
+
+import java.util.List;
+
+public record SemanticsSuccessResult(List<String> nodes, JsonObject partialInterpretation) implements SemanticsResult {
+}
diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/TransactionExecutor.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/TransactionExecutor.java
index 0135d8f5..2c0e9329 100644
--- a/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/TransactionExecutor.java
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/TransactionExecutor.java
@@ -134,7 +134,7 @@ public class TransactionExecutor implements IDisposable, PrecomputationListener
          * @throws UnknownLanguageException if the Xtext language cannot be determined
          */
         protected Injector getInjector(IServiceContext context) {
-                IResourceServiceProvider resourceServiceProvider = null;
+                IResourceServiceProvider resourceServiceProvider;
                 var resourceName = context.getParameter("resource");
                 if (resourceName == null) {
                         resourceName = "";
diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/message/XtextWebOkResponse.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/message/XtextWebOkResponse.java
index 73527ee5..c3379329 100644
--- a/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/message/XtextWebOkResponse.java
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/message/XtextWebOkResponse.java
@@ -5,12 +5,11 @@
  */
 package tools.refinery.language.web.xtext.server.message;
 
-import java.util.Objects;
-
+import com.google.gson.annotations.SerializedName;
 import org.eclipse.xtext.web.server.IServiceResult;
 import org.eclipse.xtext.web.server.IUnwrappableServiceResult;
 
-import com.google.gson.annotations.SerializedName;
+import java.util.Objects;
 
 public final class XtextWebOkResponse implements XtextWebResponse {
         private String id;
@@ -19,7 +18,6 @@ public final class XtextWebOkResponse implements XtextWebResponse {
         private Object responseData;
 
         public XtextWebOkResponse(String id, Object responseData) {
-                super();
                 this.id = id;
                 this.responseData = responseData;
         }
diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/message/XtextWebResponse.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/message/XtextWebResponse.java
index 61444c99..c370fb56 100644
--- a/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/message/XtextWebResponse.java
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/message/XtextWebResponse.java
@@ -5,5 +5,5 @@
  */
 package tools.refinery.language.web.xtext.server.message;
 
-public sealed interface XtextWebResponse permits XtextWebOkResponse,XtextWebErrorResponse,XtextWebPushMessage {
+public sealed interface XtextWebResponse permits XtextWebOkResponse, XtextWebErrorResponse, XtextWebPushMessage {
 }
diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/push/PushServiceDispatcher.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/push/PushServiceDispatcher.java
index 4c9135c8..d4a8c433 100644
--- a/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/push/PushServiceDispatcher.java
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/push/PushServiceDispatcher.java
@@ -5,16 +5,28 @@
  */
 package tools.refinery.language.web.xtext.server.push;
 
+import com.google.inject.Inject;
 import org.eclipse.xtext.web.server.IServiceContext;
 import org.eclipse.xtext.web.server.XtextServiceDispatcher;
+import org.eclipse.xtext.web.server.model.PrecomputedServiceRegistry;
 import org.eclipse.xtext.web.server.model.XtextWebDocument;
 
 import com.google.inject.Singleton;
 
+import tools.refinery.language.web.semantics.SemanticsService;
 import tools.refinery.language.web.xtext.server.SubscribingServiceContext;
 
 @Singleton
 public class PushServiceDispatcher extends XtextServiceDispatcher {
+        @Inject
+        private SemanticsService semanticsService;
+
+        @Override
+        @Inject
+        protected void registerPreComputedServices(PrecomputedServiceRegistry registry) {
+                super.registerPreComputedServices(registry);
+                registry.addPrecomputedService(semanticsService);
+        }
 
         @Override
         protected XtextWebDocument getFullTextDocument(String fullText, String resourceId, IServiceContext context) {
diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/push/PushWebDocument.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/push/PushWebDocument.java
index 56fd12c9..dfbd4878 100644
--- a/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/push/PushWebDocument.java
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/push/PushWebDocument.java
@@ -5,11 +5,7 @@
  */
 package tools.refinery.language.web.xtext.server.push;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
+import com.google.common.collect.ImmutableList;
 import org.eclipse.xtext.util.CancelIndicator;
 import org.eclipse.xtext.web.server.IServiceResult;
 import org.eclipse.xtext.web.server.model.AbstractCachedService;
@@ -17,11 +13,13 @@ import org.eclipse.xtext.web.server.model.DocumentSynchronizer;
 import org.eclipse.xtext.web.server.model.XtextWebDocument;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
-import com.google.common.collect.ImmutableList;
-
 import tools.refinery.language.web.xtext.server.ResponseHandlerException;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 public class PushWebDocument extends XtextWebDocument {
         private static final Logger LOG = LoggerFactory.getLogger(PushWebDocument.class);
 
@@ -36,37 +34,31 @@ public class PushWebDocument extends XtextWebDocument {
                 }
         }
 
-        public boolean addPrecomputationListener(PrecomputationListener listener) {
+        public void addPrecomputationListener(PrecomputationListener listener) {
                 synchronized (precomputationListeners) {
                         if (precomputationListeners.contains(listener)) {
-                                return false;
+                                return;
                         }
                         precomputationListeners.add(listener);
                         listener.onSubscribeToPrecomputationEvents(getResourceId(), this);
-                        return true;
                 }
         }
 
-        public boolean removePrecomputationListener(PrecomputationListener listener) {
+        public void removePrecomputationListener(PrecomputationListener listener) {
                 synchronized (precomputationListeners) {
-                        return precomputationListeners.remove(listener);
+                        precomputationListeners.remove(listener);
                 }
         }
 
         public <T extends IServiceResult> void precomputeServiceResult(AbstractCachedService<T> service, String serviceName,
                         CancelIndicator cancelIndicator, boolean logCacheMiss) {
-                var result = getCachedServiceResult(service, cancelIndicator, logCacheMiss);
-                if (result == null) {
-                        LOG.error("{} service returned null result", serviceName);
-                        return;
-                }
                 var serviceClass = service.getClass();
                 var previousResult = precomputedServices.get(serviceClass);
-                if (previousResult != null && previousResult.equals(result)) {
-                        return;
-                }
+                var result = getCachedServiceResult(service, cancelIndicator, logCacheMiss);
                 precomputedServices.put(serviceClass, result);
-                notifyPrecomputationListeners(serviceName, result);
+                if (result != null && !result.equals(previousResult)) {
+                        notifyPrecomputationListeners(serviceName, result);
+                }
         }
 
         private <T extends IServiceResult> void notifyPrecomputationListeners(String serviceName, T result) {
diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/push/PushWebDocumentAccess.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/push/PushWebDocumentAccess.java
index d9e548cd..c72e8e67 100644
--- a/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/push/PushWebDocumentAccess.java
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/xtext/server/push/PushWebDocumentAccess.java
@@ -18,6 +18,7 @@ import org.eclipse.xtext.web.server.syntaxcoloring.HighlightingService;
 import org.eclipse.xtext.web.server.validation.ValidationService;
 
 import com.google.inject.Inject;
+import tools.refinery.language.web.semantics.SemanticsService;
 
 public class PushWebDocumentAccess extends XtextWebDocumentAccess {
 
@@ -49,7 +50,7 @@ public class PushWebDocumentAccess extends XtextWebDocumentAccess {
                         precomputeServiceResult(service, false);
                 }
         }
-        
+
         protected <T extends IServiceResult> void precomputeServiceResult(AbstractCachedService<T> service, boolean logCacheMiss) {
                 var serviceName = getPrecomputedServiceName(service);
                 readOnly(new CancelableUnitOfWork<Void, IXtextWebDocument>() {
@@ -60,7 +61,7 @@ public class PushWebDocumentAccess extends XtextWebDocumentAccess {
                         }
                 });
         }
-        
+
         protected String getPrecomputedServiceName(AbstractCachedService<? extends IServiceResult> service) {
                 if (service instanceof ValidationService) {
                         return "validate";
@@ -68,6 +69,9 @@ public class PushWebDocumentAccess extends XtextWebDocumentAccess {
                 if (service instanceof HighlightingService) {
                         return "highlight";
                 }
+                if (service instanceof SemanticsService) {
+                        return "semantics";
+                }
                 throw new IllegalArgumentException("Unknown precomputed service: " + service);
         }
 }
diff --git a/subprojects/language-web/src/test/java/tools/refinery/language/web/ProblemWebSocketServletIntegrationTest.java b/subprojects/language-web/src/test/java/tools/refinery/language/web/ProblemWebSocketServletIntegrationTest.java
index 927eeab1..99ca5420 100644
--- a/subprojects/language-web/src/test/java/tools/refinery/language/web/ProblemWebSocketServletIntegrationTest.java
+++ b/subprojects/language-web/src/test/java/tools/refinery/language/web/ProblemWebSocketServletIntegrationTest.java
@@ -93,7 +93,7 @@ class ProblemWebSocketServletIntegrationTest {
                 clientSocket.waitForTestResult();
                 assertThat(clientSocket.getCloseStatusCode(), equalTo(StatusCode.NORMAL));
                 var responses = clientSocket.getResponses();
-                assertThat(responses, hasSize(5));
+                assertThat(responses, hasSize(7));
                 assertThat(responses.get(0), equalTo("{\"id\":\"foo\",\"response\":{\"stateId\":\"-80000000\"}}"));
                 assertThat(responses.get(1), startsWith(
                                 "{\"resource\":\"test.problem\",\"stateId\":\"-80000000\",\"service\":\"highlight\"," +
@@ -101,10 +101,16 @@ class ProblemWebSocketServletIntegrationTest {
                 assertThat(responses.get(2), equalTo(
                                 "{\"resource\":\"test.problem\",\"stateId\":\"-80000000\",\"service\":\"validate\"," +
                                                 "\"push\":{\"issues\":[]}}"));
-                assertThat(responses.get(3), equalTo("{\"id\":\"bar\",\"response\":{\"stateId\":\"-7fffffff\"}}"));
-                assertThat(responses.get(4), startsWith(
+                assertThat(responses.get(3), startsWith(
+                                "{\"resource\":\"test.problem\",\"stateId\":\"-80000000\",\"service\":\"semantics\"," +
+                                                "\"push\":{"));
+                assertThat(responses.get(4), equalTo("{\"id\":\"bar\",\"response\":{\"stateId\":\"-7fffffff\"}}"));
+                assertThat(responses.get(5), startsWith(
                                 "{\"resource\":\"test.problem\",\"stateId\":\"-7fffffff\",\"service\":\"highlight\"," +
                                                 "\"push\":{\"regions\":["));
+                assertThat(responses.get(6), startsWith(
+                                "{\"resource\":\"test.problem\",\"stateId\":\"-7fffffff\",\"service\":\"semantics\"," +
+                                                "\"push\":{"));
         }
 
         @WebSocket
@@ -117,14 +123,14 @@ class ProblemWebSocketServletIntegrationTest {
                                                         "\"fullText\":\"class Person.\n\"}}",
                                         Callback.NOOP
                         );
-                        case 3 -> //noinspection TextBlockMigration
+                        case 4 -> //noinspection TextBlockMigration
                                         session.sendText(
                                         "{\"id\":\"bar\",\"request\":{\"resource\":\"test.problem\",\"serviceType\":\"update\"," +
                                                         "\"requiredStateId\":\"-80000000\",\"deltaText\":\"indiv q.\nnode(q).\n\"," +
                                                         "\"deltaOffset\":\"0\",\"deltaReplaceLength\":\"0\"}}",
                                         Callback.NOOP
                         );
-                        case 5 -> session.close();
+                        case 7 -> session.close();
                         }
                 }
         }
diff --git a/subprojects/language-web/src/test/java/tools/refinery/language/web/tests/RestartableCachedThreadPool.java b/subprojects/language-web/src/test/java/tools/refinery/language/web/tests/RestartableCachedThreadPool.java
index 09079aa8..991ff114 100644
--- a/subprojects/language-web/src/test/java/tools/refinery/language/web/tests/RestartableCachedThreadPool.java
+++ b/subprojects/language-web/src/test/java/tools/refinery/language/web/tests/RestartableCachedThreadPool.java
@@ -35,7 +35,7 @@ public class RestartableCachedThreadPool implements ExecutorService {
         public void waitForTermination() {
                 boolean result = false;
                 try {
-                        result = delegate.awaitTermination(1, TimeUnit.SECONDS);
+                        result = delegate.awaitTermination(10, TimeUnit.SECONDS);
                 } catch (InterruptedException e) {
                         LOG.warn("Interrupted while waiting for delegate executor to stop", e);
                 }
diff --git a/subprojects/language-web/src/test/java/tools/refinery/language/web/xtext/servlet/TransactionExecutorTest.java b/subprojects/language-web/src/test/java/tools/refinery/language/web/xtext/servlet/TransactionExecutorTest.java
index 841bacd3..b7142506 100644
--- a/subprojects/language-web/src/test/java/tools/refinery/language/web/xtext/servlet/TransactionExecutorTest.java
+++ b/subprojects/language-web/src/test/java/tools/refinery/language/web/xtext/servlet/TransactionExecutorTest.java
@@ -95,7 +95,7 @@ class TransactionExecutorTest {
                                                 "0")));
 
                 var captor = newCaptor();
-                verify(responseHandler, times(2)).onResponse(captor.capture());
+                verify(responseHandler, times(3)).onResponse(captor.capture());
                 var newStateId = getStateId("bar", captor.getAllValues().get(0));
                 assertHighlightingResponse(newStateId, captor.getAllValues().get(1));
         }
@@ -126,7 +126,7 @@ class TransactionExecutorTest {
         private String updateFullText(ArgumentCaptor<XtextWebResponse> captor) throws ResponseHandlerException {
                 var responseHandler = sendRequestAndWaitForAllResponses(new XtextWebRequest("foo", UPDATE_FULL_TEXT_PARAMS));
 
-                verify(responseHandler, times(3)).onResponse(captor.capture());
+                verify(responseHandler, times(4)).onResponse(captor.capture());
                 return getStateId("foo", captor.getAllValues().get(0));
         }