Depend on Language.Go.Grammar instead of TreeSitter.Go

semantic-go/semantic-go.cabal

@@ -52,5 +52,6 @@ library
   exposed-modules:
     Language.Go
     Language.Go.AST
+    Language.Go.Grammar
     Language.Go.Tags
   hs-source-dirs: src

semantic-go/src/Language/Go.hs

@@ -1,7 +1,7 @@
 -- | Semantic functionality for Go programs.
 module Language.Go
 ( Term(..)
-, TreeSitter.Go.tree_sitter_go
+, Language.Go.Grammar.tree_sitter_go
 ) where
 
 
@@ -9,7 +9,7 @@ import           Data.Proxy
 import qualified Language.Go.AST as Go
 import qualified Language.Go.Tags as GoTags
 import qualified Tags.Tagging.Precise as Tags
-import qualified TreeSitter.Go (tree_sitter_go)
+import qualified Language.Go.Grammar (tree_sitter_go)
 import qualified AST.Unmarshal as TS
 
 newtype Term a = Term { getTerm :: Go.SourceFile a }

semantic-go/src/Language/Go/AST.hs

@@ -16,6 +16,6 @@ module Language.Go.AST
 
 import           Prelude hiding (False, Float, Integer, Rational, String, True)
 import           AST.GenerateSyntax
-import qualified TreeSitter.Go as Grammar
+import qualified Language.Go.Grammar as Grammar
 
 astDeclarationsForLanguage Grammar.tree_sitter_go "../../../vendor/tree-sitter-go/src/node-types.json"

src/Language/Go/Assignment.hs

@@ -26,7 +26,7 @@ import           Language.Go.Syntax as Go.Syntax hiding (runeLiteral, labelName)
 import           Language.Go.Term as Go
 import           Language.Go.Type as Go.Type
 import Data.ImportPath (importPath, defaultAlias)
-import           TreeSitter.Go as Grammar
+import           Language.Go.Grammar as Grammar
 
 type Assignment = Assignment.Assignment [] Grammar
 

src/Parsing/Parser.hs

@@ -61,7 +61,7 @@ import qualified Language.TypeScript as TypeScriptPrecise
 import qualified Language.TypeScript.Assignment as TypeScriptALaCarte
 import           Prelude hiding (fail)
 import           Prologue
-import           TreeSitter.Go
+import           Language.Go.Grammar
 import qualified TreeSitter.Language as TS (Language, Symbol)
 import           TreeSitter.PHP
 import           Language.Python.Grammar