Last update.

0bd6856b · Reiner Jung · 8ba91d57 · 0bd6856b · 0bd6856b · 0bd6856b
Commit 0bd6856b authored Apr 13, 2022 by Reiner Jung
--- a/bundles/org.oceandsl.configuration.ui/src/org/oceandsl/configuration/ui/ConfigurationUiModule.xtend
+++ b/bundles/org.oceandsl.configuration.ui/src/org/oceandsl/configuration/ui/ConfigurationUiModule.xtend
@@ -25,6 +25,8 @@ import org.eclipse.xtext.documentation.IEObjectDocumentationProvider
 @FinalFieldsConstructor
 class ConfigurationUiModule extends AbstractConfigurationUiModule {
 	
+	// TODO has no effect for what ever reason
+/* 		
 	def Class<? extends IEObjectHoverProvider> bindIEObjectHoverProvider() {
 		ConfigurationHoverProvider
 	}
@@ -32,5 +34,5 @@ class ConfigurationUiModule extends AbstractConfigurationUiModule {
 	def Class<? extends IEObjectDocumentationProvider> bindIEObjectDocumentationProviderr() {
        ConfigurationEObjectDocumentationProvider
    }
-	
+	*/
 }
--- a/bundles/org.oceandsl.configuration.ui/src/org/oceandsl/configuration/ui/contentassist/ConfigurationProposalProvider.xtend
+++ b/bundles/org.oceandsl.configuration.ui/src/org/oceandsl/configuration/ui/contentassist/ConfigurationProposalProvider.xtend
@@ -19,6 +19,11 @@ import org.eclipse.xtext.ui.editor.contentassist.ICompletionProposalAcceptor
 import org.eclipse.xtext.RuleCall
 import org.eclipse.emf.ecore.EObject
 import org.eclipse.xtext.ui.editor.contentassist.ContentAssistContext
+import org.oceandsl.configuration.configuration.ModelSetup
+import org.eclipse.xtext.Assignment
+import org.eclipse.swt.custom.StyledText
+import org.eclipse.jface.viewers.StyledString
+import org.eclipse.jface.viewers.StyledString.Styler

 /**
 * See https://www.eclipse.org/Xtext/documentation/310_eclipse_support.html#content-assist
@@ -26,13 +31,29 @@ import org.eclipse.xtext.ui.editor.contentassist.ContentAssistContext
 */
 class ConfigurationProposalProvider extends AbstractConfigurationProposalProvider {
 	
-//	override void complete_Feature (
-//  		EObject model, RuleCall ruleCall, 
-//  		ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
-//		super.complete_Feature(model, ruleCall, context, acceptor)
-//		
-//		val proposal = context.prefix
-//		
-//		acceptor.accept(createCompletionProposal(proposal, context))
-//	}
+	
+	override void complete_Feature (
+  		EObject model, RuleCall ruleCall, 
+  		ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+		super.complete_Feature(model, ruleCall, context, acceptor)
+		
+		switch(model) {
+			ModelSetup : makeFeatureProposal(model, context, acceptor)
+		}		
+	}
+		
+	private def makeFeatureProposal(ModelSetup setup, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
+		// TODO this only view the main features, it does not work in modules
+		val allFeatures = setup.declarationModel.features
+		val usedFeatures = setup.features
+		
+		allFeatures.filter[feature | !usedFeatures.exists[it.declaration === feature]].forEach[
+			val text = new StyledString
+			text.append(it.name, StyledString.QUALIFIER_STYLER)
+			text.append("  ")
+			text.append(it.description)
+			acceptor.accept(createCompletionProposal(it.name, text, null, context))	
+		]		
+	}
+		
 }
--- a/bundles/org.oceandsl.configuration/META-INF/MANIFEST.MF
+++ b/bundles/org.oceandsl.configuration/META-INF/MANIFEST.MF
@@ -23,7 +23,7 @@ Require-Bundle: org.eclipse.xtext,
 org.eclipse.e4.core.di,
 org.oceandsl.expression,
 org.oceandsl.declaration,
- org.oceandsl.template;bundle-version="1.3.0"
+ org.oceandsl.template;bundle-version="1.3.1"
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: org.oceandsl.configuration,
 org.oceandsl.configuration.configuration,


--- a/bundles/org.oceandsl.configuration/src/org/oceandsl/configuration/generator/ConfigurationExpressionEvaluation.xtend
+++ b/bundles/org.oceandsl.configuration/src/org/oceandsl/configuration/generator/ConfigurationExpressionEvaluation.xtend
@@ -132,7 +132,4 @@ class ConfigurationExpressionEvaluation {
 	def dispatch Object compute(Enumeral enumeral) {
 		return enumeral
 	}
-	
-	
-	
 }
\ No newline at end of file
--- a/bundles/org.oceandsl.configuration/src/org/oceandsl/configuration/generator/FileTemplateHandler.xtend
+++ b/bundles/org.oceandsl.configuration/src/org/oceandsl/configuration/generator/FileTemplateHandler.xtend
@@ -13,6 +13,7 @@ import org.oceandsl.template.typing.BuiltinTypeResource
 import static org.oceandsl.configuration.generator.CombinedModelUtils.*
 import org.oceandsl.configuration.configuration.Diagnostics
 import org.oceandsl.configuration.configuration.StandardModuleConfiguration
+import org.oceandsl.configuration.configuration.Unit

 class FileTemplateHandler {
 	
@@ -40,10 +41,16 @@ class FileTemplateHandler {
 	
 	private def computeConfigurationScope(ConfigurationModel model) {
 		model.eAllContents.filter(ParameterAssignment).forEach[
-			this.registers.registerValue(it.declaration, this.configurationExpressionProcessor.compute(it.value))	
+			this.registers.registerValue(it.declaration,
+				adjustUnit(this.configurationExpressionProcessor.compute(it.value), it.unit))	
 		]
 	}
 	
+	private def adjustUnit(Object value, Unit unit) {
+		// TODO add unit adjustment 
+		return value
+	}
+
 	private def computeDeclarationScope(DeclarationModel model) {
 		model.eAllContents.filter(ParameterDeclaration).forEach[
 			if (it.defaultValue !== null)


--- a/bundles/org.oceandsl.declaration/src/org/oceandsl/declaration/Declaration.xtext
+++ b/bundles/org.oceandsl.declaration/src/org/oceandsl/declaration/Declaration.xtext
@@ -86,7 +86,7 @@ InlineEnumerationType returns types::InlineEnumerationType: '(' values+=Enumeral
 /** features */
 FeatureGroup returns FeatureGroup:
 	{FeatureGroup}
-	kind=EKind '{' subfeatures+=Feature ( "," subfeatures+=Feature)* '}' 
+	kind=EKind '{' subfeatures+=Feature* '}' 
 ;

 enum EKind returns EKind:


--- a/bundles/org.oceandsl.template.ui.tests/META-INF/MANIFEST.MF
+++ b/bundles/org.oceandsl.template.ui.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Automatic-Module-Name: org.oceandsl.template.ui.tests
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName$
 Bundle-Vendor: %providerName
-Bundle-Version: 1.3.0.qualifier
+Bundle-Version: 1.3.1.qualifier
 Bundle-SymbolicName: org.oceandsl.template.ui.tests; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.oceandsl.template.ui,


--- a/bundles/org.oceandsl.template.ui.tests/pom.xml
+++ b/bundles/org.oceandsl.template.ui.tests/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.oceandsl</groupId>
 		<artifactId>org.oceandsl.bundles</artifactId>
-		<version>1.3.0-SNAPSHOT</version>
+		<version>1.3.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.oceandsl.template.ui.tests</artifactId>
 	<packaging>eclipse-test-plugin</packaging>


--- a/bundles/org.oceandsl.template/.launch/Declaration Debugging.launch
+++ b/bundles/org.oceandsl.template/.launch/Declaration Debugging.launch
@@ -62,15 +62,12 @@
        <setEntry value="javax.xml.bind@default:default"/>
        <setEntry value="javax.xml@default:default"/>
        <setEntry value="net.i2p.crypto.eddsa@default:default"/>
-        <setEntry value="org.antlr.runtime*3.2.0.v201101311130@default:default"/>
-        <setEntry value="org.antlr.runtime*4.7.2.v20200218-0804@default:default"/>
+        <setEntry value="org.antlr.runtime@default:default"/>
        <setEntry value="org.apache.ant@default:default"/>
        <setEntry value="org.apache.batik.constants@default:default"/>
-        <setEntry value="org.apache.batik.css*1.14.0.v20210324-0332@default:default"/>
-        <setEntry value="org.apache.batik.css*1.6.0.v201011041432@default:default"/>
+        <setEntry value="org.apache.batik.css@default:default"/>
        <setEntry value="org.apache.batik.i18n@default:default"/>
-        <setEntry value="org.apache.batik.util*1.14.0.v20210324-0332@default:default"/>
-        <setEntry value="org.apache.batik.util*1.6.0.v201011041432@default:default"/>
+        <setEntry value="org.apache.batik.util@default:default"/>
        <setEntry value="org.apache.commons.cli@default:default"/>
        <setEntry value="org.apache.commons.codec@default:default"/>
        <setEntry value="org.apache.commons.compress@default:default"/>
@@ -91,8 +88,7 @@
        <setEntry value="org.apache.lucene.core@default:default"/>
        <setEntry value="org.apache.sshd.osgi@default:default"/>
        <setEntry value="org.apache.sshd.sftp@default:default"/>
-        <setEntry value="org.apache.xerces*2.12.1.v20210115-0812@default:default"/>
-        <setEntry value="org.apache.xerces*2.9.0.v201101211617@default:default"/>
+        <setEntry value="org.apache.xerces@default:default"/>
        <setEntry value="org.apache.xml.resolver@default:default"/>
        <setEntry value="org.apache.xml.serializer@default:default"/>
        <setEntry value="org.apache.xmlgraphics@default:default"/>
@@ -502,9 +498,8 @@
        <setEntry value="org.eclipse.xtend.examples@default:default"/>
        <setEntry value="org.eclipse.xtend.ide.common@default:default"/>
        <setEntry value="org.eclipse.xtend.ide@default:default"/>
-        <setEntry value="org.eclipse.xtend.lib*2.21.0.v20200302-1127@default:default"/>
-        <setEntry value="org.eclipse.xtend.lib*2.25.0.v20210301-0821@default:default"/>
        <setEntry value="org.eclipse.xtend.lib.macro@default:default"/>
+        <setEntry value="org.eclipse.xtend.lib@default:default"/>
        <setEntry value="org.eclipse.xtend.m2e@default:default"/>
        <setEntry value="org.eclipse.xtend.standalone@default:default"/>
        <setEntry value="org.eclipse.xtend.typesystem.emf@default:default"/>
@@ -542,8 +537,7 @@
        <setEntry value="org.eclipse.xtext.util@default:default"/>
        <setEntry value="org.eclipse.xtext.xbase.ide@default:default"/>
        <setEntry value="org.eclipse.xtext.xbase.junit@default:default"/>
-        <setEntry value="org.eclipse.xtext.xbase.lib*2.21.0.v20200302-1127@default:default"/>
-        <setEntry value="org.eclipse.xtext.xbase.lib*2.25.0.v20210301-0821@default:default"/>
+        <setEntry value="org.eclipse.xtext.xbase.lib@default:default"/>
        <setEntry value="org.eclipse.xtext.xbase.testing@default:default"/>
        <setEntry value="org.eclipse.xtext.xbase.ui.testing@default:default"/>
        <setEntry value="org.eclipse.xtext.xbase.ui@default:default"/>
@@ -578,15 +572,11 @@
        <setEntry value="org.sat4j.core@default:default"/>
        <setEntry value="org.sat4j.pb@default:default"/>
        <setEntry value="org.slf4j.api@default:default"/>
-        <setEntry value="org.sonatype.tycho.m2e@default:default"/>
        <setEntry value="org.tukaani.xz@default:default"/>
        <setEntry value="org.w3c.css.sac@default:default"/>
        <setEntry value="org.w3c.dom.events@default:default"/>
        <setEntry value="org.w3c.dom.smil@default:default"/>
        <setEntry value="org.w3c.dom.svg@default:default"/>
-        <setEntry value="qa.eclipse.plugin.bundles.checkstyle@default:default"/>
-        <setEntry value="qa.eclipse.plugin.bundles.common@default:default"/>
-        <setEntry value="qa.eclipse.plugin.bundles.pmd@default:default"/>
    </setAttribute>
    <setAttribute key="selected_workspace_bundles">
        <setEntry value="org.oceandsl.configuration.ide@default:default"/>


--- a/features/org.oceandsl.configuration.cli.feature/feature.xml
+++ b/features/org.oceandsl.configuration.cli.feature/feature.xml
@@ -19,7 +19,7 @@
      <import plugin="org.junit"/>
      <import plugin="org.junit.jupiter.api"/>
      <import plugin="org.eclipse.e4.core.di"/>
-      <import plugin="org.oceandsl.template" version="1.3.0" match="greaterOrEqual"/>
+      <import plugin="org.oceandsl.template" version="1.3.1" match="greaterOrEqual"/>
      <import plugin="org.apache.log4j"/>
      <import plugin="org.oceandsl.configuration"/>
      <import plugin="org.eclipse.xtext.ide"/>


--- a/releng/org.oceandsl.configuration.cli.site/category.xml
+++ b/releng/org.oceandsl.configuration.cli.site/category.xml
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/org.oceandsl.configuration.cli.feature_1.3.0.qualifier.jar" id="org.oceandsl.configuration.cli.feature" version="1.3.1.qualifier">
+   <feature url="features/org.oceandsl.configuration.cli.feature_1.3.1.qualifier.jar" id="org.oceandsl.configuration.cli.feature" version="1.3.1.qualifier">
      <category name="org.oceandsl.configuration"/>
   </feature>
   <category-def name="org.oceandsl.configuration" label="Configuration DSL"/>


--- a/releng/org.oceandsl.configuration.cli.site/configuration.cli.target
+++ b/releng/org.oceandsl.configuration.cli.site/configuration.cli.target
@@ -2,33 +2,9 @@
 <?pde version="3.8"?>
 <target name="org.oceandsl.configuration.cli.target" sequenceNumer="1">
 	<locations>
-		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
-			<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
-			<unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
-			<unit id="org.eclipse.draw2d.feature.group" version="0.0.0"/>
-			<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
-			<repository location="https://download.eclipse.org/releases/2021-12"/>
-		</location>
        <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<repository location="https://download.eclipse.org/technology/epp/packages/latest/"/>
 		</location>
-		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<unit id="com.google.gson" version="2.8.2.v20180104-1110"/>
-			<unit id="org.antlr.runtime" version="4.7.1.v20181120-0808"/>
-			<unit id="org.junit" version="4.12.0.v201504281640"/>
-			<unit id="org.junit.jupiter.api" version="5.5.1.v20190826-0900"/>
-			<unit id="org.junit.jupiter.engine" version="5.5.1.v20190826-0900"/>
-			<unit id="org.junit.platform.commons" version="1.5.1.v20190826-0900"/>
-			<unit id="org.junit.platform.engine" version="1.5.1.v20190826-0900"/>
-			<unit id="org.junit.platform.launcher" version="1.5.1.v20190826-0900"/>
-			<unit id="org.junit.platform.runner" version="1.5.1.v20190826-0900"/>
-			<unit id="org.opentest4j" version="1.2.0.v20190826-0900"/>
-			<unit id="org.objectweb.asm" version="7.1.0.v20190412-2143"/>
-			<unit id="org.objectweb.asm.tree" version="7.1.0.v20190412-2143"/>
-			<unit id="io.github.classgraph" version="4.8.35.v20190528-1517"/>
-			<repository location="https://download.eclipse.org/tools/orbit/downloads/2021-12"/>
-		</location>
        <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<repository location="https://download.eclipse.org/releases/latest"/>
 		</location>


--- a/releng/org.oceandsl.configuration.cli.site/org.oceandsl.configuration.cli.product
+++ b/releng/org.oceandsl.configuration.cli.site/org.oceandsl.configuration.cli.product