Skip to content
This repository was archived by the owner on Apr 1, 2025. It is now read-only.

Commit 6d39019

Browse files
author
Patrick Thomson
committed
Fix bad hacks associated with directory paths.
1 parent 1800de0 commit 6d39019

12 files changed

Lines changed: 21 additions & 31 deletions

File tree

‎build/common.bzl‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,6 @@ def semantic_language_parsing_test(language, semantic_package = "", ts_package =
142142
"//:base",
143143
"//:bytestring",
144144
"//:text",
145-
"//semantic:fixtureshim",
146145
"//semantic-ast",
147146
"@stackage//:bazel-runfiles",
148147
"@stackage//:hedgehog",

‎semantic-ast/BUILD.bazel‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ haskell_library(
3131
"@stackage//:aeson",
3232
"@stackage//:aeson-pretty",
3333
"@stackage//:attoparsec",
34+
"@stackage//:bazel-runfiles",
3435
"@stackage//:directory",
3536
"@stackage//:fused-effects",
3637
"@stackage//:hedgehog",

semantic/test/System/Path/Fixture.hs renamed to semantic-ast/src/System/Path/Fixture.hs

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,19 @@
44
module System.Path.Fixture
55
( absFile,
66
absRelFile,
7-
bazelDir,
7+
relDir,
88
HasFixture,
99
absRelDir,
1010
delay,
1111
)
1212
where
1313

1414
import qualified Bazel.Runfiles as Bazel
15-
import Data.Proxy
16-
import GHC.Stack
17-
import GHC.TypeLits
18-
import qualified System.Path as Path
1915
import Control.Concurrent
16+
import GHC.Stack
2017
import System.IO
18+
import System.Path ((</>))
19+
import qualified System.Path as Path
2120

2221
type HasFixture =
2322
( ?runfiles :: Bazel.Runfiles,
@@ -32,13 +31,17 @@ delay s = do
3231
threadDelay 100000000
3332

3433
absFile :: (HasFixture) => String -> Path.AbsFile
35-
absFile x = Path.absFile (Bazel.rlocation ?runfiles ("semantic/" <> Path.toString ?project <> x))
34+
absFile x = root </> Path.relDir "semantic" </> ?project </> Path.relFile x
35+
where
36+
root = Path.absDir (Bazel.rlocation ?runfiles ".")
3637

3738
absRelFile :: (HasFixture) => String -> Path.AbsRelFile
3839
absRelFile = Path.toAbsRel . absFile
3940

40-
bazelDir :: HasFixture => String -> Path.AbsDir
41-
bazelDir x = Path.absDir (Bazel.rlocation ?runfiles ("semantic/" <> Path.toString ?project <> x))
41+
relDir :: HasFixture => String -> Path.AbsDir
42+
relDir x = root </> Path.relDir "semantic" </> ?project </> Path.relDir x
43+
where
44+
root = Path.absDir (Bazel.rlocation ?runfiles ".")
4245

4346
absRelDir :: HasFixture => String -> Path.AbsRelDir
44-
absRelDir = Path.toAbsRel . bazelDir
47+
absRelDir = Path.toAbsRel . relDir

‎semantic-codeql/test/PreciseTest.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ main = do
1717
let ?project = Path.relDir "semantic-codeql"
1818
?runfiles = rf
1919

20-
let dirs = Fixture.bazelDir "/../external/tree-sitter-ql/test/corpus"
20+
let dirs = Fixture.relDir "../external/tree-sitter-ql/test/corpus"
2121
parse = parseByteString @CodeQL.Ql @() tree_sitter_ql
2222

2323
readCorpusFiles' dirs

‎semantic-go/test/PreciseTest.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ main = do
1717
-- dirs <- Path.absDir <$> Go.getTestCorpusDir
1818
let ?project = Path.relDir "semantic-go"
1919
?runfiles = rf
20-
let dirs = Fixture.bazelDir "/../external/tree-sitter-go/corpus"
20+
let dirs = Fixture.relDir "../external/tree-sitter-go/corpus"
2121

2222
readCorpusFiles' dirs
2323
>>= traverse (testCorpus parse)

‎semantic-java/test/PreciseTest.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ main = do
2222
-- dirs <- Path.absDir <$> Java.getTestCorpusDir
2323
let ?project = Path.relDir "semantic-java"
2424
?runfiles = rf
25-
let dirs = Fixture.bazelDir "/../external/tree-sitter-java/corpus"
25+
let dirs = Fixture.relDir "../external/tree-sitter-java/corpus"
2626
readCorpusFiles' dirs
2727
>>= traverse (testCorpus parse)
2828
>>= defaultMain . tests

‎semantic-python/test/PreciseTest.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ main = do
1717
let ?project = Path.relDir "semantic-python"
1818
?runfiles = rf
1919

20-
let dirs = Fixture.bazelDir "/../external/tree-sitter-python/test/corpus"
20+
let dirs = Fixture.relDir "../external/tree-sitter-python/test/corpus"
2121
parse = parseByteString @Py.Module @() tree_sitter_python
2222

2323
readCorpusFiles' dirs

‎semantic-ruby/test/PreciseTest.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ main = do
1818
-- dirs <- Path.absDir <$> Ruby.getTestCorpusDir
1919
let ?project = Path.relDir "semantic-ruby"
2020
?runfiles = rf
21-
let dirs = Fixture.bazelDir "/../external/tree-sitter-ruby/test/corpus"
21+
let dirs = Fixture.relDir "../external/tree-sitter-ruby/test/corpus"
2222

2323
readCorpusFiles' dirs
2424
>>= traverse (testCorpus parse)

‎semantic-tsx/test/PreciseTest.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ main = do
1717
-- dirs <- Path.absDir <$> Typescript.getTestCorpusDir
1818
let ?project = Path.relDir "semantic-tsx"
1919
?runfiles = rf
20-
let dirs = Fixture.bazelDir "/../external/tree-sitter-typescript/tsx/corpus"
20+
let dirs = Fixture.relDir "../external/tree-sitter-typescript/tsx/corpus"
2121

2222
readCorpusFiles' dirs
2323
>>= traverse (testCorpus parse)

‎semantic-typescript/test/PreciseTest.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ main = do
1616
-- dirs <- Path.absDir <$> Typescript.getTestCorpusDir
1717
let ?project = Path.relDir "semantic-typescript"
1818
?runfiles = rf
19-
let dirs = Fixture.bazelDir "/../external/tree-sitter-typescript/typescript/corpus"
19+
let dirs = Fixture.relDir "../external/tree-sitter-typescript/typescript/corpus"
2020

2121
readCorpusFiles' dirs
2222
>>= traverse (testCorpus parse)

0 commit comments

Comments
 (0)