fix-whitespace 0.0.5 → 0.0.6

raw patch · 15 files changed

+151/−9 lines, 15 filesnew-uploader

Files

• CHANGELOG.md +8/−2
• FixWhitespace.hs +5/−4
• ParseConfig.hs +3/−2
• fix-whitespace.cabal +18/−1
• fix-whitespace.yaml +64/−0
• stack-8.0.2.yaml +8/−0
• stack-8.10.3.yaml +3/−0
• stack-8.10.4.yaml +3/−0
• stack-8.10.5.yaml +3/−0
• stack-8.2.2.yaml +7/−0
• stack-8.4.4.yaml +6/−0
• stack-8.6.5.yaml +6/−0
• stack-8.8.3.yaml +5/−0
• stack-8.8.4.yaml +5/−0
• stack-9.0.1.yaml +7/−0

@@ -2,7 +2,13 @@  Version history. +## 0.0.6 released 2021-07-29++- Fix the release version: The tag `0.0.5` on the GitHub repo was released on 14 Oct 2019 while `0.0.5` on Hackage is the commit `1394ec6`.+- Include `-Wall` and `-Wcompact` during compilation.+- Update `stack-x.y.z.yaml` and add `stack-8.10.5.yaml`.+ ## 0.0.5 released 2021-03-11 -- initial release-- tested with GHC 8.0.2 - 9.0.1+- initial release.+- tested with GHC 8.0.2 - 9.0.1.

@@ -14,8 +14,8 @@ import System.Directory ( getCurrentDirectory, doesFileExist) import System.Environment import System.Exit-import System.FilePath-import System.FilePattern+-- import System.FilePath+-- import System.FilePattern import System.FilePattern.Directory import System.IO import System.Console.GetOpt@@ -40,6 +40,7 @@   -- ^ The location to the configuration file.   } +defaultOptions :: Options defaultOptions = Options   { optVerbose = False   , optHelp    = False@@ -214,8 +215,8 @@                              n = 8 - p `mod` 8   convertOne (a, p) c = (c:a, p+1) -  addSpaces 0 x = x-  addSpaces n x = addSpaces (n-1) (' ':x)+  addSpaces :: Int -> String -> String+  addSpaces n = (replicate n ' ' ++)  -- | 'dropWhile' except keep the first of the dropped elements dropWhile1 :: (a -> Bool) -> [a] -> [a]

@@ -32,8 +32,9 @@     v .:? "excluded-files"   parseJSON _ = fail "Expected Object for Config value" -parseRawConfig :: FilePath -> IO (Either Y.ParseException RawConfig)-parseRawConfig = Y.decodeFileEither+-- -- UNUSED+-- parseRawConfig :: FilePath -> IO (Either Y.ParseException RawConfig)+-- parseRawConfig = Y.decodeFileEither  parseConfig :: FilePath -> IO Config parseConfig fp = do

@@ -1,5 +1,5 @@ name:            fix-whitespace-version:         0.0.5+version:         0.0.6 cabal-version:   >= 1.10 build-type:      Simple description:     Removes trailing whitespace, lines containing only whitespace and ensure that every file ends in a newline character.@@ -15,14 +15,27 @@                  GHC == 8.2.2                  GHC == 8.4.4                  GHC == 8.6.5+                 GHC == 8.8.3                  GHC == 8.8.4                  GHC == 8.10.3                  GHC == 8.10.4+                 GHC == 8.10.5                  GHC == 9.0.1  extra-source-files:   CHANGELOG.md   README.md+  fix-whitespace.yaml+  stack-8.0.2.yaml+  stack-8.2.2.yaml+  stack-8.4.4.yaml+  stack-8.6.5.yaml+  stack-8.8.3.yaml+  stack-8.8.4.yaml+  stack-8.10.3.yaml+  stack-8.10.4.yaml+  stack-8.10.5.yaml+  stack-9.0.1.yaml  source-repository head   type: git@@ -48,3 +61,7 @@   -- The other GHC versions can restrict to >= 1.2.3.1.   if impl(ghc < 8.4.1) || impl(ghc > 8.4.3)     build-depends: text >= 1.2.3.1++  ghc-options:+    -Wall+    -Wcompat

@@ -0,0 +1,64 @@+# This file contains the project-specific settings for `fix-whitespace` a tiny+# but useful tool to+#+# * Removes trailing whitespace.+# * Removes trailing lines containing nothing but whitespace.+# * Ensures that the file ends in a newline character.+#+# By default, fix-whitespace checks every directory under the current working+# directory but no files. This program should be placed under a text-based+# project.+#+# For directories,+#+# 1) excluded-dirs is a black-list of directories,+# 2) included-dirs is a white-list of excluded-dirs+#+# For files,+#+# 3) included-files is a white-list of files,+# 4) excluded-files is a black-list of included-files.+#+# The extended glob pattern can be used to specify file/directory names.+# For details, see http://hackage.haskell.org/package/filemanip-0.3.6.3/docs/System-FilePath-GlobPattern.html+#+included-dirs:+  - src/full/Agda/Compiler/MAlonzo+    # Without this line the above path will be excluded.++excluded-dirs:+  - "**/MAlonzo" # matches every MAlonzo in any directory including the src/full/Agda/Compiler/MAlonzo+  - "**/dist*"   # matches every dist* in any directory+  - .stack-work+  - _darcs+  - .git+  - std-lib+  - test/Succeed/LineEndings+  - examples/uptodate++# Every matched filename is included unless it is matched by excluded-files.+included-files:+  - "**/*.agda"+  - "**/*.cabal"+  - "**/*.el"+  - "**/*.hs"+  - "**/*.hs-boot"+  - "**/*.lagda"+  - "**/*.lhs"+  - "**/*.md"+  - "**/*.rst"+  - "**/*.x"+  - "**/*.y"+  - "**/*.yaml"+  - "**/*.yml"++excluded-files:+# Andreas (24 Sep 2014).+# The following files are exempt from the whitespace check,+# as they test behavior of Agda with regard to tab characters.+  - "test/Succeed/Whitespace.agda"+  - "test/Succeed/Issue1337.agda"+  - "test/Fail/Tabs.agda"+  - "test/Fail/TabsInPragmas.agda"+  - "src/full/Agda/Syntax/Parser/Lexer.hs"+  - "test/LaTeXAndHTML/succeed/AccidentalSpacesAfterBeginCode.lagda"

@@ -0,0 +1,8 @@+resolver: lts-9.21+compiler: ghc-8.0.2+compiler-check: match-exact++extra-deps:+  - text-1.2.3.1+  - extra-1.7.1+  - filepattern-0.1.2

@@ -0,0 +1,3 @@+resolver: lts-17.2+compiler: ghc-8.10.3+compiler-check: match-exact

@@ -0,0 +1,3 @@+resolver: lts-18.4+compiler: ghc-8.10.4+compiler-check: match-exact

@@ -0,0 +1,3 @@+resolver: lts-18.4+compiler: ghc-8.10.5+compiler-check: match-exact

@@ -0,0 +1,7 @@+resolver: lts-11.22+compiler: ghc-8.2.2+compiler-check: match-exact++extra-deps:+  - text-1.2.3.1+  - filepattern-0.1.2

@@ -0,0 +1,6 @@+resolver: lts-12.26+compiler: ghc-8.4.4+compiler-check: match-exact++extra-deps:+  - filepattern-0.1.2

@@ -0,0 +1,6 @@+resolver: lts-14.27+compiler: ghc-8.6.5+compiler-check: match-exact++extra-deps:+  - filepattern-0.1.2

@@ -0,0 +1,5 @@+resolver: lts-16.11+compiler: ghc-8.8.3+compiler-check: match-exact++extra-deps:

@@ -0,0 +1,5 @@+resolver: lts-16.31+compiler: ghc-8.8.4+compiler-check: match-exact++extra-deps:

@@ -0,0 +1,7 @@+resolver: nightly-2021-07-29+compiler: ghc-9.0.1+compiler-check: match-exact++flags:+  transformers-compat:+    five-three: true