Skip to content

[DoNetMerge] Allow the definition of unordered lists #140

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

Draft
ipa-nhg wants to merge 1 commit into
base: 2.0.0_stable
Choose a base branch
from
Draft

[DoNetMerge] Allow the definition of unordered lists #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 plugins/de.fraunhofer.ipa.ros.xtext.ide/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Require-Bundle: de.fraunhofer.ipa.ros.xtext,
de.fraunhofer.ipa.ros,
org.eclipse.xtext.ide,
org.eclipse.xtext.xbase.ide,
org.antlr.runtime
org.antlr.runtime;bundle-version="[3.2.0,3.2.1)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: de.fraunhofer.ipa.ros.ide.contentassist.antlr.internal,
de.fraunhofer.ipa.ros.ide.contentassist.antlr
2 changes: 1 addition & 1 deletion ....fraunhofer.ipa.ros.xtext.ide/src-gen/de/fraunhofer/ipa/ros/ide/AbstractRosIdeModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* generated by Xtext 2.23.0
* generated by Xtext 2.25.0
*/
package de.fraunhofer.ipa.ros.ide;

Expand Down
5 changes: 2 additions & 3 deletions .../src-gen/de/fraunhofer/ipa/ros/ide/contentassist/antlr/PartialRosContentAssistParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* generated by Xtext 2.23.0
* generated by Xtext 2.25.0
*/
package de.fraunhofer.ipa.ros.ide.contentassist.antlr;

Expand All @@ -8,10 +8,9 @@
import org.eclipse.xtext.AbstractRule;
import org.eclipse.xtext.ide.editor.contentassist.antlr.FollowElement;
import org.eclipse.xtext.ide.editor.contentassist.antlr.internal.AbstractInternalContentAssistParser;
import org.eclipse.xtext.ide.editor.partialEditing.IPartialEditingContentAssistParser;
import org.eclipse.xtext.util.PolymorphicDispatcher;

public class PartialRosContentAssistParser extends RosParser implements IPartialEditingContentAssistParser {
public class PartialRosContentAssistParser extends RosParser {

private AbstractRule rule;

Expand Down
59 changes: 31 additions & 28 deletions ...er.ipa.ros.xtext.ide/src-gen/de/fraunhofer/ipa/ros/ide/contentassist/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.23.0
* generated by Xtext 2.25.0
*/
package de.fraunhofer.ipa.ros.ide.contentassist.antlr;

Expand Down Expand Up @@ -39,6 +39,7 @@ private static void init(ImmutableMap.Builder<AbstractElement, String> builder,
builder.put(grammarAccess.getRosNamesAccess().getAlternatives(), "rule__RosNames__Alternatives");
builder.put(grammarAccess.getRosParamNamesAccess().getAlternatives(), "rule__RosParamNames__Alternatives");
builder.put(grammarAccess.getTopicSpecAccess().getNameAlternatives_2_0(), "rule__TopicSpec__NameAlternatives_2_0");
builder.put(grammarAccess.getNodeAccess().getAlternatives_4(), "rule__Node__Alternatives_4");
builder.put(grammarAccess.getParameterTypeAccess().getAlternatives(), "rule__ParameterType__Alternatives");
builder.put(grammarAccess.getParameterValueAccess().getAlternatives(), "rule__ParameterValue__Alternatives");
builder.put(grammarAccess.getMessagePartAccess().getDataAlternatives_1_0(), "rule__MessagePart__DataAlternatives_1_0");
Expand Down Expand Up @@ -72,20 +73,22 @@ private static void init(ImmutableMap.Builder<AbstractElement, String> builder,
builder.put(grammarAccess.getMessageDefinitionAccess().getGroup(), "rule__MessageDefinition__Group__0");
builder.put(grammarAccess.getMessageDefinitionAccess().getGroup_2(), "rule__MessageDefinition__Group_2__0");
builder.put(grammarAccess.getNodeAccess().getGroup(), "rule__Node__Group__0");
builder.put(grammarAccess.getNodeAccess().getGroup_4(), "rule__Node__Group_4__0");
builder.put(grammarAccess.getNodeAccess().getGroup_4_0(), "rule__Node__Group_4_0__0");
builder.put(grammarAccess.getNodeAccess().getGroup_4_0_2(), "rule__Node__Group_4_0_2__0");
builder.put(grammarAccess.getNodeAccess().getGroup_4_0_2_1(), "rule__Node__Group_4_0_2_1__0");
builder.put(grammarAccess.getNodeAccess().getGroup_4_1(), "rule__Node__Group_4_1__0");
builder.put(grammarAccess.getNodeAccess().getGroup_4_1_2(), "rule__Node__Group_4_1_2__0");
builder.put(grammarAccess.getNodeAccess().getGroup_4_1_2_1(), "rule__Node__Group_4_1_2_1__0");
builder.put(grammarAccess.getNodeAccess().getGroup_4_2(), "rule__Node__Group_4_2__0");
builder.put(grammarAccess.getNodeAccess().getGroup_4_2_3(), "rule__Node__Group_4_2_3__0");
builder.put(grammarAccess.getNodeAccess().getGroup_4_3(), "rule__Node__Group_4_3__0");
builder.put(grammarAccess.getNodeAccess().getGroup_5(), "rule__Node__Group_5__0");
builder.put(grammarAccess.getNodeAccess().getGroup_5_3(), "rule__Node__Group_5_3__0");
builder.put(grammarAccess.getNodeAccess().getGroup_6(), "rule__Node__Group_6__0");
builder.put(grammarAccess.getNodeAccess().getGroup_6_3(), "rule__Node__Group_6_3__0");
builder.put(grammarAccess.getNodeAccess().getGroup_7(), "rule__Node__Group_7__0");
builder.put(grammarAccess.getNodeAccess().getGroup_7_3(), "rule__Node__Group_7_3__0");
builder.put(grammarAccess.getNodeAccess().getGroup_8(), "rule__Node__Group_8__0");
builder.put(grammarAccess.getNodeAccess().getGroup_8_3(), "rule__Node__Group_8_3__0");
builder.put(grammarAccess.getNodeAccess().getGroup_9(), "rule__Node__Group_9__0");
builder.put(grammarAccess.getNodeAccess().getGroup_9_3(), "rule__Node__Group_9_3__0");
builder.put(grammarAccess.getNodeAccess().getGroup_10(), "rule__Node__Group_10__0");
builder.put(grammarAccess.getNodeAccess().getGroup_10_3(), "rule__Node__Group_10_3__0");
builder.put(grammarAccess.getNodeAccess().getGroup_4_3_3(), "rule__Node__Group_4_3_3__0");
builder.put(grammarAccess.getNodeAccess().getGroup_4_4(), "rule__Node__Group_4_4__0");
builder.put(grammarAccess.getNodeAccess().getGroup_4_4_3(), "rule__Node__Group_4_4_3__0");
builder.put(grammarAccess.getNodeAccess().getGroup_4_5(), "rule__Node__Group_4_5__0");
builder.put(grammarAccess.getNodeAccess().getGroup_4_5_3(), "rule__Node__Group_4_5_3__0");
builder.put(grammarAccess.getNodeAccess().getGroup_4_6(), "rule__Node__Group_4_6__0");
builder.put(grammarAccess.getNodeAccess().getGroup_4_6_3(), "rule__Node__Group_4_6_3__0");
builder.put(grammarAccess.getServiceServerAccess().getGroup(), "rule__ServiceServer__Group__0");
builder.put(grammarAccess.getServiceServerAccess().getGroup_6(), "rule__ServiceServer__Group_6__0");
builder.put(grammarAccess.getPublisherAccess().getGroup(), "rule__Publisher__Group__0");
Expand Down Expand Up @@ -199,20 +202,20 @@ private static void init(ImmutableMap.Builder<AbstractElement, String> builder,
builder.put(grammarAccess.getMessageDefinitionAccess().getMessagePartAssignment_2_0(), "rule__MessageDefinition__MessagePartAssignment_2_0");
builder.put(grammarAccess.getMessageDefinitionAccess().getMessagePartAssignment_2_1(), "rule__MessageDefinition__MessagePartAssignment_2_1");
builder.put(grammarAccess.getNodeAccess().getNameAssignment_3(), "rule__Node__NameAssignment_3");
builder.put(grammarAccess.getNodeAccess().getServiceserverAssignment_4_2(), "rule__Node__ServiceserverAssignment_4_2");
builder.put(grammarAccess.getNodeAccess().getServiceserverAssignment_4_3_1(), "rule__Node__ServiceserverAssignment_4_3_1");
builder.put(grammarAccess.getNodeAccess().getPublisherAssignment_5_2(), "rule__Node__PublisherAssignment_5_2");
builder.put(grammarAccess.getNodeAccess().getPublisherAssignment_5_3_1(), "rule__Node__PublisherAssignment_5_3_1");
builder.put(grammarAccess.getNodeAccess().getSubscriberAssignment_6_2(), "rule__Node__SubscriberAssignment_6_2");
builder.put(grammarAccess.getNodeAccess().getSubscriberAssignment_6_3_1(), "rule__Node__SubscriberAssignment_6_3_1");
builder.put(grammarAccess.getNodeAccess().getServiceclientAssignment_7_2(), "rule__Node__ServiceclientAssignment_7_2");
builder.put(grammarAccess.getNodeAccess().getServiceclientAssignment_7_3_1(), "rule__Node__ServiceclientAssignment_7_3_1");
builder.put(grammarAccess.getNodeAccess().getActionserverAssignment_8_2(), "rule__Node__ActionserverAssignment_8_2");
builder.put(grammarAccess.getNodeAccess().getActionserverAssignment_8_3_1(), "rule__Node__ActionserverAssignment_8_3_1");
builder.put(grammarAccess.getNodeAccess().getActionclientAssignment_9_2(), "rule__Node__ActionclientAssignment_9_2");
builder.put(grammarAccess.getNodeAccess().getActionclientAssignment_9_3_1(), "rule__Node__ActionclientAssignment_9_3_1");
builder.put(grammarAccess.getNodeAccess().getParameterAssignment_10_2(), "rule__Node__ParameterAssignment_10_2");
builder.put(grammarAccess.getNodeAccess().getParameterAssignment_10_3_1(), "rule__Node__ParameterAssignment_10_3_1");
builder.put(grammarAccess.getNodeAccess().getPublisherAssignment_4_0_2_0(), "rule__Node__PublisherAssignment_4_0_2_0");
builder.put(grammarAccess.getNodeAccess().getPublisherAssignment_4_0_2_1_1(), "rule__Node__PublisherAssignment_4_0_2_1_1");
builder.put(grammarAccess.getNodeAccess().getSubscriberAssignment_4_1_2_0(), "rule__Node__SubscriberAssignment_4_1_2_0");
builder.put(grammarAccess.getNodeAccess().getSubscriberAssignment_4_1_2_1_1(), "rule__Node__SubscriberAssignment_4_1_2_1_1");
builder.put(grammarAccess.getNodeAccess().getServiceserverAssignment_4_2_2(), "rule__Node__ServiceserverAssignment_4_2_2");
builder.put(grammarAccess.getNodeAccess().getServiceserverAssignment_4_2_3_1(), "rule__Node__ServiceserverAssignment_4_2_3_1");
builder.put(grammarAccess.getNodeAccess().getServiceclientAssignment_4_3_2(), "rule__Node__ServiceclientAssignment_4_3_2");
builder.put(grammarAccess.getNodeAccess().getServiceclientAssignment_4_3_3_1(), "rule__Node__ServiceclientAssignment_4_3_3_1");
builder.put(grammarAccess.getNodeAccess().getActionserverAssignment_4_4_2(), "rule__Node__ActionserverAssignment_4_4_2");
builder.put(grammarAccess.getNodeAccess().getActionserverAssignment_4_4_3_1(), "rule__Node__ActionserverAssignment_4_4_3_1");
builder.put(grammarAccess.getNodeAccess().getActionclientAssignment_4_5_2(), "rule__Node__ActionclientAssignment_4_5_2");
builder.put(grammarAccess.getNodeAccess().getActionclientAssignment_4_5_3_1(), "rule__Node__ActionclientAssignment_4_5_3_1");
builder.put(grammarAccess.getNodeAccess().getParameterAssignment_4_6_2(), "rule__Node__ParameterAssignment_4_6_2");
builder.put(grammarAccess.getNodeAccess().getParameterAssignment_4_6_3_1(), "rule__Node__ParameterAssignment_4_6_3_1");
builder.put(grammarAccess.getServiceServerAccess().getNameAssignment_3(), "rule__ServiceServer__NameAssignment_3");
builder.put(grammarAccess.getServiceServerAccess().getServiceAssignment_5(), "rule__ServiceServer__ServiceAssignment_5");
builder.put(grammarAccess.getServiceServerAccess().getNamespaceAssignment_6_1(), "rule__ServiceServer__NamespaceAssignment_6_1");
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.