Skip to content
This repository has been archived by the owner on Sep 22, 2024. It is now read-only.

Adjusted implementation of MessageReporter and new dependency on com.google.gson #55

Merged
merged 9 commits into from
Nov 1, 2023
Merged

Adjusted implementation of MessageReporter and new dependency on com.google.gson #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
54d0f7a
Adjusted implementation of MessageReporter
lhstrh Sep 30, 2023
8c4f618
Update submodule
lhstrh Sep 30, 2023
c4c7933
Merge remote-tracking branch 'origin/main' into message-reporter
lhstrh Sep 30, 2023
d064fba
Add gson
lhstrh Oct 31, 2023
7b65a2c
Added gson as dependency but to no avail
lhstrh Oct 31, 2023
fe15de5
Added gson dependency to plugin manifest
a-sr Nov 1, 2023
113ba72
Fixed imports in generator mocks
a-sr Nov 1, 2023
0f7a0ce
Revert "Added gson as dependency but to no avail"
a-sr Nov 1, 2023
0185a2b
Update lingua-franca submodule
lhstrh Nov 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions org.lflang.product/.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,26 @@
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
<filteredResources>
<filter>
<id>1694735550775</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription>
17 changes: 17 additions & 0 deletions org.lflang.rca/.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,24 @@
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
<filteredResources>
<filter>
<id>1694735550777</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription>
17 changes: 17 additions & 0 deletions org.lflang.sdk/.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,24 @@
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
<filteredResources>
<filter>
<id>1694735550778</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription>
1 change: 1 addition & 0 deletions org.lflang.targetplatform/org.lflang.targetplatform.target
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
<unit id="com.google.inject" version="0.0.0"/>
<unit id="jakarta.activation" version="0.0.0"/>
<unit id="com.google.gson" version="0.0.0"/>
<unit id="javax.activation" version="0.0.0"/>
<unit id="javaewah" version="0.0.0"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository/"/>
Expand Down
17 changes: 17 additions & 0 deletions org.lflang.ui/.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,27 @@
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
</natures>
<filteredResources>
<filter>
<id>1694735550780</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription>
17 changes: 17 additions & 0 deletions org.lflang.updatesite/.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,24 @@
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
<filteredResources>
<filter>
<id>1694735550781</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription>
10 changes: 8 additions & 2 deletions org.lflang/.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,20 +25,26 @@
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
</natures>
<filteredResources>
<filter>
<id>1627412675330</id>
<id>1694735550773</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
Expand Down
3 changes: 2 additions & 1 deletion org.lflang/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion org.lflang/lingua-franca
Open in desktop
Submodule lingua-franca updated 752 files
2 changes: 1 addition & 1 deletion org.lflang/src-mock/org/lflang/analyses/uclid/UclidGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion org.lflang/src-mock/org/lflang/generator/cpp/CppGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion org.lflang/src-mock/org/lflang/generator/rust/RustGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion org.lflang/src-mock/org/lflang/generator/ts/TSGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
5 changes: 3 additions & 2 deletions org.lflang/src/org/lflang/generator/EclipseMessageReporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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()));
Expand Down