Address review comments

eclipse-glsp · Jul 24, 2023 · 5a1d4d1 · 5a1d4d1
1 parent aa368c0
commit 5a1d4d1
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/...lsp.server/src/org/eclipse/glsp/server/features/core/model/RequestModelActionHandler.java b/...lsp.server/src/org/eclipse/glsp/server/features/core/model/RequestModelActionHandler.java
@@ -70,16 +70,7 @@ public List<Action> executeAction(final RequestModelAction action) {
 
       ProgressMonitor monitor = notifyStartLoading();
       if (isReconnecting) {
-         GModelRoot oldModel = modelState.getRoot();
-         if (oldModel != null) {
-            // use current modelRoot of modelState and submit
-            modelState.updateRoot(oldModel);
-            // decrease revision by one, as each submit will increase it by one;
-            // the next save would produce warning that source model was changed otherwise
-            modelState.getRoot().setRevision(oldModel.getRevision() - 1);
-         } else {
-            sourceModelStorage.loadSourceModel(action);
-         }
+         handleReconnect(action);
       } else {
          sourceModelStorage.loadSourceModel(action);
       }
@@ -92,6 +83,17 @@ public List<Action> executeAction(final RequestModelAction action) {
       return modelSubmissionHandler.submitModel();
    }
 
+   protected void handleReconnect(final RequestModelAction action) {
+      GModelRoot oldModel = modelState.getRoot();
+      if (oldModel != null) {
+         // decrease revision by one, as each submit will increase it by one;
+         // the next save would produce warning that source model was changed otherwise
+         modelState.getRoot().setRevision(oldModel.getRevision() - 1);
+      } else {
+         sourceModelStorage.loadSourceModel(action);
+      }
+   }
+
    protected ProgressMonitor notifyStartLoading() {
       String message = "Model loading in progress";
       actionDispatcher.dispatch(ServerStatusUtil.info(message));