Generalize makeTerm over the term type.

src/Data/Syntax.hs

@@ -25,7 +25,7 @@ import qualified Data.Abstract.ScopeGraph as ScopeGraph
 -- Combinators
 
 -- | Lift syntax and an annotation into a term, injecting the syntax into a union & ensuring the annotation encompasses all children.
-makeTerm :: (HasCallStack, Element syntax syntaxes, Semigroup ann, Apply Foldable syntaxes) => ann -> syntax (Term (Sum syntaxes) ann) -> Term (Sum syntaxes) ann
+makeTerm :: (HasCallStack, Element syntax syntaxes, Sum syntaxes ~ Syntax term, Semigroup ann, Apply Foldable syntaxes, IsTerm term) => ann -> syntax (term ann) -> term ann
 makeTerm ann = makeTerm' ann . inject
 
 -- | Lift a union and an annotation into a term, ensuring the annotation encompasses all children.

src/Language/Go/Assignment.hs

@@ -1,4 +1,4 @@
-{-# LANGUAGE DataKinds, RankNTypes, TypeOperators #-}
+{-# LANGUAGE DataKinds, RankNTypes, TypeFamilies, TypeOperators #-}
 module Language.Go.Assignment
 ( assignment
 , Go.Syntax

src/Language/Markdown/Assignment.hs

@@ -1,4 +1,4 @@
-{-# LANGUAGE DataKinds, RankNTypes, TypeOperators #-}
+{-# LANGUAGE DataKinds, RankNTypes, TypeFamilies, TypeOperators #-}
 module Language.Markdown.Assignment
 ( assignment
 , Markdown.Syntax

src/Language/PHP/Assignment.hs

@@ -1,4 +1,4 @@
-{-# LANGUAGE DataKinds, RankNTypes, TypeOperators #-}
+{-# LANGUAGE DataKinds, RankNTypes, TypeFamilies, TypeOperators #-}
 module Language.PHP.Assignment
 ( assignment
 , PHP.Syntax

src/Language/Python/Assignment.hs

@@ -1,4 +1,4 @@
-{-# LANGUAGE DataKinds, RankNTypes, TypeOperators #-}
+{-# LANGUAGE DataKinds, RankNTypes, TypeFamilies, TypeOperators #-}
 module Language.Python.Assignment
 ( assignment
 , Python.Syntax

src/Language/Ruby/Assignment.hs

@@ -1,4 +1,4 @@
-{-# LANGUAGE DataKinds, RankNTypes, TypeOperators #-}
+{-# LANGUAGE DataKinds, RankNTypes, TypeFamilies, TypeOperators #-}
 module Language.Ruby.Assignment
 ( assignment
 , Ruby.Syntax

src/Language/TSX/Assignment.hs

@@ -1,4 +1,4 @@
-{-# LANGUAGE DataKinds, RankNTypes, TypeOperators #-}
+{-# LANGUAGE DataKinds, RankNTypes, TypeFamilies, TypeOperators #-}
 module Language.TSX.Assignment
 ( assignment
 , TSX.Syntax

src/Language/TypeScript/Assignment.hs

@@ -1,4 +1,4 @@
-{-# LANGUAGE DataKinds, RankNTypes, TypeOperators #-}
+{-# LANGUAGE DataKinds, RankNTypes, TypeFamilies, TypeOperators #-}
 module Language.TypeScript.Assignment
 ( assignment
 , TypeScript.Syntax