diff --git a/plugins/de.cau.cs.kieler.pragmatics.language.server/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.pragmatics.language.server/META-INF/MANIFEST.MF index 29cf6d77f..97935de71 100644 --- a/plugins/de.cau.cs.kieler.pragmatics.language.server/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.pragmatics.language.server/META-INF/MANIFEST.MF @@ -27,5 +27,6 @@ Require-Bundle: de.cau.cs.kieler.graphs.klighd, org.eclipse.xtend.lib, org.eclipse.xtext.ide, org.eclipse.xtext.xbase.lib, - org.aopalliance + org.aopalliance, + de.cau.cs.kieler.core;bundle-version="1.4.0" Export-Package: de.cau.cs.kieler.pragmatics.language.server diff --git a/plugins/de.cau.cs.kieler.pragmatics.language.server/src/de/cau/cs/kieler/pragmatics/language/server/PragmaticsLsCreator.xtend b/plugins/de.cau.cs.kieler.pragmatics.language.server/src/de/cau/cs/kieler/pragmatics/language/server/PragmaticsLsCreator.xtend index 0abf809d7..621c64c8c 100644 --- a/plugins/de.cau.cs.kieler.pragmatics.language.server/src/de/cau/cs/kieler/pragmatics/language/server/PragmaticsLsCreator.xtend +++ b/plugins/de.cau.cs.kieler.pragmatics.language.server/src/de/cau/cs/kieler/pragmatics/language/server/PragmaticsLsCreator.xtend @@ -12,10 +12,12 @@ */ package de.cau.cs.kieler.pragmatics.language.server +import de.cau.cs.kieler.core.services.KielerServiceLoader 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 /** * Provides methods to create a LS. @@ -29,12 +31,17 @@ class PragmaticsLsCreator extends AbstractLsCreator { RectpackingInteractiveLanguageServerExtension rectPack + override getLanguageServerExtensions() { constraints = injector.getInstance(LayeredInteractiveLanguageServerExtension) rectPack = injector.getInstance(RectpackingInteractiveLanguageServerExtension) + val iLanguageServerExtensions = newArrayList( injector.getInstance(PragmaticsRegistrationLanguageServerExtension), constraints, rectPack ) + for (lse : KielerServiceLoader.load(IStructuredProgrammingLanguageServerContribution)){ + iLanguageServerExtensions.add(lse.getLanguageServerExtension(injector)) + } return iLanguageServerExtensions }