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.

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

MODELIX-605 Implement adapters for the direction I -> S #318

Merged
merged 4 commits into from
Nov 14, 2023
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
fix(mps-model-adapters): fix declared dependencies and simplify NodeA…
…sMPSDependency
mhuster23 committed Nov 10, 2023
commit 02e4f5dcbbcb60d4b6fb3ada98e9a52ce6574295
Original file line number Diff line number Diff line change
@@ -19,36 +19,18 @@ package org.modelix.model.mpsadapters.mps
import org.jetbrains.mps.openapi.module.SDependency
import org.jetbrains.mps.openapi.module.SDependencyScope
import org.jetbrains.mps.openapi.module.SModule
import org.jetbrains.mps.openapi.module.SModuleReference
import org.jetbrains.mps.openapi.module.SRepository
import org.modelix.model.api.INode
import org.modelix.model.mpsadapters.MPSModuleDependencyAsNode
import org.modelix.model.mpsadapters.MPSModuleReference

data class NodeAsMPSDependency(val node: INode, val sRepository: SRepository?) : SDependency {
override fun getScope(): SDependencyScope {
return when (node) {
is MPSModuleDependencyAsNode -> node.dependencyScope
else -> null
} ?: error("Node is not a valid dependency")
}

override fun isReexport(): Boolean {
return when (node) {
is MPSModuleDependencyAsNode -> node.reexport
else -> error("Node is not a valid dependency")
}
}
data class NodeAsMPSDependency(val node: MPSModuleDependencyAsNode, val sRepository: SRepository?) : SDependency {

override fun getTargetModule(): SModuleReference {
return when (node) {
is MPSModuleDependencyAsNode -> node.moduleReference
else -> null
} ?: error("Node is not a valid dependency")
}
override fun getScope(): SDependencyScope = checkNotNull(node.dependencyScope) { "Invalid dependency scope for dependency $node" }
override fun isReexport() = node.reexport
override fun getTargetModule() = node.moduleReference

override fun getTarget(): SModule? {
val ref = MPSModuleReference(targetModule)
val ref = MPSModuleReference(node.moduleReference)
return node.getArea().resolveNode(ref)?.let { NodeAsMPSModule(it, sRepository) }
}
}
Original file line number Diff line number Diff line change
@@ -32,6 +32,7 @@ import org.modelix.model.api.BuiltinLanguages
import org.modelix.model.api.INode
import org.modelix.model.api.getDescendants
import org.modelix.model.mpsadapters.MPSJavaModuleFacetAsNode
import org.modelix.model.mpsadapters.MPSModuleDependencyAsNode
import org.modelix.model.mpsadapters.MPSModuleReference
import org.modelix.model.mpsadapters.Module

@@ -49,7 +50,9 @@ data class NodeAsMPSModule(val node: INode, val sRepository: SRepository?) : SMo

override fun getDeclaredDependencies(): MutableIterable<SDependency> {
val dependencies = node.getChildren(BuiltinLanguages.MPSRepositoryConcepts.Module.dependencies)
return dependencies.map { NodeAsMPSDependency(node, sRepository) }.toMutableList()
return dependencies.mapNotNull { depNode ->
(depNode as? MPSModuleDependencyAsNode)?.let { NodeAsMPSDependency(it, sRepository) }
}.toMutableList()
}

override fun getFacets(): MutableIterable<SModuleFacet> {