-
Notifications
You must be signed in to change notification settings - Fork 10
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* release-v0.7.0: (40 commits) Bump stackage nightly snapshot Bump version and update changelogs (and CITATION.cff) upd: nixpkgs upd: .cabal fix: shadowed names fix: move cli code into app fix: hpack config fix: nix expressions Fix lower bound on optparse-generic Exclude Language.Rzk.VSCode.Config from GHCJS build Replace `words` with a space in allowed characters Prevent adding a trailing space Add space after token only if not last in the line Improve rule for space inside parenthesis Remove 2 spaces when moving bin op to new line Consider '=' as a binary operator Move the more specific pattern above the catch-all Ensure formatDocument sends a response either way Add a handler for workspace/didChangeConfiguration Keep the lambda arrow as the last char on line ...
- Loading branch information
Showing
20 changed files
with
607 additions
and
99 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| cradle: | ||
| cabal: | ||
| stack: |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,93 @@ | ||
| {-# LANGUAGE CPP #-} | ||
| {-# LANGUAGE CPP #-} | ||
| {-# LANGUAGE DeriveAnyClass #-} | ||
| {-# LANGUAGE DeriveGeneric #-} | ||
| {-# LANGUAGE LambdaCase #-} | ||
| {-# LANGUAGE OverloadedStrings #-} | ||
| {-# LANGUAGE TupleSections #-} | ||
| {-# LANGUAGE NamedFieldPuns #-} | ||
|
|
||
| module Main (main) where | ||
|
|
||
| #ifndef __GHCJS__ | ||
| import Main.Utf8 (withUtf8) | ||
| #endif | ||
| import qualified Rzk.Main | ||
|
|
||
| import Control.Monad (forM, forM_, unless, when, | ||
| (>=>)) | ||
| import Data.Version (showVersion) | ||
|
|
||
| #ifdef LSP | ||
| import Language.Rzk.VSCode.Lsp (runLsp) | ||
| #endif | ||
|
|
||
| import Options.Generic | ||
| import System.Exit (exitFailure, exitSuccess) | ||
|
|
||
| import Data.Functor ((<&>)) | ||
| import Paths_rzk (version) | ||
| import Rzk.Format (formatFile, formatFileWrite, | ||
| isWellFormattedFile) | ||
| import Rzk.TypeCheck | ||
| import Rzk.Main | ||
|
|
||
| data FormatOptions = FormatOptions | ||
| { check :: Bool | ||
| , write :: Bool | ||
| } deriving (Generic, Show, ParseRecord, Read, ParseField) | ||
|
|
||
| instance ParseFields FormatOptions where | ||
| parseFields _ _ _ _ = FormatOptions | ||
| <$> parseFields (Just "Check if the files are correctly formatted") (Just "check") (Just 'c') Nothing | ||
| <*> parseFields (Just "Write formatted file to disk") (Just "write") (Just 'w') Nothing | ||
|
|
||
| data Command | ||
| = Typecheck [FilePath] | ||
| | Lsp | ||
| | Format FormatOptions [FilePath] | ||
| | Version | ||
| deriving (Generic, Show, ParseRecord) | ||
|
|
||
| main :: IO () | ||
| main = | ||
| main = do | ||
| #ifndef __GHCJS__ | ||
| withUtf8 | ||
| withUtf8 $ | ||
| #endif | ||
| getRecord "rzk: an experimental proof assistant for synthetic ∞-categories" >>= \case | ||
| Typecheck paths -> do | ||
| modules <- parseRzkFilesOrStdin paths | ||
| case defaultTypeCheck (typecheckModulesWithLocation modules) of | ||
| Left err -> do | ||
| putStrLn "An error occurred when typechecking!" | ||
| putStrLn $ unlines | ||
| [ "Type Error:" | ||
| , ppTypeErrorInScopedContext' BottomUp err | ||
| ] | ||
| exitFailure | ||
| Right _decls -> putStrLn "Everything is ok!" | ||
|
|
||
| Lsp -> | ||
| #ifdef LSP | ||
| void runLsp | ||
| #else | ||
| error "rzk lsp is not supported with this build" | ||
| #endif | ||
| Rzk.Main.main | ||
|
|
||
| Format (FormatOptions {check, write}) paths -> do | ||
| when (check && write) (error "Options --check and --write are mutually exclusive") | ||
| expandedPaths <- expandRzkPathsOrYaml paths | ||
| case expandedPaths of | ||
| [] -> error "No files found" | ||
| filePaths -> do | ||
| when (not check && not write) $ forM_ filePaths (formatFile >=> putStrLn) | ||
| when write $ forM_ filePaths formatFileWrite | ||
| when check $ do | ||
| results <- forM filePaths $ \path -> isWellFormattedFile path <&> (path,) | ||
| let notFormatted = map fst $ filter (not . snd) results | ||
| unless (null notFormatted) $ do | ||
| putStrLn "Some files are not well formatted:" | ||
| forM_ notFormatted $ \path -> putStrLn (" " <> path) | ||
| exitFailure | ||
| exitSuccess | ||
|
|
||
| Version -> putStrLn (showVersion version) | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.