WIP- DoNOTmerge - update .ros base DSL to yaml format

ipa320 · Nov 16, 2022 · def389f · def389f
1 parent 7301783
commit def389f
Show file tree

Hide file tree

Showing 48 changed files with 95,651 additions and 67,297 deletions.
diff --git a/plugins/de.fraunhofer.ipa.ros.xtext.ide/META-INF/MANIFEST.MF b/plugins/de.fraunhofer.ipa.ros.xtext.ide/META-INF/MANIFEST.MF
@@ -12,4 +12,5 @@ Require-Bundle: de.fraunhofer.ipa.ros.xtext,
  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
+ de.fraunhofer.ipa.ros.ide.contentassist.antlr,
+ de.fraunhofer.ipa.ros.ide.contentassist.antlr.lexer
diff --git a/....fraunhofer.ipa.ros.xtext.ide/src-gen/de/fraunhofer/ipa/ros/ide/AbstractRosIdeModule.java b/....fraunhofer.ipa.ros.xtext.ide/src-gen/de/fraunhofer/ipa/ros/ide/AbstractRosIdeModule.java
@@ -6,12 +6,14 @@
 import com.google.inject.Binder;
 import com.google.inject.name.Names;
 import de.fraunhofer.ipa.ros.ide.contentassist.antlr.RosParser;
-import de.fraunhofer.ipa.ros.ide.contentassist.antlr.internal.InternalRosLexer;
+import de.fraunhofer.ipa.ros.ide.contentassist.antlr.lexer.InternalRosLexer;
 import org.eclipse.xtext.ide.DefaultIdeModule;
 import org.eclipse.xtext.ide.LexerIdeBindings;
+import org.eclipse.xtext.ide.editor.contentassist.CompletionPrefixProvider;
 import org.eclipse.xtext.ide.editor.contentassist.FQNPrefixMatcher;
 import org.eclipse.xtext.ide.editor.contentassist.IPrefixMatcher;
 import org.eclipse.xtext.ide.editor.contentassist.IProposalConflictHelper;
+import org.eclipse.xtext.ide.editor.contentassist.IndentationAwareCompletionPrefixProvider;
 import org.eclipse.xtext.ide.editor.contentassist.antlr.AntlrProposalConflictHelper;
 import org.eclipse.xtext.ide.editor.contentassist.antlr.IContentAssistParser;
 import org.eclipse.xtext.ide.editor.contentassist.antlr.internal.Lexer;
@@ -42,6 +44,11 @@ public Class<? extends IProposalConflictHelper> bindIProposalConflictHelper() {
 		return AntlrProposalConflictHelper.class;
 	}
 
+	// contributed by org.eclipse.xtext.xtext.generator.parser.antlr.XtextAntlrGeneratorFragment2
+	public Class<? extends CompletionPrefixProvider> bindCompletionPrefixProvider() {
+		return IndentationAwareCompletionPrefixProvider.class;
+	}
+
 	// contributed by org.eclipse.xtext.xtext.generator.exporting.QualifiedNamesFragment2
 	public Class<? extends IPrefixMatcher> bindIPrefixMatcher() {
 		return FQNPrefixMatcher.class;

diff --git a/...er.ipa.ros.xtext.ide/src-gen/de/fraunhofer/ipa/ros/ide/contentassist/antlr/RosParser.java b/...er.ipa.ros.xtext.ide/src-gen/de/fraunhofer/ipa/ros/ide/contentassist/antlr/RosParser.java