Skip to content

Qos Fields completion #228

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
EGAlberts wants to merge 3 commits into from
Closed

Qos Fields completion #228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ef5a92d
give an exception to to capital letter in param names for plugin params
EGAlberts Aug 4, 2025
b19e149
Catches the edge case of an improper parameter name of a plugin
EGAlberts Aug 4, 2025
8ea8f5b
added four missing fields to QualityOfService, LeaseDuration, Livelin…
EGAlberts Oct 16, 2025
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
2 changes: 1 addition & 1 deletion ...e.fraunhofer.ipa.ros.xtext/src-gen/de/fraunhofer/ipa/ros/AbstractBasicsRuntimeModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* generated by Xtext 2.30.0
* generated by Xtext 2.38.0
*/
package de.fraunhofer.ipa.ros;

Expand Down
2 changes: 1 addition & 1 deletion ...s/de.fraunhofer.ipa.ros.xtext/src-gen/de/fraunhofer/ipa/ros/AbstractRosRuntimeModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* generated by Xtext 2.30.0
* generated by Xtext 2.38.0
*/
package de.fraunhofer.ipa.ros;

Expand Down
2 changes: 1 addition & 1 deletion ...raunhofer.ipa.ros.xtext/src-gen/de/fraunhofer/ipa/ros/BasicsStandaloneSetupGenerated.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* generated by Xtext 2.30.0
* generated by Xtext 2.38.0
*/
package de.fraunhofer.ipa.ros;

Expand Down
2 changes: 1 addition & 1 deletion ...e.fraunhofer.ipa.ros.xtext/src-gen/de/fraunhofer/ipa/ros/RosStandaloneSetupGenerated.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* generated by Xtext 2.30.0
* generated by Xtext 2.38.0
*/
package de.fraunhofer.ipa.ros;

Expand Down
2 changes: 1 addition & 1 deletion ...pa.ros.xtext/src-gen/de/fraunhofer/ipa/ros/parser/antlr/BasicsAntlrTokenFileProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* generated by Xtext 2.30.0
* generated by Xtext 2.38.0
*/
package de.fraunhofer.ipa.ros.parser.antlr;

Expand Down
2 changes: 1 addition & 1 deletion .../de.fraunhofer.ipa.ros.xtext/src-gen/de/fraunhofer/ipa/ros/parser/antlr/BasicsParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* generated by Xtext 2.30.0
* generated by Xtext 2.38.0
*/
package de.fraunhofer.ipa.ros.parser.antlr;

Expand Down
2 changes: 1 addition & 1 deletion ...r.ipa.ros.xtext/src-gen/de/fraunhofer/ipa/ros/parser/antlr/RosAntlrTokenFileProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* generated by Xtext 2.30.0
* generated by Xtext 2.38.0
*/
package de.fraunhofer.ipa.ros.parser.antlr;

Expand Down
2 changes: 1 addition & 1 deletion ...ins/de.fraunhofer.ipa.ros.xtext/src-gen/de/fraunhofer/ipa/ros/parser/antlr/RosParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* generated by Xtext 2.30.0
* generated by Xtext 2.38.0
*/
package de.fraunhofer.ipa.ros.parser.antlr;

Expand Down
2 changes: 1 addition & 1 deletion ....ipa.ros.xtext/src-gen/de/fraunhofer/ipa/ros/parser/antlr/internal/InternalBasicsParser.g
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* generated by Xtext 2.30.0
* generated by Xtext 2.38.0
*/
parser grammar InternalBasicsParser;

Expand Down
2 changes: 1 addition & 1 deletion ...fer.ipa.ros.xtext/src-gen/de/fraunhofer/ipa/ros/parser/antlr/internal/InternalRosParser.g
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* generated by Xtext 2.30.0
* generated by Xtext 2.38.0
*/
parser grammar InternalRosParser;

Expand Down
2 changes: 1 addition & 1 deletion ...ofer.ipa.ros.xtext/src-gen/de/fraunhofer/ipa/ros/parser/antlr/lexer/InternalBasicsLexer.g
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* generated by Xtext 2.30.0
* generated by Xtext 2.38.0
*/
lexer grammar InternalBasicsLexer;

Expand Down
2 changes: 1 addition & 1 deletion ...unhofer.ipa.ros.xtext/src-gen/de/fraunhofer/ipa/ros/parser/antlr/lexer/InternalRosLexer.g
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* generated by Xtext 2.30.0
* generated by Xtext 2.38.0
*/
lexer grammar InternalRosLexer;

Expand Down
2 changes: 1 addition & 1 deletion ...ofer.ipa.ros.xtext/src-gen/de/fraunhofer/ipa/ros/scoping/AbstractBasicsScopeProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* generated by Xtext 2.30.0
* generated by Xtext 2.38.0
*/
package de.fraunhofer.ipa.ros.scoping;

Expand Down
2 changes: 1 addition & 1 deletion ...unhofer.ipa.ros.xtext/src-gen/de/fraunhofer/ipa/ros/scoping/AbstractRosScopeProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* generated by Xtext 2.30.0
* generated by Xtext 2.38.0
*/
package de.fraunhofer.ipa.ros.scoping;

Expand Down
2 changes: 1 addition & 1 deletion ...hofer.ipa.ros.xtext/src-gen/de/fraunhofer/ipa/ros/serializer/BasicsSemanticSequencer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* generated by Xtext 2.30.0
* generated by Xtext 2.38.0
*/
package de.fraunhofer.ipa.ros.serializer;

Expand Down
2 changes: 1 addition & 1 deletion ...ofer.ipa.ros.xtext/src-gen/de/fraunhofer/ipa/ros/serializer/BasicsSyntacticSequencer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* generated by Xtext 2.30.0
* generated by Xtext 2.38.0
*/
package de.fraunhofer.ipa.ros.serializer;

Expand Down
2 changes: 1 addition & 1 deletion ...aunhofer.ipa.ros.xtext/src-gen/de/fraunhofer/ipa/ros/serializer/RosSemanticSequencer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* generated by Xtext 2.30.0
* generated by Xtext 2.38.0
*/
package de.fraunhofer.ipa.ros.serializer;

Expand Down
2 changes: 1 addition & 1 deletion ...unhofer.ipa.ros.xtext/src-gen/de/fraunhofer/ipa/ros/serializer/RosSyntacticSequencer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* generated by Xtext 2.30.0
* generated by Xtext 2.38.0
*/
package de.fraunhofer.ipa.ros.serializer;

Expand Down
2 changes: 1 addition & 1 deletion ....fraunhofer.ipa.ros.xtext/src-gen/de/fraunhofer/ipa/ros/services/BasicsGrammarAccess.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* generated by Xtext 2.30.0
* generated by Xtext 2.38.0
*/
package de.fraunhofer.ipa.ros.services;

Expand Down
2 changes: 1 addition & 1 deletion .../de.fraunhofer.ipa.ros.xtext/src-gen/de/fraunhofer/ipa/ros/services/RosGrammarAccess.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* generated by Xtext 2.30.0
* generated by Xtext 2.38.0
*/
package de.fraunhofer.ipa.ros.services;

Expand Down
2 changes: 1 addition & 1 deletion ...hofer.ipa.ros.xtext/src-gen/de/fraunhofer/ipa/ros/validation/AbstractBasicsValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* generated by Xtext 2.30.0
* generated by Xtext 2.38.0
*/
package de.fraunhofer.ipa.ros.validation;

Expand Down
2 changes: 1 addition & 1 deletion ...aunhofer.ipa.ros.xtext/src-gen/de/fraunhofer/ipa/ros/validation/AbstractRosValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* generated by Xtext 2.30.0
* generated by Xtext 2.38.0
*/
package de.fraunhofer.ipa.ros.validation;

Expand Down
2 changes: 1 addition & 1 deletion ...ros.xtext/src-gen/de/fraunhofer/ipa/ros/validation/RosConfigurableIssueCodesProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* generated by Xtext 2.30.0
* generated by Xtext 2.38.0
*/
package de.fraunhofer.ipa.ros.validation;

Expand Down
50 changes: 36 additions & 14 deletions plugins/de.fraunhofer.ipa.ros.xtext/src/de/fraunhofer/ipa/ros/validation/RosValidator.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@ import ros.ServiceClient
import ros.ServiceServer
import ros.Subscriber
import ros.Parameter
import ros.ParameterValue
import ros.ParameterBase64Type
import ros.ParameterDate
import ros.QualityOfService

/**
* This class contains custom validation rules.
Expand Down Expand Up @@ -45,19 +43,23 @@ class RosValidator extends AbstractRosValidator {
}}
@Check
def void checkNameConventionsPackage (Package rospackage) {
for (char c : rospackage.name.toCharArray){
if (Character.isUpperCase(c)){
error("The name of a package has to follow the ROS naming conventions: Capital letters are not allowed", null, INVALID_NAME);
}
}
for (char c : rospackage.name.toCharArray){
if (Character.isUpperCase(c)){
error("The name of a package has to follow the ROS naming conventions: Capital letters are not allowed", null, INVALID_NAME);
}
}
}
@Check
def void checkNameConventionsParameters (Parameter parameter) {
for (char c : parameter.name.toCharArray){
if (Character.isUpperCase(c)){
warning("The name of a parameter has to follow the ROS naming conventions: Capital letters are not recommended", null, INVALID_NAME);
}
}
for (i : 0 ..< parameter.name.length) {
val c = parameter.name.charAt(i)
if (Character.isUpperCase(c)) {
val remaining = parameter.name.substring(i)
if (!remaining.contains(".")) {
warning("The name of a parameter has to follow the ROS naming conventions: Capital letters are not recommended", null, INVALID_NAME);
}
}
}
}

/* Customize Syntax Error Messages */
Expand Down Expand Up @@ -141,4 +143,24 @@ class RosValidator extends AbstractRosValidator {
// // allow the use of numbers
//

}
public static val INVALID_VALUE = 'invalidValue'
@Check
def void CheckQoS (QualityOfService qos){
CheckDuration(qos.leaseDuration)
CheckDuration(qos.lifespan)
CheckDuration(qos.deadline)
}

def void CheckDuration(String duration)
{
if(duration != 'infinite' && duration !== null){
try{
Integer.parseInt(duration)
}
catch (NumberFormatException e){
error("Durations of lease_duration, lifespan, deadline should be specified as a string of nanoseconds which can convert to int, or as infinite", null, INVALID_VALUE)
}
}
}

}
4 changes: 4 additions & 0 deletions plugins/de.fraunhofer.ipa.ros/model/ros.ecore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,10 @@
defaultValueLiteral="reliable"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="Durability" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
defaultValueLiteral="transient_local"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="Liveliness" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="LeaseDuration" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="Lifespan" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="Deadline" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="TopicSpecMsgRef" eSuperTypes="PrimitivesTypes.ecore#//AbstractType">
<eStructuralFeatures xsi:type="ecore:EReference" name="Reference" lowerBound="1"
Expand Down
4 changes: 4 additions & 0 deletions plugins/de.fraunhofer.ipa.ros/model/ros.genmodel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,10 @@
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute ros.ecore#//QualityOfService/Depth"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute ros.ecore#//QualityOfService/Reliability"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute ros.ecore#//QualityOfService/Durability"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute ros.ecore#//QualityOfService/Liveliness"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute ros.ecore#//QualityOfService/LeaseDuration"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute ros.ecore#//QualityOfService/Lifespan"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute ros.ecore#//QualityOfService/Deadline"/>
</genClasses>
<genClasses ecoreClass="ros.ecore#//TopicSpecMsgRef">
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference ros.ecore#//TopicSpecMsgRef/Reference"/>
Expand Down
56 changes: 28 additions & 28 deletions plugins/de.fraunhofer.ipa.ros/src/primitives/MessagePart.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,55 +25,55 @@
*/
public interface MessagePart extends EObject {
/**
* Returns the value of the '<em><b>Type</b></em>' containment reference.
* <!-- begin-user-doc -->
* Returns the value of the '<em><b>Type</b></em>' containment reference.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Type</em>' containment reference isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Type</em>' containment reference.
* @see #setType(AbstractType)
* @see primitives.PrimitivesPackage#getMessagePart_Type()
* @model containment="true" required="true"
* @generated
*/
* @return the value of the '<em>Type</em>' containment reference.
* @see #setType(AbstractType)
* @see primitives.PrimitivesPackage#getMessagePart_Type()
* @model containment="true" required="true"
* @generated
*/
AbstractType getType();

/**
* Sets the value of the '{@link primitives.MessagePart#getType <em>Type</em>}' containment reference.
* <!-- begin-user-doc -->
* Sets the value of the '{@link primitives.MessagePart#getType <em>Type</em>}' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Type</em>' containment reference.
* @see #getType()
* @generated
*/
* @param value the new value of the '<em>Type</em>' containment reference.
* @see #getType()
* @generated
*/
void setType(AbstractType value);

/**
* Returns the value of the '<em><b>Data</b></em>' attribute.
* <!-- begin-user-doc -->
* Returns the value of the '<em><b>Data</b></em>' attribute.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Data</em>' attribute isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
* @return the value of the '<em>Data</em>' attribute.
* @see #setData(String)
* @see primitives.PrimitivesPackage#getMessagePart_Data()
* @model required="true"
* @generated
*/
* @return the value of the '<em>Data</em>' attribute.
* @see #setData(String)
* @see primitives.PrimitivesPackage#getMessagePart_Data()
* @model required="true"
* @generated
*/
String getData();

/**
* Sets the value of the '{@link primitives.MessagePart#getData <em>Data</em>}' attribute.
* <!-- begin-user-doc -->
* Sets the value of the '{@link primitives.MessagePart#getData <em>Data</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Data</em>' attribute.
* @see #getData()
* @generated
*/
* @param value the new value of the '<em>Data</em>' attribute.
* @see #getData()
* @generated
*/
void setData(String value);

} // MessagePart
Loading