Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Restructured Language Server Component #91

Merged
merged 14 commits into from
Sep 4, 2023
Merged

Restructured Language Server Component #91

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
0ce59ef
Adjusted poms
a-sr Aug 17, 2023
b65716d
Factored out all language server code into a pure Maven project
a-sr Aug 21, 2023
c630e80
Removed sprotty and klighd.lsp from the target platform
a-sr Aug 21, 2023
b750c7e
Fixed class path in run configuration for LS
a-sr Aug 21, 2023
98cb8a1
Bumped target platform to latest Eclipse release 2023-06
a-sr Aug 21, 2023
ebc1241
Switched to Java 17 as execution env. to satisfy latest Eclipse plugins
a-sr Aug 21, 2023
1c4dd18
Adjusted CI build config to Java 17
a-sr Aug 21, 2023
4edbb47
Added maven configuration from maven-xtext-example to fix build error…
a-sr Aug 21, 2023
79c9f04
Removed potentially redundant maven repos
a-sr Aug 22, 2023
edc7314
Adjusted oomph setup to request Java 17 JRE
a-sr Aug 22, 2023
832c633
Corrected LSDiagramHighlighter service interface naming.
soerendomroes Aug 29, 2023
375d907
Added ELK + Klighd launch config, upgraded keith and elk streams.
soerendomroes Aug 29, 2023
526f0d8
Updated update site configuration
a-sr Sep 4, 2023
0469582
Organized imports
a-sr Sep 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 6 additions & 20 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ jobs:
steps:
# Setup
- uses: actions/checkout@v2
- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v2
with:
java-version: '11'
java-version: '17'
distribution: 'adopt'

- name: Cache local Maven repository
Expand Down Expand Up @@ -65,7 +65,7 @@ jobs:
cp -r build/de.cau.cs.kieler.kicool.klighd.cli/target/exe/* products/cli
cp -r build/de.cau.cs.kieler.sccharts.cli/target/exe/* products/cli
mkdir products/ls
cp -r build/de.cau.cs.kieler.language.server.cli/target/exe/* products/ls
cp build/de.cau.cs.kieler.language.server.cli/target/de.cau.cs.kieler.language.server.cli-*-app.jar products/ls
- name: Archive All Products
if: ${{ github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/release-') }}
uses: actions/upload-artifact@v2
Expand Down Expand Up @@ -198,23 +198,9 @@ jobs:
# if-no-files-found: error

# Kieler Language Server
- name: Archive KIELER Language Server Windows
- name: Archive KIELER Language Server
uses: actions/upload-artifact@v2
with:
name: KIELER Language Server Windows
path: build/de.cau.cs.kieler.language.server.cli/target/exe/kieler-language-server.win.jar
if-no-files-found: error

- name: Archive KIELER Language Server Linux
uses: actions/upload-artifact@v2
with:
name: KIELER Language Server Linux
path: build/de.cau.cs.kieler.language.server.cli/target/exe/kieler-language-server.linux.jar
if-no-files-found: error

- name: Archive KIELER Language Server MacOS
uses: actions/upload-artifact@v2
with:
name: KIELER Language Server MacOS
path: build/de.cau.cs.kieler.language.server.cli/target/exe/kieler-language-server.osx.jar
name: KIELER Language Server
path: build/de.cau.cs.kieler.language.server.cli/target/de.cau.cs.kieler.language.server.cli-*-app.jar
if-no-files-found: error
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ xtend-gen/
target/
**/.antlr-generator
build/de.cau.cs.kieler.semantics.product.repository/de.cau.cs.kieler.core.product/
dependencies.txt
dependencies.txt
.tycho-consumer-pom.xml
2 changes: 1 addition & 1 deletion build/de.cau.cs.kieler.kicool.cli/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<parent>
<groupId>de.cau.cs.kieler</groupId>
<artifactId>parent</artifactId>
<artifactId>semantics</artifactId>
<version>0.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Expand Down
2 changes: 1 addition & 1 deletion build/de.cau.cs.kieler.kicool.klighd.cli/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<parent>
<groupId>de.cau.cs.kieler</groupId>
<artifactId>parent</artifactId>
<artifactId>semantics</artifactId>
<version>0.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Expand Down
4 changes: 2 additions & 2 deletions build/de.cau.cs.kieler.language.server.cli/.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.pde.UpdateSiteBuilder</name>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.UpdateSiteNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
26 changes: 0 additions & 26 deletions build/de.cau.cs.kieler.language.server.cli/category.xml
View file
Open in desktop

This file was deleted.

116 changes: 79 additions & 37 deletions build/de.cau.cs.kieler.language.server.cli/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,64 +4,106 @@

<version>1.4.0-SNAPSHOT</version>
<artifactId>de.cau.cs.kieler.language.server.cli</artifactId>
<packaging>eclipse-repository</packaging>
<name>KIELER Language Server CLI</name>

<parent>
<groupId>de.cau.cs.kieler</groupId>
<artifactId>parent</artifactId>
<artifactId>semantics</artifactId>
<version>0.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<properties>
<category.file>${basedir}/category.xml</category.file>
<update.site.jars>${project.build.directory}/repository/plugins</update.site.jars>
<python.script>${basedir}/../scripts/uberjar.py</python.script>
<executableName>kieler-language-server</executableName>
<mainClass>de.cau.cs.kieler.language.server.LanguageServer</mainClass>
<python.script.output>${project.build.directory}/exe</python.script.output>
</properties>
<dependencies>

<!-- See build/scripts/uberjar.py on the concept behind this build process -->
<!-- DO NOT add new dependencies here but in either language.server or language.server.components! -->

<dependency>
<groupId>de.cau.cs.kieler</groupId>
<artifactId>de.cau.cs.kieler.language.server</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>de.cau.cs.kieler</groupId>
<artifactId>de.cau.cs.kieler.language.server.components</artifactId>
<version>${project.version}</version>
<type>pom</type>
</dependency>
</dependencies>

<build>
<plugins>
<!-- Build an uber jar with Maven Shade -->
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-repository-plugin</artifactId>
<version>${tycho-version}</version>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.2.4</version>
<configuration>
<skipArchive>true</skipArchive>
<!-- Build self-contained update site for uber-jar -->
<includeAllDependencies>true</includeAllDependencies>
<shadedArtifactAttached>true</shadedArtifactAttached>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>de.cau.cs.kieler.language.server.LanguageServer</mainClass>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>plugin.properties</resource>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">
<addHeader>false</addHeader>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer" />
</transformers>
<filters>
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>**/*._trace</exclude>
<exclude>**/*.ecore</exclude>
<exclude>**/*.g</exclude>
<exclude>**/*.genmodel</exclude>
<exclude>**/*.mwe2</exclude>
<exclude>**/*.xsd</exclude>
<exclude>**/*.xtext</exclude>
<exclude>*.profile</exclude>
<exclude>*.html</exclude>
<exclude>.api_description</exclude>
<exclude>.genmodel</exclude>
<exclude>.options</exclude>
<exclude>about.*</exclude>
<exclude>about_files/*</exclude>
<exclude>fragment.properties</exclude>
<exclude>META-INF/*.inf</exclude>
<exclude>META-INF/*.RSA</exclude>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/INDEX.LIST</exclude>
<exclude>META-INF/MANIFEST.MF</exclude>
<exclude>modeling32.png</exclude>
<exclude>OSGI-INF/l10n/bundle.properties</exclude>
<exclude>plugin.xml</exclude>
<exclude>profile.list</exclude>
<exclude>schema/*.exsd</exclude>
<exclude>systembundle.properties</exclude>
<exclude>xtext32.png</exclude>
</excludes>
</filter>
<filter>
<artifact>org.eclipse.platform:*</artifact>
<excludes>
<exclude>**/*.png</exclude>
</excludes>
</filter>
</filters>
<shadedArtifactAttached>true</shadedArtifactAttached>
<shadedClassifierName>app</shadedClassifierName>
<minimizeJar>false</minimizeJar>
</configuration>
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.6.0</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>exec</goal>
<goal>shade</goal>
</goals>
</execution>
</executions>
<configuration>
<executable>python</executable>
<workingDirectory>${project.build.directory}</workingDirectory>
<arguments>
<argument>${python.script}</argument>
<argument>${update.site.jars}</argument>
<argument>${executableName}</argument>
<argument>${mainClass}</argument>
<argument>${python.script.output}</argument>
<argument>${project.build.directory}</argument>
</arguments>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
2 changes: 1 addition & 1 deletion build/de.cau.cs.kieler.sccharts.cli/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<parent>
<groupId>de.cau.cs.kieler</groupId>
<artifactId>parent</artifactId>
<artifactId>semantics</artifactId>
<version>0.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Expand Down
2 changes: 1 addition & 1 deletion build/de.cau.cs.kieler.semantics.product.repository/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<parent>
<groupId>de.cau.cs.kieler</groupId>
<artifactId>parent</artifactId>
<artifactId>semantics</artifactId>
<version>0.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Expand Down
13 changes: 6 additions & 7 deletions build/de.cau.cs.kieler.semantics.repository/category.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,13 @@
<category name="kieler-sources"/>
</feature>
<!-- Repository references to associated sites -->
<repository-reference location="http://download.eclipse.org/releases/2022-09" enabled="true"/>
<repository-reference location="http://download.eclipse.org/tools/orbit/downloads/drops/R20220830213456/repository/" enabled="true"/>
<repository-reference location="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.28.0/" enabled="true"/>
<repository-reference location="http://download.eclipse.org/lsp4j/updates/releases/0.15.0/" enabled="true"/>
<repository-reference location="http://kieler.github.io/KLighD/v2.2.0/" enabled="true"/>
<repository-reference location="http://rtsys.informatik.uni-kiel.de/~kieler/updatesite/release_pragmatics_2022-07" enabled="true"/>
<repository-reference location="https://download.eclipse.org/releases/2022-09" enabled="true"/>
<repository-reference location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220830213456/repository/" enabled="true"/>
<repository-reference location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.28.0/" enabled="true"/>
<repository-reference location="https://download.eclipse.org/lsp4j/updates/releases/0.15.0/" enabled="true"/>
<repository-reference location="https://kieler.github.io/KLighD/v2.3.0/" enabled="true"/>
<repository-reference location="https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/release_pragmatics_2023-06" enabled="true"/>
a-sr marked this conversation as resolved.
Show resolved Hide resolved
<repository-reference location="https://download.eclipse.org/elk/updates/releases/0.8.1/" enabled="true"/>
<repository-reference location="http://download.eclipse.org/egit/updates" enabled="true"/>
<repository-reference location="https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/websocket-mirror/10.0.11/" enabled="true"/>
<repository-reference location="https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/sprotty/0.9.0/" enabled="true"/>
a-sr marked this conversation as resolved.
Show resolved Hide resolved
</site>
2 changes: 1 addition & 1 deletion build/de.cau.cs.kieler.semantics.repository/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<parent>
<groupId>de.cau.cs.kieler</groupId>
<artifactId>parent</artifactId>
<artifactId>semantics</artifactId>
<version>0.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Expand Down
26 changes: 9 additions & 17 deletions ...e.cau.cs.kieler.semantics.targetplatform/de.cau.cs.kieler.semantics.targetplatform.target
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,61 +5,53 @@
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
<unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
<unit id="org.eclipse.cdt.feature.group" version="0.0.0"/>
<unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.compare.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.mwe2.launcher.feature.group" version="0.0.0"/>
<unit id="org.eclipse.epp.mpc.feature.group" version="0.0.0"/>
<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
<unit id="org.eclipse.jetty.server" version="0.0.0"/>
<unit id="org.eclipse.jetty.servlet" version="0.0.0"/>
<repository location="http://download.eclipse.org/releases/2022-09"/>
<repository location="https://download.eclipse.org/releases/2023-06"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
<unit id="jakarta.servlet" version="0.0.0"/>
<unit id="com.google.gson" version="0.0.0"/>
<unit id="org.freemarker" version="0.0.0"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20220830213456/repository/"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.xtext.ui.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.28.0/"/>
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.31.0/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
<unit id="org.eclipse.lsp4j.sdk.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/lsp4j/updates/releases/0.15.0/"/>
<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.21.0/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
<unit id="de.cau.cs.kieler.klighd.feature.feature.group" version="0.0.0"/>
<unit id="de.cau.cs.kieler.klighd.freehep.feature.feature.group" version="0.0.0"/>
<unit id="de.cau.cs.kieler.klighd.ide.feature.feature.group" version="0.0.0"/>
<unit id="de.cau.cs.kieler.klighd.lsp" version="0.0.0"/>
<unit id="de.cau.cs.kieler.klighd.view.feature.feature.group" version="0.0.0"/>
<unit id="de.cau.cs.kieler.klighd.standalone" version="0.0.0"/>
<unit id="de.cau.cs.kieler.klighd.ui.contrib3x" version="0.0.0"/>
<unit id="de.cau.cs.kieler.kgraph.text.ui" version="0.0.0"/>
<repository location="http://kieler.github.io/KLighD/v2.2.0/"/>
<repository location="https://kieler.github.io/KLighD/v2.3.0/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
<unit id="de.cau.cs.kieler.graphs.klighd" version="0.0.0"/>
<unit id="de.cau.cs.kieler.pragmatics.language.server" version="0.0.0"/>
<repository location="http://rtsys.informatik.uni-kiel.de/~kieler/updatesite/release_pragmatics_2022-07"/>
<repository location="https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/release_pragmatics_2023-06"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
<unit id="org.eclipse.elk.graphviz.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.elk.ui.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.elk.sdk.feature.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/elk/updates/releases/0.8.1/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
<unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/egit/updates"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
<unit id="de.cau.cs.kieler.websocket.mirror" version="0.0.0"/>
<repository location="https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/websocket-mirror/10.0.11/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
<unit id="org.eclipse.sprotty" version="0.0.0"/>
<repository location="https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/sprotty/0.9.0/"/>
<repository location="https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/websocket-mirror/10.0.15/"/>
</location>
</locations>
</target>
2 changes: 1 addition & 1 deletion build/de.cau.cs.kieler.semantics.targetplatform/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

<parent>
<groupId>de.cau.cs.kieler</groupId>
<artifactId>parent</artifactId>
<artifactId>semantics</artifactId>
<version>0.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Expand Down
Loading