From e62c82bf262b761e375ef41a9a73890cdb149788 Mon Sep 17 00:00:00 2001 From: MKZaito <127297267+MKZaito@users.noreply.github.com> Date: Tue, 17 Mar 2026 16:27:17 +0100 Subject: [PATCH 1/2] use mclsg version 7.8.4 with new ServerOptions --- gradle.properties | 2 +- .../language_access/SysMLv2LanguageAccess.java | 12 ++++++++++-- .../language_access/SysMLv2LspCoCoRunner.java | 15 +++++---------- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/gradle.properties b/gradle.properties index fa0e56fe..06979b58 100644 --- a/gradle.properties +++ b/gradle.properties @@ -19,7 +19,7 @@ sysmlGitlab = https://git.rwth-aachen.de/api/v4/projects/37093/packages/m # Dependencies mc_version = 7.8.0 -mclsg_version = 7.8.3 +mclsg_version = 7.8.4 se_commons_version = 7.8.0 assertj_version = 3.21.0 junit_version = 5.8.2 diff --git a/language-server/src/main/java/de/monticore/lang/sysmlv2/_lsp/language_access/SysMLv2LanguageAccess.java b/language-server/src/main/java/de/monticore/lang/sysmlv2/_lsp/language_access/SysMLv2LanguageAccess.java index 8a674cd9..64c9c364 100644 --- a/language-server/src/main/java/de/monticore/lang/sysmlv2/_lsp/language_access/SysMLv2LanguageAccess.java +++ b/language-server/src/main/java/de/monticore/lang/sysmlv2/_lsp/language_access/SysMLv2LanguageAccess.java @@ -17,14 +17,22 @@ public class SysMLv2LanguageAccess extends SysMLv2LanguageAccessTOP { /** Convenience */ public SysMLv2LanguageAccess() { - super(new DocumentManager(), new SysMLv2ScopeManager()); + super(new DocumentManager(), new SysMLv2ScopeManager(), "Default"); } public SysMLv2LanguageAccess( DocumentManager documentManager, SysMLv2ScopeManager scopeManager) { - super(documentManager, scopeManager); + super(documentManager, scopeManager, "Default"); + } + + public SysMLv2LanguageAccess( + DocumentManager documentManager, + SysMLv2ScopeManager scopeManager, + String cocoCheckerMode) + { + super(documentManager, scopeManager, cocoCheckerMode); } @Override diff --git a/language-server/src/main/java/de/monticore/lang/sysmlv2/_lsp/language_access/SysMLv2LspCoCoRunner.java b/language-server/src/main/java/de/monticore/lang/sysmlv2/_lsp/language_access/SysMLv2LspCoCoRunner.java index 329ad223..3701b97d 100644 --- a/language-server/src/main/java/de/monticore/lang/sysmlv2/_lsp/language_access/SysMLv2LspCoCoRunner.java +++ b/language-server/src/main/java/de/monticore/lang/sysmlv2/_lsp/language_access/SysMLv2LspCoCoRunner.java @@ -6,8 +6,9 @@ import de.se_rwth.commons.logging.Log; public class SysMLv2LspCoCoRunner extends SysMLv2LspCoCoRunnerTOP { - public SysMLv2LspCoCoRunner(DocumentManager documentManager) { - super(documentManager); + + public SysMLv2LspCoCoRunner(DocumentManager documentManager, String cocoCheckerMode) { + super(documentManager, cocoCheckerMode); } @Override @@ -17,14 +18,8 @@ public boolean needsSymbols() { @Override public void runAllCoCos(ASTSysMLModel ast){ - if(System.getenv("SYSML_DEFAULT_COCOS") == null) { - tool.runDefaultCoCos(ast); - } - // Runs additional (verification-specific) CoCos when variable is set. - // Defaults to not running them. - if(System.getenv("SYSML_ADDITIONAL_COCOS") != null) { - tool.runAdditionalCoCos(ast); - } + super.runAllCoCos(ast); + //ignores SYSML_ADDITIONAL_COCOS and SYSML_DEFAULT_COCOS } @Override From d32666e46009474492dcfd31ac3fb1a48d5d0fe2 Mon Sep 17 00:00:00 2001 From: MKZaito <127297267+MKZaito@users.noreply.github.com> Date: Tue, 17 Mar 2026 16:27:44 +0100 Subject: [PATCH 2/2] version bumb 7.8.28 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 06979b58..8f407d5b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -25,4 +25,4 @@ assertj_version = 3.21.0 junit_version = 5.8.2 # Version of published artifacts -version = 7.8.27 +version = 7.8.28