Merge pull request #1 from Yakindu/issue_xtext_migration

Migrated to current 3.5.0 master

plugins/com.yakindu.sct.domain.scenario.lang.ui/META-INF/MANIFEST.MF

@@ -20,10 +20,8 @@ Require-Bundle: com.yakindu.sct.domain.scenario.lang;visibility:=reexport,
  org.yakindu.base.xtext.utils.jface
 Import-Package: org.apache.log4j
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: com.yakindu.sct.domain.scenario.ui,
+Export-Package: com.yakindu.sct.domain.scenario.lang.ui.internal,
+ com.yakindu.sct.domain.scenario.ui,
  com.yakindu.sct.domain.scenario.ui.contentassist,
- com.yakindu.sct.domain.scenario.ui.contentassist.antlr,
- com.yakindu.sct.domain.scenario.ui.contentassist.antlr.internal,
- com.yakindu.sct.domain.scenario.ui.internal,
  com.yakindu.sct.domain.scenario.ui.quickfix
-Bundle-Activator: com.yakindu.sct.domain.scenario.ui.internal.ScenarioTextActivator
+Bundle-Activator: com.yakindu.sct.domain.scenario.lang.ui.internal.LangActivator

plugins/com.yakindu.sct.domain.scenario.lang.ui/META-INF/MANIFEST.MF_gen

@@ -0,0 +1,25 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: com.yakindu.sct.domain.scenario.lang.ui
+Bundle-SymbolicName: com.yakindu.sct.domain.scenario.lang.ui;singleton:=true
+Bundle-Version: 0.0.1.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-ActivationPolicy: lazy
+Export-Package: com.yakindu.sct.domain.scenario.ide.contentassist.antlr,
+ com.yakindu.sct.domain.scenario.ide.contentassist.antlr.internal,
+ com.yakindu.sct.domain.scenario.lang.ui.internal,
+ com.yakindu.sct.domain.scenario.ui.contentassist,
+ com.yakindu.sct.domain.scenario.ui.quickfix
+Require-Bundle: org.antlr.runtime,
+ org.eclipse.compare,
+ org.eclipse.ui,
+ org.eclipse.ui.editors,
+ org.eclipse.xtend.lib;resolution:=optional,
+ org.eclipse.xtext.builder,
+ org.eclipse.xtext.ui,
+ org.eclipse.xtext.ui.codetemplates.ui,
+ org.eclipse.xtext.ui.shared,
+ org.eclipse.xtext.xbase.lib;bundle-version="2.14.0"
+Import-Package: org.apache.log4j
+Bundle-Activator: com.yakindu.sct.domain.scenario.lang.ui.internal.LangActivator
+Automatic-Module-Name: com.yakindu.sct.domain.scenario.lang.ui

plugins/com.yakindu.sct.domain.scenario.lang.ui/src/com/yakindu/sct/domain/scenario/ide/ScenarioTextIdeModule.xtend

@@ -0,0 +1,10 @@
+/*
+ * (c) by committers of YAKINDU */
+package com.yakindu.sct.domain.scenario.ide
+
+
+/**
+ * Use this class to register ide components.
+ */
+class ScenarioTextIdeModule extends AbstractScenarioTextIdeModule {
+}

plugins/com.yakindu.sct.domain.scenario.lang.ui/src/com/yakindu/sct/domain/scenario/ide/ScenarioTextIdeSetup.xtend

@@ -0,0 +1,19 @@
+/*
+ * (c) by committers of YAKINDU */
+package com.yakindu.sct.domain.scenario.ide
+
+import com.google.inject.Guice
+import com.yakindu.sct.domain.scenario.ScenarioTextRuntimeModule
+import com.yakindu.sct.domain.scenario.ScenarioTextStandaloneSetup
+import org.eclipse.xtext.util.Modules2
+
+/**
+ * Initialization support for running Xtext languages as language servers.
+ */
+class ScenarioTextIdeSetup extends ScenarioTextStandaloneSetup {
+
+	override createInjector() {
+		Guice.createInjector(Modules2.mixin(new ScenarioTextRuntimeModule, new ScenarioTextIdeModule))
+	}
+
+}

plugins/com.yakindu.sct.domain.scenario.lang.ui/src/com/yakindu/sct/domain/scenario/ui/ScenarioTextUiModule.xtend

@@ -0,0 +1,84 @@
+package com.yakindu.sct.domain.scenario.ui
+
+import com.google.inject.Binder
+import com.google.inject.Provider
+import com.google.inject.name.Names
+import org.eclipse.jface.text.ITextHover
+import org.eclipse.ui.plugin.AbstractUIPlugin
+import org.eclipse.xtext.documentation.IEObjectDocumentationProvider
+import org.eclipse.xtext.resource.clustering.DynamicResourceClusteringPolicy
+import org.eclipse.xtext.resource.clustering.IResourceClusteringPolicy
+import org.eclipse.xtext.resource.containers.IAllContainersState
+import org.eclipse.xtext.ui.editor.hover.DispatchingEObjectTextHover
+import org.eclipse.xtext.ui.editor.hover.IEObjectHover
+import org.eclipse.xtext.ui.editor.hover.IEObjectHoverProvider
+import org.eclipse.xtext.ui.editor.hover.ProblemAnnotationHover
+import org.eclipse.xtext.ui.editor.model.IResourceForEditorInputFactory
+import org.eclipse.xtext.ui.editor.model.JavaClassPathResourceForIEditorInputFactory
+import org.eclipse.xtext.ui.editor.model.ResourceForIEditorInputFactory
+import org.eclipse.xtext.ui.resource.IResourceSetProvider
+import org.eclipse.xtext.ui.resource.SimpleResourceSetProvider
+import org.eclipse.xtext.ui.resource.XtextResourceSetProvider
+import org.eclipse.xtext.ui.shared.Access
+import org.yakindu.base.utils.jface.help.CrossRefObjectTextHover
+import org.yakindu.base.utils.jface.help.HelpHoverProvider
+import org.yakindu.sct.model.stext.ui.help.STextUserHelpDocumentationProvider
+
+class ScenarioTextUiModule extends AbstractScenarioTextUiModule {
+	new(AbstractUIPlugin plugin) {
+		super(plugin)
+	}
+
+	def Class<? extends IEObjectDocumentationProvider> bindIEObjectDocumentationProvider() {
+		return STextUserHelpDocumentationProvider
+	}
+
+	def Class<? extends DispatchingEObjectTextHover> bindDispatchingEObjectTextHover() {
+		return CrossRefObjectTextHover
+	}
+
+	override Class<? extends IEObjectHover> bindIEObjectHover() {
+		return CrossRefObjectTextHover
+	}
+
+	def Class<? extends IEObjectHoverProvider> bindIEObjectHoverProvider() {
+		return HelpHoverProvider
+	}
+
+	override void configure(Binder binder) {
+		super.configure(binder)
+		binder.bind(typeof(String)).annotatedWith(Names::named("stylesheet")).toInstance("/StextHoverStyleSheet.css")
+	}
+
+	override Provider<IAllContainersState> provideIAllContainersState() {
+		if (Access::getJdtHelper().get().isJavaCoreAvailable()) {
+			return Access::getJavaProjectsState()
+		} else {
+			return Access::getWorkspaceProjectsState()
+		}
+	}
+
+	override Class<? extends IResourceSetProvider> bindIResourceSetProvider() {
+		if (Access::getJdtHelper().get().isJavaCoreAvailable()) {
+			return typeof(XtextResourceSetProvider)
+		} else {
+			return typeof(SimpleResourceSetProvider)
+		}
+	}
+
+	override Class<? extends IResourceForEditorInputFactory> bindIResourceForEditorInputFactory() {
+		if (Access::getJdtHelper().get().isJavaCoreAvailable()) {
+			return typeof(JavaClassPathResourceForIEditorInputFactory)
+		} else {
+			return typeof(ResourceForIEditorInputFactory)
+		}
+	}
+
+	override Class<? extends ITextHover> bindITextHover() {
+		return typeof(ProblemAnnotationHover)
+	}
+
+	def Class<? extends IResourceClusteringPolicy> bindIResourceClusteringPolicy() {
+		return typeof(DynamicResourceClusteringPolicy)
+	}
+}

plugins/com.yakindu.sct.domain.scenario.lang.ui/src/com/yakindu/sct/domain/scenario/ui/contentassist/EntryRuleContentAssistParser.java

@@ -3,14 +3,13 @@
 import java.lang.reflect.Method;
 import java.util.Collection;
 
-import org.eclipse.xtext.ui.editor.contentassist.antlr.FollowElement;
-import org.eclipse.xtext.ui.editor.contentassist.antlr.internal.AbstractInternalContentAssistParser;
+import org.eclipse.xtext.ide.editor.contentassist.antlr.FollowElement;
+import org.eclipse.xtext.ide.editor.contentassist.antlr.internal.AbstractInternalContentAssistParser;
 import org.yakindu.sct.model.stext.parser.IParserConstants;
 
 import com.google.inject.Inject;
 import com.google.inject.name.Named;
-import com.yakindu.sct.domain.scenario.ui.contentassist.antlr.ScenarioTextParser;
-import com.yakindu.sct.domain.scenario.ui.contentassist.antlr.internal.InternalScenarioTextParser;
+import com.yakindu.sct.domain.scenario.ide.contentassist.antlr.ScenarioTextParser;
 
 /**
  * 
@@ -29,10 +28,9 @@ protected Collection<FollowElement> getFollowElements(AbstractInternalContentAss
 		if (entryRule == null)
 			return super.getFollowElements(parser);
 		try {
-			InternalScenarioTextParser typedParser = (InternalScenarioTextParser) parser;
-			Method method = typedParser.getClass().getMethod(ENTRY_RULE + entryRule);
-			method.invoke(typedParser);
-			return typedParser.getFollowElements();
+			Method method = parser.getClass().getMethod(ENTRY_RULE + entryRule);
+			method.invoke(parser);
+			return parser.getFollowElements();
 		} catch (Exception ex) {
 			throw new RuntimeException(ex);
 		}

plugins/com.yakindu.sct.domain.scenario.lang.ui/src/com/yakindu/sct/domain/scenario/ui/labeling/ScenarioTextDescriptionLabelProvider.xtend

@@ -0,0 +1,23 @@
+/*
+ * (c) by committers of YAKINDU */
+package com.yakindu.sct.domain.scenario.ui.labeling
+
+import org.eclipse.xtext.ui.label.DefaultDescriptionLabelProvider
+
+/**
+ * Provides labels for IEObjectDescriptions and IResourceDescriptions.
+ * 
+ * See https://www.eclipse.org/Xtext/documentation/304_ide_concepts.html#label-provider
+ */
+class ScenarioTextDescriptionLabelProvider extends DefaultDescriptionLabelProvider {
+
+	// Labels and icons can be computed like this:
+
+//	override text(IEObjectDescription ele) {
+//		ele.name.toString
+//	}
+//	 
+//	override image(IEObjectDescription ele) {
+//		ele.EClass.name + '.gif'
+//	}
+}

plugins/com.yakindu.sct.domain.scenario.lang.ui/src/com/yakindu/sct/domain/scenario/ui/labeling/ScenarioTextLabelProvider.xtend

@@ -0,0 +1,30 @@
+/*
+ * (c) by committers of YAKINDU */
+package com.yakindu.sct.domain.scenario.ui.labeling
+
+import com.google.inject.Inject
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider
+import org.eclipse.xtext.ui.label.DefaultEObjectLabelProvider
+
+/**
+ * Provides labels for EObjects.
+ * 
+ * See https://www.eclipse.org/Xtext/documentation/304_ide_concepts.html#label-provider
+ */
+class ScenarioTextLabelProvider extends DefaultEObjectLabelProvider {
+
+	@Inject
+	new(AdapterFactoryLabelProvider delegate) {
+		super(delegate);
+	}
+
+	// Labels and icons can be computed like this:
+
+//	def text(Greeting ele) {
+//		'A greeting to ' + ele.name
+//	}
+//
+//	def image(Greeting ele) {
+//		'Greeting.gif'
+//	}
+}