fetch derived categories in chained store

prompto · May 20, 2022 · 628872e · 628872e
1 parent 5c2027b
commit 628872e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/CodeStore/src/main/java/prompto/code/MutableCodeStore.java b/CodeStore/src/main/java/prompto/code/MutableCodeStore.java
@@ -417,6 +417,12 @@ private IQueryBuilder filterOnModules(IQueryBuilder builder, boolean filterOnMod
 
 	@Override
 	public Collection<CategoryDeclaration> fetchDerivedCategoryDeclarations(Identifier id) {
+		Stream<CategoryDeclaration> stream1 = super.fetchDerivedCategoryDeclarations(id).stream();
+		Stream<CategoryDeclaration> stream2 = doFetchDerivedCategoryDeclarations(id).stream();
+		return Stream.concat(stream1, stream2).collect(Collectors.toList());
+	}
+
+	Collection<CategoryDeclaration> doFetchDerivedCategoryDeclarations(Identifier id) {
 		IQueryBuilder builder = store.newQueryBuilder()
 				.verify(AttributeInfo.CATEGORY, MatchOp.HAS, "CategoryDeclaration")
 				.verify(AttributeInfo.DERIVED_FROM, MatchOp.HAS, id.toString())

diff --git a/Core/src/main/java/prompto/type/IEnumeratedType.java b/Core/src/main/java/prompto/type/IEnumeratedType.java
@@ -1,5 +1,7 @@
 package prompto.type;
 
-public interface IEnumeratedType {
+import prompto.grammar.Identifier;
 
+public interface IEnumeratedType {
+	Identifier getTypeNameId();
 }