more refinements

Author: Patrick Thomson

.github/workflows/haskell.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ghc: ["8.8.3", "8.10.1"]
+        ghc: ["8.10.1"]
         cabal: ["3.2.0.0"]
 
     steps:

semantic-ast/BUILD.bazel

@@ -48,6 +48,19 @@ haskell_library(
     ],
 )
 
+all_ts_deps = ["@tree-sitter-{name}//:tree-sitter-{name}".format(name = name) for name in [
+    "go",
+    "java",
+    "json",
+    "php",
+    "python",
+    "ql",
+    "ruby",
+    "rust",
+    "tsx",
+    "typescript",
+]]
+
 haskell_binary(
     name = "generate-ast",
     srcs = glob(["app/**/*.hs"]),
@@ -64,6 +77,5 @@ haskell_binary(
         "@stackage//:lens",
         "@stackage//:neat-interpolation",
         "@stackage//:optparse-generic",
-        "@tree-sitter-json//:tree-sitter-json",
-    ],
+    ] + all_ts_deps,
 )

semantic-ast/app/Main.hs

@@ -38,8 +38,8 @@ data Config = Config {language :: Text, path :: FilePath}
 -- a qualified name on the LHS of a typeclass declaration, which Haskell
 -- doesn't like at all. I haven't figured out quite why we get this qualified
 -- name, but for now the easiest thing to do is some nested updates with lens.
-adjust :: [Dec] -> [Dec]
-adjust = mapped._InstanceD.typed.mapped %~ (values %~ truncate) . (functions %~ truncate)
+adjust :: Dec -> Dec
+adjust = _InstanceD.typed.mapped %~ (values %~ truncate) . (functions %~ truncate)
   where
     -- Need to handle functions with no arguments, which are parsed as ValD entities,
     -- as well as those with arguments, which are FunD.
@@ -53,7 +53,7 @@ adjust = mapped._InstanceD.typed.mapped %~ (values %~ truncate) . (functions %~
 main :: IO ()
 main = do
   Config language path <- Opt.getRecord "generate-ast"
-  decls <- T.pack . pprint . adjust <$> astDeclarationsIO JSON.tree_sitter_json path
+  decls <- T.pack . pprint . fmap adjust <$> astDeclarationsIO JSON.tree_sitter_json path
 
   let programText =
         [trimming|