From 54d0f7a6c5543b1efd10ede5bf2dc4374701dad3 Mon Sep 17 00:00:00 2001 From: Marten Lohstroh Date: Fri, 29 Sep 2023 18:42:37 -0700 Subject: [PATCH 1/8] Adjusted implementation of MessageReporter --- .../src/org/lflang/generator/EclipseMessageReporter.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/org.lflang/src/org/lflang/generator/EclipseMessageReporter.java b/org.lflang/src/org/lflang/generator/EclipseMessageReporter.java index 786fbe67..f5e24133 100644 --- a/org.lflang/src/org/lflang/generator/EclipseMessageReporter.java +++ b/org.lflang/src/org/lflang/generator/EclipseMessageReporter.java @@ -33,6 +33,7 @@ import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.lsp4j.DiagnosticSeverity; import org.eclipse.xtext.diagnostics.Severity; import org.eclipse.xtext.validation.EObjectDiagnosticImpl; @@ -68,9 +69,9 @@ protected void reportWithoutPosition(DiagnosticSeverity severity, String message * {@inheritDoc} */ @Override - protected void reportOnNode(EObject node, DiagnosticSeverity severity, String message) { + protected void reportOnNode(EObject node, EStructuralFeature feature, DiagnosticSeverity severity, String message) { if (node != null) { - var diagnostic = new EObjectDiagnosticImpl(convertToXtext(severity), null, message, node, null, -1, null); + var diagnostic = new EObjectDiagnosticImpl(convertToXtext(severity), null, message, node, feature, -1, null); var range = new Range( Position.fromOneBased(diagnostic.getLine(), diagnostic.getColumn()), Position.fromOneBased(diagnostic.getLineEnd(), diagnostic.getColumnEnd())); From 8c4f61884c88ce64b9d8d54d72b8d8334ff5f1f6 Mon Sep 17 00:00:00 2001 From: Marten Lohstroh Date: Fri, 29 Sep 2023 18:44:22 -0700 Subject: [PATCH 2/8] Update submodule --- org.lflang/lingua-franca | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.lflang/lingua-franca b/org.lflang/lingua-franca index 5d6d8843..dd2b6e8d 160000 --- a/org.lflang/lingua-franca +++ b/org.lflang/lingua-franca @@ -1 +1 @@ -Subproject commit 5d6d8843b4aadb4826872c4b009805a179450720 +Subproject commit dd2b6e8d5f664396e93f6aea4d73124a25ce4d50 From d064fbad6d7fcab67053f6946a07cc79c90d08a6 Mon Sep 17 00:00:00 2001 From: Marten Lohstroh Date: Tue, 31 Oct 2023 10:09:21 -0700 Subject: [PATCH 3/8] Add gson --- org.lflang.targetplatform/org.lflang.targetplatform.target | 1 + 1 file changed, 1 insertion(+) diff --git a/org.lflang.targetplatform/org.lflang.targetplatform.target b/org.lflang.targetplatform/org.lflang.targetplatform.target index b09e3cdd..e6d556e4 100644 --- a/org.lflang.targetplatform/org.lflang.targetplatform.target +++ b/org.lflang.targetplatform/org.lflang.targetplatform.target @@ -42,6 +42,7 @@ + From 7b65a2c28d5c85ac6c925522aac091e50030a2ba Mon Sep 17 00:00:00 2001 From: Marten Lohstroh Date: Tue, 31 Oct 2023 13:23:10 -0700 Subject: [PATCH 4/8] Added gson as dependency but to no avail --- org.lflang/pom.xml | 6 ++++++ pom.xml | 1 + 2 files changed, 7 insertions(+) diff --git a/org.lflang/pom.xml b/org.lflang/pom.xml index f66eb23a..16d20f84 100644 --- a/org.lflang/pom.xml +++ b/org.lflang/pom.xml @@ -59,6 +59,12 @@ commons-cli ${commonsCliVersion} + + + com.google.code.gson + gson + ${gsonVersion} + org.eclipse.emf org.eclipse.emf.mwe2.launch diff --git a/pom.xml b/pom.xml index 453a2f15..6aea11e9 100644 --- a/pom.xml +++ b/pom.xml @@ -17,6 +17,7 @@ 1.4 + 2.10.1 1.6.21 From fe15de5cc0f2ec321ff973ef21fa27f37f8331e3 Mon Sep 17 00:00:00 2001 From: Alexander Schulz-Rosengarten Date: Wed, 1 Nov 2023 11:13:37 +0100 Subject: [PATCH 5/8] Added gson dependency to plugin manifest --- org.lflang/META-INF/MANIFEST.MF | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/org.lflang/META-INF/MANIFEST.MF b/org.lflang/META-INF/MANIFEST.MF index 3063c4bf..7d38b6ac 100644 --- a/org.lflang/META-INF/MANIFEST.MF +++ b/org.lflang/META-INF/MANIFEST.MF @@ -35,7 +35,8 @@ Require-Bundle: org.eclipse.xtext, org.eclipse.sprotty;bundle-version="0.9.0", org.lflang.epoch.mirror.json;bundle-version="1.20230618.0", org.lflang.epoch.mirror.kotlin;bundle-version="1.6.21", - org.lflang.epoch.mirror.jcip;bundle-version="1.0.0" + org.lflang.epoch.mirror.jcip;bundle-version="1.0.0", + com.google.gson;bundle-version="2.10.1" Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.lflang, org.lflang.ast, From 113ba72e97bac139eb724c15a12bc9d596d9deba Mon Sep 17 00:00:00 2001 From: Alexander Schulz-Rosengarten Date: Wed, 1 Nov 2023 11:17:02 +0100 Subject: [PATCH 6/8] Fixed imports in generator mocks --- .../src-mock/org/lflang/analyses/uclid/UclidGenerator.java | 2 +- org.lflang/src-mock/org/lflang/generator/cpp/CppGenerator.java | 2 +- .../src-mock/org/lflang/generator/rust/RustGenerator.java | 2 +- org.lflang/src-mock/org/lflang/generator/ts/TSGenerator.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/org.lflang/src-mock/org/lflang/analyses/uclid/UclidGenerator.java b/org.lflang/src-mock/org/lflang/analyses/uclid/UclidGenerator.java index 01ea0313..de2e1e9b 100644 --- a/org.lflang/src-mock/org/lflang/analyses/uclid/UclidGenerator.java +++ b/org.lflang/src-mock/org/lflang/analyses/uclid/UclidGenerator.java @@ -4,11 +4,11 @@ import java.util.List; import org.lflang.Mock; -import org.lflang.Target; import org.lflang.generator.GeneratorBase; import org.lflang.generator.LFGeneratorContext; import org.lflang.generator.TargetTypes; import org.lflang.lf.Attribute; +import org.lflang.target.Target; public class UclidGenerator extends GeneratorBase { diff --git a/org.lflang/src-mock/org/lflang/generator/cpp/CppGenerator.java b/org.lflang/src-mock/org/lflang/generator/cpp/CppGenerator.java index 71b8bf49..47bb4786 100644 --- a/org.lflang/src-mock/org/lflang/generator/cpp/CppGenerator.java +++ b/org.lflang/src-mock/org/lflang/generator/cpp/CppGenerator.java @@ -2,11 +2,11 @@ package org.lflang.generator.cpp; import org.lflang.Mock; -import org.lflang.Target; import org.lflang.generator.GeneratorBase; import org.lflang.generator.LFGeneratorContext; import org.lflang.generator.TargetTypes; import org.lflang.scoping.LFGlobalScopeProvider; +import org.lflang.target.Target; public class CppGenerator extends GeneratorBase { diff --git a/org.lflang/src-mock/org/lflang/generator/rust/RustGenerator.java b/org.lflang/src-mock/org/lflang/generator/rust/RustGenerator.java index 0e1bf23c..3ef84bf4 100644 --- a/org.lflang/src-mock/org/lflang/generator/rust/RustGenerator.java +++ b/org.lflang/src-mock/org/lflang/generator/rust/RustGenerator.java @@ -2,11 +2,11 @@ package org.lflang.generator.rust; import org.lflang.Mock; -import org.lflang.Target; import org.lflang.generator.GeneratorBase; import org.lflang.generator.LFGeneratorContext; import org.lflang.generator.TargetTypes; import org.lflang.scoping.LFGlobalScopeProvider; +import org.lflang.target.Target; public class RustGenerator extends GeneratorBase { diff --git a/org.lflang/src-mock/org/lflang/generator/ts/TSGenerator.java b/org.lflang/src-mock/org/lflang/generator/ts/TSGenerator.java index 73201deb..d5892d83 100644 --- a/org.lflang/src-mock/org/lflang/generator/ts/TSGenerator.java +++ b/org.lflang/src-mock/org/lflang/generator/ts/TSGenerator.java @@ -2,11 +2,11 @@ package org.lflang.generator.ts; import org.lflang.Mock; -import org.lflang.Target; import org.lflang.generator.GeneratorBase; import org.lflang.generator.LFGeneratorContext; import org.lflang.generator.TargetTypes; import org.lflang.scoping.LFGlobalScopeProvider; +import org.lflang.target.Target; public class TSGenerator extends GeneratorBase { From 0f7a0ce797dbcff4c72ca8b4c136c94ceac241dc Mon Sep 17 00:00:00 2001 From: Alexander Schulz-Rosengarten Date: Wed, 1 Nov 2023 11:22:13 +0100 Subject: [PATCH 7/8] Revert "Added gson as dependency but to no avail" This reverts commit 7b65a2c28d5c85ac6c925522aac091e50030a2ba. --- org.lflang/pom.xml | 6 ------ pom.xml | 1 - 2 files changed, 7 deletions(-) diff --git a/org.lflang/pom.xml b/org.lflang/pom.xml index 16d20f84..f66eb23a 100644 --- a/org.lflang/pom.xml +++ b/org.lflang/pom.xml @@ -59,12 +59,6 @@ commons-cli ${commonsCliVersion} - - - com.google.code.gson - gson - ${gsonVersion} - org.eclipse.emf org.eclipse.emf.mwe2.launch diff --git a/pom.xml b/pom.xml index 6aea11e9..453a2f15 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,6 @@ 1.4 - 2.10.1 1.6.21 From 0185a2b6982fed5e7818e459e89ca31b8913a8f8 Mon Sep 17 00:00:00 2001 From: Marten Lohstroh Date: Wed, 1 Nov 2023 12:21:24 -0700 Subject: [PATCH 8/8] Update lingua-franca submodule --- org.lflang.product/.project | 17 +++++++++++++++++ org.lflang.rca/.project | 17 +++++++++++++++++ org.lflang.sdk/.project | 17 +++++++++++++++++ org.lflang.ui/.project | 17 +++++++++++++++++ org.lflang.updatesite/.project | 17 +++++++++++++++++ org.lflang/.project | 10 ++++++++-- org.lflang/lingua-franca | 2 +- 7 files changed, 94 insertions(+), 3 deletions(-) diff --git a/org.lflang.product/.project b/org.lflang.product/.project index ea005bcd..d1dd73c7 100644 --- a/org.lflang.product/.project +++ b/org.lflang.product/.project @@ -20,9 +20,26 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature + + + 1694735550775 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/org.lflang.rca/.project b/org.lflang.rca/.project index 1d227f52..ed7dcf91 100644 --- a/org.lflang.rca/.project +++ b/org.lflang.rca/.project @@ -5,7 +5,24 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature + + + 1694735550777 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/org.lflang.sdk/.project b/org.lflang.sdk/.project index 9d43eadb..8d9fca03 100644 --- a/org.lflang.sdk/.project +++ b/org.lflang.sdk/.project @@ -5,7 +5,24 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature + + + 1694735550778 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/org.lflang.ui/.project b/org.lflang.ui/.project index bd28c3c8..6d25b0be 100644 --- a/org.lflang.ui/.project +++ b/org.lflang.ui/.project @@ -25,10 +25,27 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature org.eclipse.xtext.ui.shared.xtextNature org.eclipse.jdt.core.javanature org.eclipse.pde.PluginNature + + + 1694735550780 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/org.lflang.updatesite/.project b/org.lflang.updatesite/.project index 253f28eb..472ecfdc 100644 --- a/org.lflang.updatesite/.project +++ b/org.lflang.updatesite/.project @@ -5,7 +5,24 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature + + + 1694735550781 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/org.lflang/.project b/org.lflang/.project index 9329fa3b..b769625f 100644 --- a/org.lflang/.project +++ b/org.lflang/.project @@ -25,20 +25,26 @@ + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.m2e.core.maven2Nature org.eclipse.xtext.ui.shared.xtextNature org.eclipse.jdt.core.javanature org.eclipse.pde.PluginNature - 1627412675330 + 1694735550773 30 org.eclipse.core.resources.regexFilterMatcher - node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ diff --git a/org.lflang/lingua-franca b/org.lflang/lingua-franca index dd2b6e8d..8018f7f2 160000 --- a/org.lflang/lingua-franca +++ b/org.lflang/lingua-franca @@ -1 +1 @@ -Subproject commit dd2b6e8d5f664396e93f6aea4d73124a25ce4d50 +Subproject commit 8018f7f2744f4522878056fc6317548a6ef08b27