Skip to content

Commit

Permalink
refactor!: replace references to Simple-ML with Safe-DS (#55)
Browse files Browse the repository at this point in the history
* refactor: update file extensions in src

* refactor: update file extensions in resources

* refactor: rename several folders

* refactor: move more stuff around

* refactor: replace remaining Simple-ML references

* refactor: replace remaining Simple-ML references

* fix: `installExtension` Gradle task not working

* fix: broken syntax highlighting

* style: remove comments (linter error)

* refactor: rename missed files

* docs: fix broken links

* ci: ignore local links (maybe?)

* style: apply automatic fixes of linters

Co-authored-by: lars-reimann <lars-reimann@users.noreply.github.com>
  • Loading branch information
lars-reimann and lars-reimann authored Jun 15, 2022
1 parent 91acc11 commit 396f229
Show file tree
Hide file tree
Showing 745 changed files with 11,736 additions and 11,763 deletions.
30 changes: 15 additions & 15 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,27 +6,27 @@
version: 2
updates:
# Root
- package-ecosystem: "github-actions"
directory: "/"
- package-ecosystem: 'github-actions'
directory: '/'
schedule:
interval: "monthly"
interval: 'monthly'

# DSL
- package-ecosystem: "gradle"
directory: "/DSL"
- package-ecosystem: 'gradle'
directory: '/DSL'
schedule:
interval: "monthly"
- package-ecosystem: "npm"
directory: "/DSL/de.unibonn.simpleml.vscode"
interval: 'monthly'
- package-ecosystem: 'npm'
directory: '/DSL/com.larsreimann.safeds.vscode'
schedule:
interval: "monthly"
interval: 'monthly'

# Runtime
- package-ecosystem: "pip"
directory: "/Runtime/safe-ds"
- package-ecosystem: 'pip'
directory: '/Runtime/safe-ds'
schedule:
interval: "monthly"
- package-ecosystem: "pip"
directory: "/Runtime/safe-ds-runner"
interval: 'monthly'
- package-ecosystem: 'pip'
directory: '/Runtime/safe-ds-runner'
schedule:
interval: "monthly"
interval: 'monthly'
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
with:
name: Test report
# upload-artifact does not use working-directory
path: DSL/de.unibonn.simpleml/build/reports/tests/test/
path: DSL/com.larsreimann.safeds/build/reports/tests/test/

# Build and test Runtime > Runner component
build-runtime-runner:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ jobs:
name: Test report
# upload-artifact does not use working-directory
path: |
DSL/de.unibonn.simpleml/build/reports/tests/test/
DSL/de.unibonn.simpleml.ide/build/reports/tests/test/
DSL/com.larsreimann.safeds/build/reports/tests/test/
DSL/com.larsreimann.safeds.ide/build/reports/tests/test/
- name: Upload test coverage
if: ${{ github.actor != 'dependabot[bot]' }}
Expand Down
3 changes: 3 additions & 0 deletions .markdown-link-check.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"ignorePatterns": ["(^#.*)"]
}
2 changes: 1 addition & 1 deletion .mega-linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
EXTENDS: https://raw.githubusercontent.com/lars-reimann/.github/main/.mega-linter.yml

# Config
FILTER_REGEX_EXCLUDE: (\.github/workflows/|DSL/de\.unibonn\.simpleml/src/test/resources/)
FILTER_REGEX_EXCLUDE: (\.github/workflows/|DSL/com\.larsreimann\.safeds/src/test/resources/)
2 changes: 1 addition & 1 deletion DSL/.gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# Xtext test module (gets created by workflow but removed afterwards)
de.unibonn.simpleml.tests/
com.larsreimann.safeds.tests/
96 changes: 48 additions & 48 deletions DSL/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import de.unibonn.simpleml.xtextConfiguration.code
import de.unibonn.simpleml.xtextConfiguration.configuration
import de.unibonn.simpleml.xtextConfiguration.directoryCleaner
import de.unibonn.simpleml.xtextConfiguration.ecoreGenerator
import de.unibonn.simpleml.xtextConfiguration.execute
import de.unibonn.simpleml.xtextConfiguration.project
import de.unibonn.simpleml.xtextConfiguration.projectMapping
import de.unibonn.simpleml.xtextConfiguration.standaloneSetup
import de.unibonn.simpleml.xtextConfiguration.standardLanguage
import de.unibonn.simpleml.xtextConfiguration.workflow
import de.unibonn.simpleml.xtextConfiguration.xtextGenerator
import com.larsreimann.safeds.xtextConfiguration.code
import com.larsreimann.safeds.xtextConfiguration.configuration
import com.larsreimann.safeds.xtextConfiguration.directoryCleaner
import com.larsreimann.safeds.xtextConfiguration.ecoreGenerator
import com.larsreimann.safeds.xtextConfiguration.execute
import com.larsreimann.safeds.xtextConfiguration.project
import com.larsreimann.safeds.xtextConfiguration.projectMapping
import com.larsreimann.safeds.xtextConfiguration.standaloneSetup
import com.larsreimann.safeds.xtextConfiguration.standardLanguage
import com.larsreimann.safeds.xtextConfiguration.workflow
import com.larsreimann.safeds.xtextConfiguration.xtextGenerator
import org.eclipse.xtext.xtext.generator.formatting.Formatter2Fragment2
import org.eclipse.xtext.xtext.generator.generator.GeneratorFragment2
import org.eclipse.xtext.xtext.generator.junit.JUnitFragment
Expand Down Expand Up @@ -42,19 +42,19 @@ kover {
coverageEngine.set(kotlinx.kover.api.CoverageEngine.INTELLIJ)
intellijEngineVersion.set("1.0.669")
this.disabledProjects = setOf(
"Simple-ML.DSL",
"de.unibonn.simpleml.vscode"
"Safe-DS.DSL",
"com.larsreimann.safeds.vscode"
)
}

val koverExcludes = listOf(
"de.unibonn.simpleml.parser.antlr.*",
"de.unibonn.simpleml.serializer.AbstractSimpleMLSemanticSequencer",
"de.unibonn.simpleml.serializer.AbstractSimpleMLSyntacticSequencer",
"de.unibonn.simpleml.services.*",
"de.unibonn.simpleml.simpleML.*",
"de.unibonn.simpleml.testing.*",
"de.unibonn.simpleml.ide.contentassist.antlr.*"
"com.larsreimann.safeds.parser.antlr.*",
"com.larsreimann.safeds.serializer.AbstractSafeDSSemanticSequencer",
"com.larsreimann.safeds.serializer.AbstractSafeDSSyntacticSequencer",
"com.larsreimann.safeds.services.*",
"com.larsreimann.safeds.safeDS.*",
"com.larsreimann.safeds.testing.*",
"com.larsreimann.safeds.ide.contentassist.antlr.*"
)

// Variables -----------------------------------------------------------------------------------------------------------
Expand All @@ -65,7 +65,7 @@ val xtextVersion by extra("2.27.0")
// Subprojects ---------------------------------------------------------------------------------------------------------

subprojects {
group = "de.unibonn.simpleml"
group = "com.larsreimann"
version = "1.0.0-SNAPSHOT"

repositories {
Expand All @@ -84,21 +84,21 @@ tasks.register("generateXtextLanguage") {
outputs.cacheIf { true }

inputs.files(
"$rootPath/de.unibonn.simpleml/model/SimpleML.ecore",
"$rootPath/de.unibonn.simpleml/model/SimpleML.genmodel",
"$rootPath/de.unibonn.simpleml/src/main/kotlin/de/unibonn/simpleml/SimpleML.xtext"
"$rootPath/com.larsreimann.safeds/model/SafeDS.ecore",
"$rootPath/com.larsreimann.safeds/model/SafeDS.genmodel",
"$rootPath/com.larsreimann.safeds/src/main/kotlin/com/larsreimann/safeds/SafeDS.xtext"
)
outputs.dirs(
"$rootPath/de.unibonn.simpleml/META-INF",
"$rootPath/de.unibonn.simpleml/emf-gen",
"$rootPath/de.unibonn.simpleml/src-gen",
"$rootPath/de.unibonn.simpleml.ide/src-gen",
"$rootPath/de.unibonn.simpleml.tests"
"$rootPath/com.larsreimann.safeds/META-INF",
"$rootPath/com.larsreimann.safeds/emf-gen",
"$rootPath/com.larsreimann.safeds/src-gen",
"$rootPath/com.larsreimann.safeds.ide/src-gen",
"$rootPath/com.larsreimann.safeds.tests"
)
outputs.files(
"$rootPath/de.unibonn.simpleml/build.properties",
"$rootPath/de.unibonn.simpleml/plugin.properties",
"$rootPath/de.unibonn.simpleml/plugin.xml"
"$rootPath/com.larsreimann.safeds/build.properties",
"$rootPath/com.larsreimann.safeds/plugin.properties",
"$rootPath/com.larsreimann.safeds/plugin.xml"
)

doFirst {
Expand All @@ -108,36 +108,36 @@ tasks.register("generateXtextLanguage") {
setScanClassPath(true)

projectMapping(
projectName = "de.unibonn.simpleml",
path = "$rootPath/de.unibonn.simpleml"
projectName = "com.larsreimann.safeds",
path = "$rootPath/com.larsreimann.safeds"
)

projectMapping(
projectName = "de.unibonn.simpleml.ide",
path = "$rootPath/de.unibonn.simpleml.ide"
projectName = "com.larsreimann.safeds.ide",
path = "$rootPath/com.larsreimann.safeds.ide"
)
}

directoryCleaner("$rootPath/de.unibonn.simpleml/emf-gen")
directoryCleaner("$rootPath/com.larsreimann.safeds/emf-gen")

ecoreGenerator(
genModel = "platform:/resource/de.unibonn.simpleml/model/SimpleML.genmodel",
srcPaths = listOf("platform:/resource/de.unibonn.simpleml/src/main/kotlin")
genModel = "platform:/resource/com.larsreimann.safeds/model/SafeDS.genmodel",
srcPaths = listOf("platform:/resource/com.larsreimann.safeds/src/main/kotlin")
)

xtextGenerator {
configuration {
project {
baseName = "de.unibonn.simpleml"
baseName = "com.larsreimann.safeds"
this.rootPath = rootPath

runtime = RuntimeProjectConfig().apply {
setSrc("$rootPath/de.unibonn.simpleml/src/main/kotlin")
setSrc("$rootPath/com.larsreimann.safeds/src/main/kotlin")
}

genericIde = BundleProjectConfig().apply {
isEnabled = true
setSrc("$rootPath/de.unibonn.simpleml.ide/src/main/kotlin")
setSrc("$rootPath/com.larsreimann.safeds.ide/src/main/kotlin")
}

runtimeTest = BundleProjectConfig().apply {
Expand All @@ -156,9 +156,9 @@ tasks.register("generateXtextLanguage") {
}

standardLanguage {
setName("de.unibonn.simpleml.SimpleML")
setFileExtensions("smlflow,smlstub,smltest")
addReferencedResource("platform:/resource/de.unibonn.simpleml/model/SimpleML.genmodel")
setName("com.larsreimann.safeds.SafeDS")
setFileExtensions("sdsflow,sdsstub,sdstest")
addReferencedResource("platform:/resource/com.larsreimann.safeds/model/SafeDS.genmodel")

setFormatter(
Formatter2Fragment2().apply {
Expand Down Expand Up @@ -197,16 +197,16 @@ tasks.register("generateXtextLanguage") {

doLast {
delete(
fileTree("$rootPath/de.unibonn.simpleml/src") {
fileTree("$rootPath/com.larsreimann.safeds/src") {
include("**/*.xtend")
}
)
delete(
fileTree("$rootPath/de.unibonn.simpleml.ide/src") {
fileTree("$rootPath/com.larsreimann.safeds.ide/src") {
include("**/*.xtend")
}
)
delete(file("$rootPath/de.unibonn.simpleml.tests"))
delete(file("$rootPath/com.larsreimann.safeds.tests"))
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@file:Suppress("unused")

package de.unibonn.simpleml.xtextConfiguration
package com.larsreimann.safeds.xtextConfiguration

import org.eclipse.emf.mwe.utils.DirectoryCleaner
import org.eclipse.emf.mwe.utils.ProjectMapping
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
/src-gen
/test-data
src-gen/
*.xtend
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,17 @@ java {
}

application {
mainClass.set("de.unibonn.simpleml.ide.ServerLauncher2")
mainClass.set("com.larsreimann.safeds.ide.ServerLauncher2")
}

// Dependencies --------------------------------------------------------------------------------------------------------

dependencies {
implementation(project(":de.unibonn.simpleml"))
implementation(project(":com.larsreimann.safeds"))
implementation("org.eclipse.xtext:org.eclipse.xtext.ide:$xtextVersion")

testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
testImplementation(testFixtures(project(":de.unibonn.simpleml")))
testImplementation(testFixtures(project(":com.larsreimann.safeds")))
testImplementation("org.junit.jupiter:junit-jupiter-api")
testImplementation("org.eclipse.xtext:org.eclipse.xtext.testing:$xtextVersion")
testImplementation("org.eclipse.xtext:org.eclipse.xtext.xbase.testing:$xtextVersion")
Expand All @@ -46,7 +46,7 @@ sourceSets {
// Tasks ---------------------------------------------------------------------------------------------------------------

val koverExcludes = listOf(
"de.unibonn.simpleml.ide.contentassist.antlr.*"
"com.larsreimann.safeds.ide.contentassist.antlr.*"
)

tasks {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package de.unibonn.simpleml.ide
package com.larsreimann.safeds.ide

import de.unibonn.simpleml.ide.server.project.SimpleMLProjectManager
import com.larsreimann.safeds.ide.server.project.SafeDSProjectManager
import org.eclipse.xtext.ide.server.ProjectManager
import org.eclipse.xtext.ide.server.ServerModule

class CustomServerModule : ServerModule() {
override fun configure() {
super.configure()
bind(ProjectManager::class.java).to(SimpleMLProjectManager::class.java)
bind(ProjectManager::class.java).to(SafeDSProjectManager::class.java)
}
}
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package de.unibonn.simpleml.ide

import de.unibonn.simpleml.ide.editor.contentassist.SimpleMLIdeContentProposalProvider
import de.unibonn.simpleml.ide.server.codelens.SimpleMLCodeLensProvider
import de.unibonn.simpleml.ide.server.commands.SimpleMLExecutableCommandService
import de.unibonn.simpleml.ide.server.hover.SimpleMLHoverService
import de.unibonn.simpleml.ide.server.symbol.SimpleMLDocumentSymbolDeprecationInfoProvider
import de.unibonn.simpleml.ide.server.symbol.SimpleMLDocumentSymbolDetailsProvider
import de.unibonn.simpleml.ide.server.symbol.SimpleMLDocumentSymbolKindProvider
import de.unibonn.simpleml.ide.server.symbol.SimpleMLDocumentSymbolNameProvider
package com.larsreimann.safeds.ide

import com.larsreimann.safeds.ide.editor.contentassist.SafeDSIdeContentProposalProvider
import com.larsreimann.safeds.ide.server.codelens.SafeDSCodeLensProvider
import com.larsreimann.safeds.ide.server.commands.SafeDSExecutableCommandService
import com.larsreimann.safeds.ide.server.hover.SafeDSHoverService
import com.larsreimann.safeds.ide.server.symbol.SafeDSDocumentSymbolDeprecationInfoProvider
import com.larsreimann.safeds.ide.server.symbol.SafeDSDocumentSymbolDetailsProvider
import com.larsreimann.safeds.ide.server.symbol.SafeDSDocumentSymbolKindProvider
import com.larsreimann.safeds.ide.server.symbol.SafeDSDocumentSymbolNameProvider
import org.eclipse.xtext.ide.editor.contentassist.IdeContentProposalProvider
import org.eclipse.xtext.ide.server.codelens.ICodeLensResolver
import org.eclipse.xtext.ide.server.codelens.ICodeLensService
Expand All @@ -18,40 +18,40 @@ import org.eclipse.xtext.ide.server.symbol.DocumentSymbolMapper
/**
* Use this class to register IDE components.
*/
class SimpleMLIdeModule : AbstractSimpleMLIdeModule() {
class SafeDSIdeModule : AbstractSafeDSIdeModule() {
fun bindICodeLensResolver(): Class<out ICodeLensResolver> {
return SimpleMLCodeLensProvider::class.java
return SafeDSCodeLensProvider::class.java
}

fun bindICodeLensService(): Class<out ICodeLensService> {
return SimpleMLCodeLensProvider::class.java
return SafeDSCodeLensProvider::class.java
}

fun bindIExecutableCommandService(): Class<out IExecutableCommandService> {
return SimpleMLExecutableCommandService::class.java
return SafeDSExecutableCommandService::class.java
}

fun bindDocumentSymbolDeprecationInfoProvider(): Class<out DocumentSymbolMapper.DocumentSymbolDeprecationInfoProvider> {
return SimpleMLDocumentSymbolDeprecationInfoProvider::class.java
return SafeDSDocumentSymbolDeprecationInfoProvider::class.java
}

fun bindDocumentSymbolDetailsProvider(): Class<out DocumentSymbolMapper.DocumentSymbolDetailsProvider> {
return SimpleMLDocumentSymbolDetailsProvider::class.java
return SafeDSDocumentSymbolDetailsProvider::class.java
}

fun bindDocumentSymbolKindProvider(): Class<out DocumentSymbolMapper.DocumentSymbolKindProvider> {
return SimpleMLDocumentSymbolKindProvider::class.java
return SafeDSDocumentSymbolKindProvider::class.java
}

fun bindDocumentSymbolNameProvider(): Class<out DocumentSymbolMapper.DocumentSymbolNameProvider> {
return SimpleMLDocumentSymbolNameProvider::class.java
return SafeDSDocumentSymbolNameProvider::class.java
}

fun bindIdeContentProposalProvider(): Class<out IdeContentProposalProvider> {
return SimpleMLIdeContentProposalProvider::class.java
return SafeDSIdeContentProposalProvider::class.java
}

fun bindHoverService(): Class<out HoverService> {
return SimpleMLHoverService::class.java
return SafeDSHoverService::class.java
}
}
Loading

0 comments on commit 396f229

Please sign in to comment.