Separate env-tree construction and usage

tools/lsp/squirrel/src/AST/Scope.hs

@@ -5,12 +5,12 @@
 -}
 
 module AST.Scope
-  ( HasLocalScope (..)
+  -- ( HasLocalScope (..)
-  , addLocalScopes
+  -- , addLocalScopes
-  , lookupEnv
+  -- , lookupEnv
-  , Kind (..)
+  -- , Kind (..)
-  , ScopedDecl (..)
+  -- , ScopedDecl (..)
-  )
+  -- )
   where
 
 import           Control.Arrow (second)
@@ -59,11 +59,15 @@ addLocalScopes
   -> Pascal (Product ([ScopedDecl] : xs))
 addLocalScopes tree =
     fmap (\xs -> Cons (envAt envWithREfs $ getRange xs) xs) tree
+  where
+    envWithREfs = getEnvTree tree
+
+getEnvTree tree = envWithREfs
   where
     envWithREfs = flip execState env do
       flip traverseOnly tree \r (Name t) -> do
-        modify $ addRef (getRange r) t
+        modify $ getRange r `addRef` t
-        return (Name t)
+        return $ Name t
 
     env
       = execCollectM