Skip to content

Commit 6f9d6eb

Browse files
committed
fixed matching of includeNamespace
includeNamespace("abc.def") also matched "abc.defghi" before.
1 parent 071e31b commit 6f9d6eb

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

metamodel-gradle/src/main/kotlin/org/modelix/metamodel/gradle/MetaModelGradlePlugin.kt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,10 +148,15 @@ class MetaModelGradlePlugin: Plugin<Project> {
148148
.map { LanguageData.fromFile(it) }
149149
.toList())
150150
val previousLanguageCount = languages.getLanguages().size
151+
152+
val includedNamespaces = settings.includedLanguageNamespaces.map { it.trimEnd('.') }
153+
val includedLanguages = settings.includedLanguages + includedNamespaces
154+
val namespacePrefixes = includedNamespaces.map { it + "." }
155+
151156
languages = languages.filter {
152157
languages.getLanguages().filter { lang ->
153-
settings.includedLanguages.contains(lang.name)
154-
|| settings.includedLanguageNamespaces.any { lang.name.startsWith(it) }
158+
includedLanguages.contains(lang.name)
159+
|| namespacePrefixes.any { lang.name.startsWith(it) }
155160
}.forEach { lang ->
156161
lang.getConceptsInLanguage().forEach { concept ->
157162
includeConcept(concept.fqName)

0 commit comments

Comments
 (0)