Start abstracting away the details of language tests.

Author: Patrick Thomson

WORKSPACE

@@ -215,6 +215,8 @@ new_git_repository(
     name = "tree-sitter-ruby",
     build_file_content = """
 exports_files(["src/node-types.json"])
+
+filegroup(name = "corpus", srcs = glob(['**/corpus/*.txt']), visibility = ["//visibility:public"])
 """,
     commit = "eb2b6225bfb80010f2e4cbd27db8c6f3775230b5",
     remote = "https://github.com/tree-sitter/tree-sitter-ruby.git",
@@ -235,6 +237,8 @@ new_git_repository(
     name = "tree-sitter-php",
     build_file_content = """
 exports_files(["src/node-types.json"])
+
+filegroup(name = "corpus", srcs = glob(['**/corpus/*.txt']), visibility = ["//visibility:public"])
 """,
     commit = "41a408d5b996ef54d8b9e1b9a2469fad00c1b52b",
     remote = "https://github.com/tree-sitter/tree-sitter-php.git",

build/common.bzl

@@ -40,7 +40,7 @@ package(default_visibility = ["//visibility:public"])
 
 exports_files(glob(["{}"]))
 
-filegroup(name = "corpus", srcs = glob(['corpus/*.txt']))
+filegroup(name = "corpus", srcs = glob(['**/corpus/*.txt']))
 """.format(nodetypespath),
         strip_prefix = "{}-{}".format(name, version),
         urls = ["https://github.com/tree-sitter/{}/archive/v{}.tar.gz".format(name, version)],
@@ -90,3 +90,25 @@ def semantic_language_library(language, name, srcs, nodetypes = "", **kwargs):
             "@stackage//:tree-sitter-" + language,
         ],
     )
+
+def semantic_language_parsing_test(language):
+    haskell_test(
+        name = "test",
+        srcs = ["test/PreciseTest.hs"],
+        data = ["@tree-sitter-{}//:corpus".format(language)],
+        deps = [
+            ":semantic-{}".format(language),
+            "//:base",
+            "//:bytestring",
+            "//:text",
+            "//semantic:fixtureshim",
+            "//semantic-ast",
+            "@stackage//:bazel-runfiles",
+            "@stackage//:hedgehog",
+            "@stackage//:pathtype",
+            "@stackage//:tasty",
+            "@stackage//:tasty-hedgehog",
+            "@stackage//:tasty-hunit",
+            "@stackage//:tree-sitter-" + language,
+        ],
+    )

semantic-go/BUILD.bazel

@@ -3,6 +3,7 @@ package(default_visibility = ["//visibility:public"])
 load(
     "//:build/common.bzl",
     "semantic_language_library",
+    "semantic_language_parsing_test",
 )
 load(
     "@rules_haskell//haskell:defs.bzl",
@@ -15,22 +16,4 @@ semantic_language_library(
     language = "go",
 )
 
-haskell_test(
-    name = "test",
-    srcs = ["test/PreciseTest.hs"],
-    data = ["@tree-sitter-go//:corpus"],
-    deps = [
-        ":semantic-go",
-        "//:base",
-        "//:bytestring",
-        "//:text",
-        "//semantic:fixtureshim",
-        "//semantic-ast",
-        "@stackage//:bazel-runfiles",
-        "@stackage//:hedgehog",
-        "@stackage//:pathtype",
-        "@stackage//:tasty",
-        "@stackage//:tasty-hedgehog",
-        "@stackage//:tasty-hunit",
-    ],
-)
+semantic_language_parsing_test(language = "go")

semantic-php/BUILD.bazel

@@ -3,10 +3,13 @@ package(default_visibility = ["//visibility:public"])
 load(
     "//:build/common.bzl",
     "semantic_language_library",
+    "semantic_language_parsing_test",
 )
 
 semantic_language_library(
     name = "semantic-php",
     srcs = glob(["src/**/*.hs"]),
     language = "php",
 )
+
+semantic_language_parsing_test(language = "php")

semantic-ruby/BUILD.bazel

@@ -3,6 +3,7 @@ package(default_visibility = ["//visibility:public"])
 load(
     "//:build/common.bzl",
     "semantic_language_library",
+    "semantic_language_parsing_test",
 )
 
 semantic_language_library(
@@ -12,4 +13,4 @@ semantic_language_library(
     nodetypes = "@tree-sitter-ruby//:src/node-types.json",
 )
 
-haskell_test
+semantic_language_parsing_test(language = "ruby")

semantic-ruby/test/PreciseTest.hs

@@ -1,20 +1,31 @@
-{-# LANGUAGE DisambiguateRecordFields, OverloadedStrings, TypeApplications #-}
+{-# LANGUAGE DisambiguateRecordFields, OverloadedStrings, TypeApplications, ImplicitParams #-}
 module Main (main) where
 
 import           TreeSitter.Ruby
 import           AST.TestHelpers
 import           AST.Unmarshal
-import qualified Language.Ruby.AST as Rb
+import qualified Language.Ruby.AST as Ruby
 import qualified System.Path as Path
 import           Test.Tasty
+import qualified Bazel.Runfiles as Runfiles
+import qualified System.Path.Fixture as Fixture
+import System.IO
+import Control.Concurrent
 
 main :: IO ()
-main
-  =   Path.absDir <$> Rb.getTestCorpusDir
-  >>= readCorpusFiles'
-  >>= traverse (testCorpus parse)
-  >>= defaultMain . tests
-  where parse = parseByteString @Rb.Program @() tree_sitter_ruby
+main = do
+  rf <- Runfiles.create
+  -- dirs <- Path.absDir <$> Ruby.getTestCorpusDir
+  let ?project = Path.relDir "semantic-ruby"
+      ?runfiles = rf
+  let dirs = Fixture.bazelDir "/../external/tree-sitter-ruby/test/corpus"
+  hFlush stdout
+  threadDelay 0
+
+  readCorpusFiles' dirs
+    >>= traverse (testCorpus parse)
+    >>= defaultMain . tests
+  where parse = parseByteString @Ruby.Program @() tree_sitter_ruby
 
 tests :: [TestTree] -> TestTree
 tests = testGroup "tree-sitter-ruby corpus tests"

semantic/test/System/Path/Fixture.hs

@@ -7,6 +7,7 @@ module System.Path.Fixture
     bazelDir,
     HasFixture,
     absRelDir,
+    delay,
   )
 where
 
@@ -15,13 +16,21 @@ import Data.Proxy
 import GHC.Stack
 import GHC.TypeLits
 import qualified System.Path as Path
+import Control.Concurrent
+import System.IO
 
 type HasFixture =
   ( ?runfiles :: Bazel.Runfiles,
     ?project :: Path.RelDir,
     HasCallStack
   )
 
+delay :: String -> IO ()
+delay s = do
+  putStrLn s
+  hFlush stdout
+  threadDelay 10000000
+
 absFile :: (HasFixture) => String -> Path.AbsFile
 absFile x = Path.absFile (Bazel.rlocation ?runfiles ("semantic/" <> Path.toString ?project <> x))