github
diff --git a/‎semantic-scope-graph/src/Control/Effect/ScopeGraph.hs
Lines changed: 13 additions & 3 deletions b/‎semantic-scope-graph/src/Control/Effect/ScopeGraph.hs
Lines changed: 13 additions & 3 deletions
diff --git a/‎semantic-scope-graph/src/Stack/Graph.hs
Lines changed: 10 additions & 0 deletions b/‎semantic-scope-graph/src/Stack/Graph.hs
Lines changed: 10 additions & 0 deletions
@@ -38,11 +38,13 @@ import           Control.Effect.Fresh
 import           Control.Effect.Reader
 import           Control.Lens
 import           Data.List.NonEmpty
+import qualified Data.List.NonEmpty as NonEmpty
 import           Data.Map.Strict (Map)
 import qualified Data.Map.Strict as Map
 import qualified Data.Module as Module
 import qualified Data.ScopeGraph as ScopeGraph
 import           Data.Semilattice.Lower
+import qualified Data.Set as Set
 import           Data.Text (Text)
 import           GHC.Records
 import qualified Scope.Reference as Reference
@@ -61,6 +63,7 @@ import qualified Control.Effect.ScopeGraph.Properties.Reference as Props
 import qualified Control.Effect.ScopeGraph.Properties.Reference as Props.Reference
 import           Control.Effect.State
 
+import qualified Algebra.Graph as Graph
 import qualified Algebra.Graph.Class as Class
 
 -- | Extract the 'Just' of a 'Maybe' in an 'Applicative' context or, given 'Nothing', run the provided action.
@@ -132,9 +135,16 @@ addDeclarations names = do
   graph <- get @(Stack.Graph Stack.Node)
   CurrentScope current <- currentScope
 
-  let graph' = foldr (\(ann, name) graph ->
-        graph -<< (Stack.declaration "reference") -<< (Stack.pushSymbol name)) mempty names
-  put (Stack.simplify (Class.overlay (Stack.scope current >>- graph') graph))
+  let graph' = foldr (\(_, name) graph ->
+        graph -<< (Stack.popSymbol "member") -<< (Stack.declaration name)) mempty (NonEmpty.init names)
+      graph'' = graph' >>- (Stack.declaration (snd $ NonEmpty.last names))
+      graph''' = foldr (\(_, name) graph ->
+        graph -<< (Stack.pushSymbol "member") -<< (Stack.reference name)) mempty (NonEmpty.init $ NonEmpty.reverse names)
+      graph'''' = graph'' >>- graph''' >>- (Stack.reference (snd $ NonEmpty.head names))
+      currentEdges = Set.filter (\(left, right) -> left == Stack.Scope current) (Stack.edgeSet graph)
+      rootNodes = Set.map snd currentEdges
+      graphh = foldMap (\(left, right) -> Stack.removeEdge left right graph) currentEdges
+  put (Stack.simplify (Class.overlay (Stack.scope current >>- graph'''' >>- Class.vertex (Set.elemAt 0 rootNodes)) graphh))
 
 -- | Takes an edge label and a list of names and inserts an import edge to a hole.
 newEdge :: ScopeGraphEff sig m => ScopeGraph.EdgeLabel -> NonEmpty Name -> m ()
 
@@ -22,6 +22,8 @@ module Stack.Graph
   , Class.connect
   , Class.edges
   , simplify
+  , edgeSet
+  , removeEdge
   -- * Smart constructors
   , scope
   , newScope
@@ -53,6 +55,8 @@ import           Data.Map.Strict (Map)
 import qualified Data.Map.Strict as Map
 import           Data.Maybe
 import           Data.Semilattice.Lower
+import           Data.Set (Set)
+import qualified Data.Set as Set
 import qualified Scope.Types as Scope
 
 type Symbol = Name
@@ -118,6 +122,9 @@ pushSymbol = Class.vertex . PushSymbol
 root :: Graph Node
 root = Graph (Algebraic.vertex Root)
 
+edgeSet :: Graph Node -> Set (Node, Node)
+edgeSet graph = Algebraic.edgeSet (unGraph graph)
+
 tagGraphUniquely :: Graph Node -> Graph (Tagged Node)
 tagGraphUniquely
   = simplify
@@ -152,6 +159,9 @@ newScope name edges graph =
 simplify :: Ord a => Graph a -> Graph a
 simplify = Graph . Algebraic.simplify . unGraph
 
+removeEdge :: Ord a => a -> a -> Graph a -> Graph a
+removeEdge a b = Graph . Algebraic.removeEdge a b . unGraph
+
 maybeM :: Applicative f => f a -> Maybe a -> f a
 maybeM f = maybe f pure