Structured Programming

plugins/de.cau.cs.kieler.language.server/src/de/cau/cs/kieler/language/server/LSCreator.xtend

@@ -19,6 +19,7 @@ import de.cau.cs.kieler.klighd.lsp.KGraphLanguageClient
 import de.cau.cs.kieler.klighd.lsp.interactive.layered.LayeredInteractiveLanguageServerExtension
 import de.cau.cs.kieler.klighd.lsp.interactive.rectpacking.RectpackingInteractiveLanguageServerExtension
 import de.cau.cs.kieler.klighd.lsp.launch.AbstractLsCreator
+import de.cau.cs.kieler.klighd.lsp.structuredProgramming.IStructuredProgrammingLanguageServerContribution
 import java.util.List
 import org.eclipse.xtext.Constants
 import org.eclipse.xtext.IGrammarAccess
@@ -37,6 +38,7 @@ class LSCreator extends AbstractLsCreator {
 
     RectpackingInteractiveLanguageServerExtension rectPack
 
+
     List<ILSDiagramHighlighter> diagramHighlighters
 
     List<ILanguageServerExtension> iLanguageServerExtensions
@@ -54,10 +56,14 @@ class LSCreator extends AbstractLsCreator {
     override getLanguageServerExtensions() {
         constraints = injector.getInstance(LayeredInteractiveLanguageServerExtension)
         rectPack = injector.getInstance(RectpackingInteractiveLanguageServerExtension)
+
         iLanguageServerExtensions = newArrayList(constraints, rectPack)
         for (lse : KielerServiceLoader.load(ILanguageServerContribution)) {
             iLanguageServerExtensions.add(lse.getLanguageServerExtension(injector))
         }
+        for (lse : KielerServiceLoader.load(IStructuredProgrammingLanguageServerContribution)){
+            iLanguageServerExtensions.add(lse.getLanguageServerExtension(injector))
+        }
         return iLanguageServerExtensions
     }
 
@@ -75,6 +81,9 @@ class LSCreator extends AbstractLsCreator {
         }
         constraints.client = languageClient as KGraphLanguageClient
         rectPack.client = languageClient as KGraphLanguageClient
+        for (lse : KielerServiceLoader.load(IStructuredProgrammingLanguageServerContribution)){
+            lse.setClient(injector, languageClient)
+        }
         diagramHighlighters = newArrayList
         for (iLSdhc : KielerServiceLoader.load(ILSDiagramHighlighterContribution)) {
             var highlighter = iLSdhc.getHighlighter(injector)

plugins/de.cau.cs.kieler.sccharts.ide/.classpath

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="xtend-gen"/>
+	<classpathentry kind="src" path="src-gen"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="xtend-gen"/>
-	<classpathentry kind="src" path="src-gen"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

plugins/de.cau.cs.kieler.sccharts.ide/META-INF/MANIFEST.MF

@@ -25,5 +25,4 @@ Require-Bundle: org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
 Export-Package: de.cau.cs.kieler.sccharts.ide.simulation,
  de.cau.cs.kieler.sccharts.ide.synthesis,
  de.cau.cs.kieler.sccharts.ide.text.contentassist.antlr,
- de.cau.cs.kieler.sccharts.ide.text.contentassist.antlr.internal,
- de.cau.cs.kieler.sccharts.ide.text.highlighting
+ de.cau.cs.kieler.sccharts.ide.text.contentassist.antlr.internal

plugins/de.cau.cs.kieler.sccharts.ide/build.properties

@@ -6,3 +6,4 @@ bin.includes = META-INF/,\
                .,\
                about.html
 src.includes = about.html
+jars.compile.order = .

plugins/de.cau.cs.kieler.sccharts.ui/META-INF/MANIFEST.MF

@@ -29,7 +29,7 @@ Require-Bundle: de.cau.cs.kieler.klighd,
  org.eclipse.elk.alg.force,
  org.eclipse.elk.alg.rectpacking;bundle-version="0.6.1",
  de.cau.cs.kieler.klighd.kgraph,
- de.cau.cs.kieler.sccharts.ide,
+ de.cau.cs.kieler.sccharts.ide;bundle-version="1.4.0",
  de.cau.cs.kieler.simulation.ui,
  com.google.gson;bundle-version="2.7.0",
  org.eclipse.ui.ide;bundle-version="3.14.0",
@@ -41,7 +41,12 @@ Require-Bundle: de.cau.cs.kieler.klighd,
  org.eclipse.jdt.core;bundle-version="3.19.0",
  de.cau.cs.kieler.kicool.ide,
  de.cau.cs.kieler.annotations.ide,
- org.eclipse.elk.core.service
+ org.eclipse.elk.core.service,
+ de.cau.cs.kieler.klighd.lsp;bundle-version="2.2.1",
+ de.cau.cs.kieler.scl.ide;bundle-version="1.4.0",
+ org.eclipse.sprotty;bundle-version="0.9.0",
+ org.eclipse.lsp4j;bundle-version="0.14.0",
+ de.cau.cs.kieler.language.server;bundle-version="1.4.0"
 Bundle-Vendor: Kiel University
 Bundle-ActivationPolicy: lazy
 Export-Package: de.cau.cs.kieler.sccharts.ui,

plugins/de.cau.cs.kieler.sccharts.ui/META-INF/services/de.cau.cs.kieler.sccharts.ui.synthesis.hooks.SynthesisHook

@@ -15,4 +15,5 @@ de.cau.cs.kieler.sccharts.ui.synthesis.hooks.InducedDataflowHook
 de.cau.cs.kieler.sccharts.ui.synthesis.hooks.ShowStateDependencyHook
 de.cau.cs.kieler.sccharts.ui.synthesis.hooks.ActionsAsDataflowHook
 de.cau.cs.kieler.sccharts.ui.debug.hooks.SetBreakpointActionHook
-de.cau.cs.kieler.sccharts.ui.synthesis.hooks.ModelOrderHook
+de.cau.cs.kieler.sccharts.ui.synthesis.hooks.ModelOrderHook
+de.cau.cs.kieler.sccharts.ui.synthesis.hooks.StructuralEditingHook