Fix installed completions (#2034)

Gabriella439 · mergify[bot] · web-flow · commit 94a555fd02ef · 2020-09-11T06:34:25.000Z
* Fix installed completions Fixes #2033 * Fix build failure for `dhall-openapi` Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
diff --git a/dhall-docs/src/Dhall/Docs.hs b/dhall-docs/src/Dhall/Docs.hs
@@ -53,7 +53,9 @@ parseOptions =
     <$> Options.Applicative.strOption
         ( Options.Applicative.long "input"
        <> Options.Applicative.metavar "INPUT"
-       <> Options.Applicative.help "Directory of your dhall package" )
+       <> Options.Applicative.help "Directory of your dhall package"
+       <> Options.Applicative.action "directory"
+       )
     <*> Options.Applicative.strOption
         ( Options.Applicative.long "output-link"
        <> Options.Applicative.metavar "OUTPUT-LINK"
@@ -62,7 +64,9 @@ parseOptions =
            <> "documentation. The path needs to not exist or to be a symlink, "
            <> "otherwise the tool won't generate any docs at all"
             )
-       <> Options.Applicative.value "./docs" )
+       <> Options.Applicative.value "./docs"
+       <> Options.Applicative.action "directory"
+       )
     <*> parsePackageNameResolver
     <*> parseAscii
     ) <|> parseVersion
diff --git a/dhall-json/dhall-to-json/Main.hs b/dhall-json/dhall-to-json/Main.hs
@@ -92,13 +92,15 @@ parseOptions =
             (   Options.long "file"
             <>  Options.help "Read expression from a file instead of standard input"
             <>  Options.metavar "FILE"
+            <>  Options.action "file"
             )
 
     parseOutput =
         Options.strOption
             (   Options.long "output"
             <>  Options.help "Write JSON to a file instead of standard output"
             <>  Options.metavar "FILE"
+            <>  Options.action "file"
             )
 
 parserInfo :: ParserInfo Options
diff --git a/dhall-json/json-to-dhall/Main.hs b/dhall-json/json-to-dhall/Main.hs
@@ -108,13 +108,15 @@ parseOptions =
             (   Options.long "file"
             <>  Options.help "Read JSON from a file instead of standard input"
             <>  Options.metavar "FILE"
+            <>  Options.action "file"
             )
 
     parseOutput =
         Options.strOption
             (   Options.long "output"
             <>  Options.help "Write Dhall expression to a file instead of standard output"
             <>  Options.metavar "FILE"
+            <>  Options.action "file"
             )
 
     parseASCII =
diff --git a/dhall-json/src/Dhall/DhallToYaml/Main.hs b/dhall-json/src/Dhall/DhallToYaml/Main.hs
@@ -48,6 +48,7 @@ parseOptions =
             (   Options.long "file"
             <>  Options.help "Read expression from a file instead of standard input"
             <>  Options.metavar "FILE"
+            <>  Options.action "file"
             )
 
     parseVersion =
@@ -62,6 +63,7 @@ parseOptions =
             (   Options.long "output"
             <>  Options.help "Write YAML to a file instead of standard output"
             <>  Options.metavar "FILE"
+            <>  Options.action "file"
             )
 
     parseNoEdit =
diff --git a/dhall-lsp-server/app/Main.hs b/dhall-lsp-server/app/Main.hs
@@ -32,8 +32,9 @@ parseOptions =
   Options <$> parseMode <*> Options.Applicative.optional parseLogFile <*> parseVersion
   where
     parseLogFile = Options.Applicative.strOption
-      (Options.Applicative.long "log" <> Options.Applicative.help
-        "If present writes debug output to the specified file"
+      (  Options.Applicative.long "log"
+      <> Options.Applicative.help "If present writes debug output to the specified file"
+      <> Options.Applicative.action "file"
       )
 
     parseVersion = Options.Applicative.switch
diff --git a/dhall-nixpkgs/Main.hs b/dhall-nixpkgs/Main.hs
@@ -188,6 +188,7 @@ parseFile =
         (   Options.long "file"
         <>  Options.help "File to import, relative to the top-level directory"
         <>  Options.value "package.dhall"
+        <>  Options.action "file"
         )
 
 parseSource :: Parser Bool
@@ -239,6 +240,7 @@ parseGitHub = do
             (   Options.long "directory"
             <>  Options.help "Subdirectory containing the Dhall package"
             <>  Options.value ""
+            <>  Options.action "directory"
             )
 
     file <- parseFile
diff --git a/dhall-openapi/openapi-to-dhall/Main.hs b/dhall-openapi/openapi-to-dhall/Main.hs
@@ -215,6 +215,7 @@ parseOptions = Options <$> parseSkip <*> parsePrefixMap' <*> fileArg <*> crdArg
     fileArg = Options.Applicative.strArgument
             (  Options.Applicative.help "The input file to read"
             <> Options.Applicative.metavar "FILE"
+            <> Options.Applicative.action "file"
             )
     crdArg = Options.Applicative.switch
       (  Options.Applicative.long "crd"
diff --git a/dhall-yaml/yaml-to-dhall/Main.hs b/dhall-yaml/yaml-to-dhall/Main.hs
@@ -105,13 +105,15 @@ parseOptions =
             (   Options.long "file"
             <>  Options.help "Read YAML expression from a file instead of standard input"
             <>  Options.metavar "FILE"
+            <>  Options.action "file"
             )
 
     parseOutput =
         Options.strOption
             (   Options.long "output"
             <>  Options.help "Write Dhall expression to a file instead of standard output"
             <>  Options.metavar "FILE"
+            <>  Options.action "file"
             )
 
     parseASCII =
diff --git a/dhall/src/Dhall/Main.hs b/dhall/src/Dhall/Main.hs
@@ -339,6 +339,7 @@ parseMode =
                 (   Options.Applicative.long "file"
                 <>  Options.Applicative.help "Read expression from a file instead of standard input"
                 <>  Options.Applicative.metavar "FILE"
+                <>  Options.Applicative.action "file"
                 )
 
     parseOutput = fmap f (optional p)
@@ -350,6 +351,7 @@ parseMode =
                 (   Options.Applicative.long "output"
                 <>  Options.Applicative.help "Write result to a file instead of standard output"
                 <>  Options.Applicative.metavar "FILE"
+                <>  Options.Applicative.action "file"
                 )
 
     parseAlpha =
@@ -410,6 +412,7 @@ parseMode =
             (   Options.Applicative.long "inplace"
             <>  Options.Applicative.help "Modify the specified file in-place"
             <>  Options.Applicative.metavar "FILE"
+            <>  Options.Applicative.action "file"
             )
 
     parseInplaceNonTransitive =
@@ -425,6 +428,7 @@ parseMode =
             (   Options.Applicative.long "transitive"
             <>  Options.Applicative.help "Modify the specified file and its transitive relative imports in-place"
             <>  Options.Applicative.metavar "FILE"
+            <>  Options.Applicative.action "file"
             )
 
     parseInput = fmap f (optional p)
@@ -436,6 +440,8 @@ parseMode =
             (   Options.Applicative.long "path"
             <>  Options.Applicative.help "Index all files in path recursively. Will get list of files from STDIN if omitted."
             <>  Options.Applicative.metavar "PATH"
+            <>  Options.Applicative.action "file"
+            <>  Options.Applicative.action "directory"
             )
 
     parseTagsOutput = fmap f (optional p)
@@ -447,6 +453,7 @@ parseMode =
             (   Options.Applicative.long "output"
             <>  Options.Applicative.help "The name of the file that the tags are written to. Defaults to \"tags\""
             <>  Options.Applicative.metavar "FILENAME"
+            <>  Options.Applicative.action "file"
             )
 
     parseSuffixes = fmap f (optional p)
@@ -508,6 +515,7 @@ parseMode =
             (   Options.Applicative.long "output"
             <>  Options.Applicative.help "The destination path to create"
             <>  Options.Applicative.metavar "PATH"
+            <>  Options.Applicative.action "directory"
             )
 
     parseNoted =

Original file line number	Diff line number	Diff line change
`@@ -92,13 +92,15 @@ parseOptions =`
`92`	`92`	`( Options.long "file"`
`93`	`93`	`<> Options.help "Read expression from a file instead of standard input"`
`94`	`94`	`<> Options.metavar "FILE"`
	`95`	`+ <> Options.action "file"`
`95`	`96`	`)`
`96`	`97`
`97`	`98`	`parseOutput =`
`98`	`99`	`Options.strOption`
`99`	`100`	`( Options.long "output"`
`100`	`101`	`<> Options.help "Write JSON to a file instead of standard output"`
`101`	`102`	`<> Options.metavar "FILE"`
	`103`	`+ <> Options.action "file"`
`102`	`104`	`)`
`103`	`105`
`104`	`106`	`parserInfo :: ParserInfo Options`
Original file line number	Diff line number	Diff line change
`@@ -108,13 +108,15 @@ parseOptions =`
`108`	`108`	`( Options.long "file"`
`109`	`109`	`<> Options.help "Read JSON from a file instead of standard input"`
`110`	`110`	`<> Options.metavar "FILE"`
	`111`	`+ <> Options.action "file"`
`111`	`112`	`)`
`112`	`113`
`113`	`114`	`parseOutput =`
`114`	`115`	`Options.strOption`
`115`	`116`	`( Options.long "output"`
`116`	`117`	`<> Options.help "Write Dhall expression to a file instead of standard output"`
`117`	`118`	`<> Options.metavar "FILE"`
	`119`	`+ <> Options.action "file"`
`118`	`120`	`)`
`119`	`121`
`120`	`122`	`parseASCII =`
Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,7 @@ parseOptions =`
`48`	`48`	`( Options.long "file"`
`49`	`49`	`<> Options.help "Read expression from a file instead of standard input"`
`50`	`50`	`<> Options.metavar "FILE"`
	`51`	`+ <> Options.action "file"`
`51`	`52`	`)`
`52`	`53`
`53`	`54`	`parseVersion =`
`@@ -62,6 +63,7 @@ parseOptions =`
`62`	`63`	`( Options.long "output"`
`63`	`64`	`<> Options.help "Write YAML to a file instead of standard output"`
`64`	`65`	`<> Options.metavar "FILE"`
	`66`	`+ <> Options.action "file"`
`65`	`67`	`)`
`66`	`68`
`67`	`69`	`parseNoEdit =`
Original file line number	Diff line number	Diff line change
`@@ -188,6 +188,7 @@ parseFile =`
`188`	`188`	`( Options.long "file"`
`189`	`189`	`<> Options.help "File to import, relative to the top-level directory"`
`190`	`190`	`<> Options.value "package.dhall"`
	`191`	`+ <> Options.action "file"`
`191`	`192`	`)`
`192`	`193`
`193`	`194`	`parseSource :: Parser Bool`
`@@ -239,6 +240,7 @@ parseGitHub = do`
`239`	`240`	`( Options.long "directory"`
`240`	`241`	`<> Options.help "Subdirectory containing the Dhall package"`
`241`	`242`	`<> Options.value ""`
	`243`	`+ <> Options.action "directory"`
`242`	`244`	`)`
`243`	`245`
`244`	`246`	`file <- parseFile`
Original file line number	Diff line number	Diff line change
`@@ -215,6 +215,7 @@ parseOptions = Options <$> parseSkip <> parsePrefixMap' <> fileArg <*> crdArg`
`215`	`215`	`fileArg = Options.Applicative.strArgument`
`216`	`216`	`( Options.Applicative.help "The input file to read"`
`217`	`217`	`<> Options.Applicative.metavar "FILE"`
	`218`	`+ <> Options.Applicative.action "file"`
`218`	`219`	`)`
`219`	`220`	`crdArg = Options.Applicative.switch`
`220`	`221`	`( Options.Applicative.long "crd"`
Original file line number	Diff line number	Diff line change
`@@ -105,13 +105,15 @@ parseOptions =`
`105`	`105`	`( Options.long "file"`
`106`	`106`	`<> Options.help "Read YAML expression from a file instead of standard input"`
`107`	`107`	`<> Options.metavar "FILE"`
	`108`	`+ <> Options.action "file"`
`108`	`109`	`)`
`109`	`110`
`110`	`111`	`parseOutput =`
`111`	`112`	`Options.strOption`
`112`	`113`	`( Options.long "output"`
`113`	`114`	`<> Options.help "Write Dhall expression to a file instead of standard output"`
`114`	`115`	`<> Options.metavar "FILE"`
	`116`	`+ <> Options.action "file"`
`115`	`117`	`)`
`116`	`118`
`117`	`119`	`parseASCII =`