Skip to content

Commit ff43d7e

Browse files
committed
fix(mps-model-adapters): use built-in languages instead of repository lang
1 parent e463ff5 commit ff43d7e

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

mps-model-adapters/src/main/kotlin/org/modelix/model/mpsadapters/MPSModelAsNode.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
package org.modelix.model.mpsadapters
1515

1616
import org.jetbrains.mps.openapi.model.SModel
17+
import org.modelix.model.api.BuiltinLanguages
1718
import org.modelix.model.api.IChildLink
1819
import org.modelix.model.api.IConcept
1920
import org.modelix.model.api.IConceptReference
@@ -53,13 +54,13 @@ data class MPSModelAsNode(val model: SModel) : IDeprecatedNodeDefaults {
5354
}
5455

5556
override fun getContainmentLink(): IChildLink {
56-
return RepositoryLanguage.Module.models
57+
return BuiltinLanguages.MPSRepositoryConcepts.Module.models
5758
}
5859

5960
override fun getChildren(link: IChildLink): Iterable<INode> {
6061
return if (link is NullChildLink) {
6162
emptyList()
62-
} else if (link.getUID().endsWith(RepositoryLanguage.Model.rootNodes.getUID()) ||
63+
} else if (link.getUID().endsWith(BuiltinLanguages.MPSRepositoryConcepts.Model.rootNodes.getUID()) ||
6364
link.getUID().contains("rootNodes") ||
6465
link.getSimpleName() == "rootNodes"
6566
) {
@@ -98,7 +99,7 @@ data class MPSModelAsNode(val model: SModel) : IDeprecatedNodeDefaults {
9899
}
99100

100101
override fun getPropertyValue(property: IProperty): String? {
101-
return if (property.getUID().endsWith(RepositoryLanguage.NamePropertyUID) ||
102+
return if (property.getUID().endsWith(BuiltinLanguages.jetbrains_mps_lang_core.INamedConcept.name.getUID()) ||
102103
property.getUID().contains("name") ||
103104
property.getSimpleName() == "name"
104105
) {

mps-model-adapters/src/main/kotlin/org/modelix/model/mpsadapters/MPSModuleAsNode.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import jetbrains.mps.project.ProjectBase
1717
import jetbrains.mps.project.ProjectManager
1818
import jetbrains.mps.smodel.MPSModuleRepository
1919
import org.jetbrains.mps.openapi.module.SModule
20+
import org.modelix.model.api.BuiltinLanguages
2021
import org.modelix.model.api.IChildLink
2122
import org.modelix.model.api.IConcept
2223
import org.modelix.model.api.IConceptReference
@@ -38,7 +39,7 @@ data class MPSModuleAsNode(val module: SModule) : IDeprecatedNodeDefaults {
3839
override val reference: INodeReference
3940
get() = NodeReference("mps-module:" + module.moduleReference.toString())
4041
override val concept: IConcept
41-
get() = RepositoryLanguage.Module
42+
get() = BuiltinLanguages.MPSRepositoryConcepts.Module
4243
override val parent: INode?
4344
get() = module.repository?.let { MPSRepositoryAsNode(it) }
4445

@@ -97,12 +98,12 @@ data class MPSModuleAsNode(val module: SModule) : IDeprecatedNodeDefaults {
9798
}
9899

99100
override fun getPropertyValue(property: IProperty): String? {
100-
return if (property.getUID().endsWith(RepositoryLanguage.NamePropertyUID) ||
101+
return if (property.getUID().endsWith(BuiltinLanguages.jetbrains_mps_lang_core.INamedConcept.name.getUID()) ||
101102
property.getUID().contains("name") ||
102103
property.getSimpleName() == "name"
103104
) {
104105
module.moduleName
105-
} else if (property.getUID().endsWith(RepositoryLanguage.VirtualPackagePropertyUID) ||
106+
} else if (property.getUID().endsWith(BuiltinLanguages.jetbrains_mps_lang_core.BaseConcept.virtualPackage.getUID()) ||
106107
property.getUID().contains("virtualPackage") ||
107108
property.getSimpleName() == "virtualPackage"
108109
) {

mps-model-adapters/src/main/kotlin/org/modelix/model/mpsadapters/MPSRepositoryAsNode.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
package org.modelix.model.mpsadapters
1515

1616
import org.jetbrains.mps.openapi.module.SRepository
17+
import org.modelix.model.api.BuiltinLanguages
1718
import org.modelix.model.api.IChildLink
1819
import org.modelix.model.api.IConcept
1920
import org.modelix.model.api.IConceptReference
@@ -36,7 +37,7 @@ data class MPSRepositoryAsNode(val repository: SRepository) : IDeprecatedNodeDef
3637
override val reference: INodeReference
3738
get() = NodeReference("mps-repository")
3839
override val concept: IConcept
39-
get() = RepositoryLanguage.Repository
40+
get() = BuiltinLanguages.MPSRepositoryConcepts.Repository
4041
override val parent: INode?
4142
get() = null
4243

0 commit comments

Comments
 (0)