diff --git a/dhall/CHANGELOG.md b/dhall/CHANGELOG.md index a39504b..d94b873 100644 --- a/dhall/CHANGELOG.md +++ b/dhall/CHANGELOG.md @@ -1,6 +1,6 @@ Next release -* Add `dhall tags` command that build tags file in [ETags](https://en.wikipedia.org/wiki/Ctags#Etags_2) format. Allow to index file or directory. +* Add `dhall tags` command that build tags file in [etags](https://en.wikipedia.org/wiki/Ctags#Etags_2) format. Allow to index file or directory. 1.26.1 diff --git a/dhall/dhall.cabal b/dhall/dhall.cabal index 3cbfdc2..d622246 100644 --- a/dhall/dhall.cabal +++ b/dhall/dhall.cabal @@ -369,10 +369,10 @@ Extra-Source-Files: tests/lint/success/*.dhall tests/diff/*.dhall tests/diff/*.txt - tests/etags/*.dhall - tests/etags/*.tags tests/recursive/*.dhall tests/regression/*.dhall + tests/tags/*.dhall + tests/tags/*.tags tests/tutorial/*.dhall Source-Repository head @@ -490,7 +490,7 @@ Library Dhall.Core, Dhall.Crypto, Dhall.Diff, - Dhall.ETags, + Dhall.Tags, Dhall.Format, Dhall.Freeze, Dhall.Hash, @@ -544,7 +544,7 @@ Test-Suite tasty Other-Modules: Dhall.Test.Dhall Dhall.Test.Diff - Dhall.Test.ETags + Dhall.Test.Tags Dhall.Test.Format Dhall.Test.Import Dhall.Test.Lint diff --git a/dhall/doctest/Main.hs b/dhall/doctest/Main.hs index d836056..d82f7e4 100644 --- a/dhall/doctest/Main.hs +++ b/dhall/doctest/Main.hs @@ -32,5 +32,5 @@ main = do , prefix "src/Dhall.hs" , prefix "src/Dhall/Import.hs" , prefix "src/Dhall/Tutorial.hs" - , prefix "src/Dhall/ETags.hs" + , prefix "src/Dhall/Tags.hs" ] diff --git a/dhall/src/Dhall/Main.hs b/dhall/src/Dhall/Main.hs index b966924..c2d0c8c 100644 --- a/dhall/src/Dhall/Main.hs +++ b/dhall/src/Dhall/Main.hs @@ -65,7 +65,7 @@ import qualified Dhall.Hash import qualified Dhall.Import import qualified Dhall.Import.Types import qualified Dhall.Lint -import qualified Dhall.ETags +import qualified Dhall.Tags import qualified Dhall.Pretty import qualified Dhall.Repl import qualified Dhall.TypeCheck @@ -112,11 +112,12 @@ data Mode | Hash | Diff { expr1 :: Text, expr2 :: Text } | Lint { inplace :: Input } - | ETags { input :: Input - , output :: Output - , suffixes :: Maybe [Text] - , followSymlinks :: Bool - } + | Tags + { input :: Input + , output :: Output + , suffixes :: Maybe [Text] + , followSymlinks :: Bool + } | Encode { file :: Input, json :: Bool } | Decode { file :: Input, json :: Bool } | Text { file :: Input } @@ -197,8 +198,8 @@ parseMode = (Lint <$> parseInplace) <|> subcommand "tags" - "Generate ETags file" - (ETags <$> parseInput <*> parseTagsOutput <*> parseSuffixes <*> parseFollowSymlinks) + "Generate etags file" + (Tags <$> parseInput <*> parseTagsOutput <*> parseSuffixes <*> parseFollowSymlinks) <|> subcommand "format" "Standard code formatter for the Dhall language" @@ -719,8 +720,8 @@ command (Options {..}) = do Control.Exception.throwIO (Dhall.InvalidType {..}) - ETags {..} -> do - tags <- Dhall.ETags.generate input suffixes followSymlinks + Tags {..} -> do + tags <- Dhall.Tags.generate input suffixes followSymlinks case output of OutputFile file -> diff --git a/dhall/src/Dhall/ETags.hs b/dhall/src/Dhall/Tags.hs similarity index 98% rename from dhall/src/Dhall/ETags.hs rename to dhall/src/Dhall/Tags.hs index dcda7ca..d688ba7 100644 --- a/dhall/src/Dhall/ETags.hs +++ b/dhall/src/Dhall/Tags.hs @@ -4,9 +4,8 @@ -- | This module contains the implementation of the @dhall tags@ command -module Dhall.ETags - ( -- * ETags - generate +module Dhall.Tags + ( generate ) where import Control.Exception (handle, SomeException(..)) @@ -30,7 +29,7 @@ import qualified Data.Text.IO as TIO import qualified System.Directory as SD {- - Documentation for ETags format is not very informative and not very correct. + Documentation for the etags format is not very informative and not very correct. You can find some documentation here: https://en.wikipedia.org/wiki/Ctags#Etags_2 and you can also check the source code here: @@ -76,7 +75,7 @@ type LineNumber = Int type ByteOffset = Int -{-| Generate ETags for Dhall expressions +{-| Generate etags for Dhall expressions -} generate :: Input diff --git a/dhall/tests/Dhall/Test/Main.hs b/dhall/tests/Dhall/Test/Main.hs index d9b5115..47cbf07 100644 --- a/dhall/tests/Dhall/Test/Main.hs +++ b/dhall/tests/Dhall/Test/Main.hs @@ -5,7 +5,7 @@ import Test.Tasty (TestTree) import qualified Dhall.Test.Dhall import qualified Dhall.Test.Diff -import qualified Dhall.Test.ETags +import qualified Dhall.Test.Tags import qualified Dhall.Test.Format import qualified Dhall.Test.SemanticHash import qualified Dhall.Test.Import @@ -36,7 +36,7 @@ getAllTests = do lintTests <- Dhall.Test.Lint.getTests - etagsTests <- Dhall.Test.ETags.getTests + tagsTests <- Dhall.Test.Tags.getTests diffTests <- Dhall.Test.Diff.getTests @@ -52,7 +52,7 @@ getAllTests = do , lintTests , diffTests , semanticHashTests - , etagsTests + , tagsTests , Dhall.Test.Regression.tests , Dhall.Test.Tutorial.tests , Dhall.Test.QuickCheck.tests diff --git a/dhall/tests/Dhall/Test/ETags.hs b/dhall/tests/Dhall/Test/Tags.hs similarity index 70% rename from dhall/tests/Dhall/Test/ETags.hs rename to dhall/tests/Dhall/Test/Tags.hs index 8211712..fe02c5f 100644 --- a/dhall/tests/Dhall/Test/ETags.hs +++ b/dhall/tests/Dhall/Test/Tags.hs @@ -1,6 +1,6 @@ {-# LANGUAGE OverloadedStrings #-} -module Dhall.Test.ETags where +module Dhall.Test.Tags where import Data.Monoid ((<>)) import Data.Text (Text) @@ -11,30 +11,30 @@ import Turtle (FilePath) import qualified Data.Text as Text import qualified Data.Text.IO as Text.IO -import qualified Dhall.ETags as ETags +import qualified Dhall.Tags as Tags import qualified Dhall.Test.Util as Test.Util import qualified Test.Tasty as Tasty import qualified Test.Tasty.HUnit as Tasty.HUnit import qualified Turtle -etagsDirectory :: FilePath -etagsDirectory = "./tests/etags" +tagsDirectory :: FilePath +tagsDirectory = "./tests/tags" getTests :: IO TestTree getTests = do - etagsTests <- Test.Util.discover (Turtle.chars <* ".dhall") etagsTest (Turtle.lstree etagsDirectory) + tagsTests <- Test.Util.discover (Turtle.chars <* ".dhall") tagsTest (Turtle.lstree tagsDirectory) - let testTree = Tasty.testGroup "etags tests" [ etagsTests, etagsDirTest ] + let testTree = Tasty.testGroup "tags tests" [ tagsTests, tagsDirTest ] return testTree -etagsTest :: Text -> TestTree -etagsTest prefix = +tagsTest :: Text -> TestTree +tagsTest prefix = Tasty.HUnit.testCase (Text.unpack prefix) $ do let inputFile = Text.unpack (prefix <> ".dhall") let outputFile = Text.unpack (prefix <> ".tags") - actualTags <- fixPathSeparators <$> ETags.generate (InputFile inputFile) Nothing False + actualTags <- fixPathSeparators <$> Tags.generate (InputFile inputFile) Nothing False expectedTags <- Text.IO.readFile outputFile @@ -42,14 +42,14 @@ etagsTest prefix = Tasty.HUnit.assertEqual message expectedTags actualTags -etagsDirTest :: TestTree -etagsDirTest = +tagsDirTest :: TestTree +tagsDirTest = Tasty.HUnit.testCase "all" $ do - let outputFile = Text.unpack . Turtle.format Turtle.fp $ etagsDirectory Turtle. "all.tags" + let outputFile = Text.unpack . Turtle.format Turtle.fp $ tagsDirectory Turtle. "all.tags" actualTags <- fmap fixPathSeparators - (ETags.generate - (InputFile (Text.unpack . Turtle.format Turtle.fp $ etagsDirectory)) + (Tags.generate + (InputFile (Text.unpack . Turtle.format Turtle.fp $ tagsDirectory)) (Just [".dhall"]) False) diff --git a/dhall/tests/etags/all.tags b/dhall/tests/tags/all.tags similarity index 86% rename from dhall/tests/etags/all.tags rename to dhall/tests/tags/all.tags index 7378beb..9cdcde9 100644 --- a/dhall/tests/etags/all.tags +++ b/dhall/tests/tags/all.tags @@ -1,16 +1,16 @@ -./tests/etags/let.dhall,66 +./tests/tags/let.dhall,66 let.dhall1,1 /let.dhall1,1 let foo foo1,5 let bar bar3,22 -./tests/etags/nonunicode.dhall,63 +./tests/tags/nonunicode.dhall,63 nonunicode.dhall1,1 /nonunicode.dhall1,1 let foo foo2,12 -./tests/etags/record.dhall,335 +./tests/tags/record.dhall,335 record.dhall1,1 /record.dhall1,1 let Config Config6,81 @@ -23,7 +23,7 @@ let Config Config6,81 let makeUser makeUser16,323 let configs configs30,804 -./tests/etags/recordlit.dhall,223 +./tests/tags/recordlit.dhall,223 recordlit.dhall1,1 /recordlit.dhall1,1 { home home8,143 @@ -33,7 +33,7 @@ let configs configs30,804 , name = { firstName firstName11,272 , secondName secondName12,302 -./tests/etags/simple.dhall,254 +./tests/tags/simple.dhall,254 simple.dhall1,1 /simple.dhall1,1 let generate generate6,100 @@ -44,12 +44,12 @@ let Config Config32,880 , privateKey privateKey34,917 , publicKey publicKey35,943 -./tests/etags/unicode.dhall,57 +./tests/tags/unicode.dhall,57 unicode.dhall1,1 /unicode.dhall1,1 let foo foo2,15 -./tests/etags/union.dhall,394 +./tests/tags/union.dhall,394 union.dhall1,1 /union.dhall1,1 let Element Element1,5 diff --git a/dhall/tests/etags/let.dhall b/dhall/tests/tags/let.dhall similarity index 100% rename from dhall/tests/etags/let.dhall rename to dhall/tests/tags/let.dhall diff --git a/dhall/tests/etags/let.tags b/dhall/tests/tags/let.tags similarity index 71% rename from dhall/tests/etags/let.tags rename to dhall/tests/tags/let.tags index d452665..9ae6964 100644 --- a/dhall/tests/etags/let.tags +++ b/dhall/tests/tags/let.tags @@ -1,5 +1,5 @@ -./tests/etags/let.dhall,66 +./tests/tags/let.dhall,66 let.dhall1,1 /let.dhall1,1 let foo foo1,5 diff --git a/dhall/tests/etags/nonunicode.dhall b/dhall/tests/tags/nonunicode.dhall similarity index 100% rename from dhall/tests/etags/nonunicode.dhall rename to dhall/tests/tags/nonunicode.dhall diff --git a/dhall/tests/etags/nonunicode.tags b/dhall/tests/tags/nonunicode.tags similarity index 65% rename from dhall/tests/etags/nonunicode.tags rename to dhall/tests/tags/nonunicode.tags index 801ab16..ac1e062 100644 --- a/dhall/tests/etags/nonunicode.tags +++ b/dhall/tests/tags/nonunicode.tags @@ -1,5 +1,5 @@ -./tests/etags/nonunicode.dhall,63 +./tests/tags/nonunicode.dhall,63 nonunicode.dhall1,1 /nonunicode.dhall1,1 let foo foo2,12 diff --git a/dhall/tests/etags/record.dhall b/dhall/tests/tags/record.dhall similarity index 100% rename from dhall/tests/etags/record.dhall rename to dhall/tests/tags/record.dhall diff --git a/dhall/tests/etags/record.tags b/dhall/tests/tags/record.tags similarity index 91% rename from dhall/tests/etags/record.tags rename to dhall/tests/tags/record.tags index 1b09d27..8ae20ab 100644 --- a/dhall/tests/etags/record.tags +++ b/dhall/tests/tags/record.tags @@ -1,5 +1,5 @@ -./tests/etags/record.dhall,335 +./tests/tags/record.dhall,335 record.dhall1,1 /record.dhall1,1 let Config Config6,81 diff --git a/dhall/tests/etags/recordlit.dhall b/dhall/tests/tags/recordlit.dhall similarity index 100% rename from dhall/tests/etags/recordlit.dhall rename to dhall/tests/tags/recordlit.dhall diff --git a/dhall/tests/etags/recordlit.tags b/dhall/tests/tags/recordlit.tags similarity index 86% rename from dhall/tests/etags/recordlit.tags rename to dhall/tests/tags/recordlit.tags index 6af6b6f..77a829b 100644 --- a/dhall/tests/etags/recordlit.tags +++ b/dhall/tests/tags/recordlit.tags @@ -1,5 +1,5 @@ -./tests/etags/recordlit.dhall,223 +./tests/tags/recordlit.dhall,223 recordlit.dhall1,1 /recordlit.dhall1,1 { home home8,143 diff --git a/dhall/tests/etags/simple.dhall b/dhall/tests/tags/simple.dhall similarity index 100% rename from dhall/tests/etags/simple.dhall rename to dhall/tests/tags/simple.dhall diff --git a/dhall/tests/etags/simple.tags b/dhall/tests/tags/simple.tags similarity index 89% rename from dhall/tests/etags/simple.tags rename to dhall/tests/tags/simple.tags index 37a625d..cd1e236 100644 --- a/dhall/tests/etags/simple.tags +++ b/dhall/tests/tags/simple.tags @@ -1,5 +1,5 @@ -./tests/etags/simple.dhall,254 +./tests/tags/simple.dhall,254 simple.dhall1,1 /simple.dhall1,1 let generate generate6,100 diff --git a/dhall/tests/etags/unicode.dhall b/dhall/tests/tags/unicode.dhall similarity index 100% rename from dhall/tests/etags/unicode.dhall rename to dhall/tests/tags/unicode.dhall diff --git a/dhall/tests/etags/unicode.tags b/dhall/tests/tags/unicode.tags similarity index 65% rename from dhall/tests/etags/unicode.tags rename to dhall/tests/tags/unicode.tags index de54b1c..296e8c3 100644 --- a/dhall/tests/etags/unicode.tags +++ b/dhall/tests/tags/unicode.tags @@ -1,5 +1,5 @@ -./tests/etags/unicode.dhall,57 +./tests/tags/unicode.dhall,57 unicode.dhall1,1 /unicode.dhall1,1 let foo foo2,15 diff --git a/dhall/tests/etags/union.dhall b/dhall/tests/tags/union.dhall similarity index 100% rename from dhall/tests/etags/union.dhall rename to dhall/tests/tags/union.dhall diff --git a/dhall/tests/etags/union.tags b/dhall/tests/tags/union.tags similarity index 92% rename from dhall/tests/etags/union.tags rename to dhall/tests/tags/union.tags index 1464f10..7267eb3 100644 --- a/dhall/tests/etags/union.tags +++ b/dhall/tests/tags/union.tags @@ -1,5 +1,5 @@ -./tests/etags/union.dhall,394 +./tests/tags/union.dhall,394 union.dhall1,1 /union.dhall1,1 let Element Element1,5