From a0f8c45b4f7babf97cb97aeeea565b22dd6f0ac6 Mon Sep 17 00:00:00 2001 From: Bryan Richter Date: Tue, 31 Jan 2012 11:32:06 -0800 Subject: [PATCH 1/2] Cleans up ends of scaffold files Scaffolding.CodeGen.codegenDir no longer removes the final eol. Input files that had extra eols have had them removed. With these changes, the generated files are now more identical to the inputs: $ diff foo/LICENSE scaffold/LICENSE.cg 4c4 < Copyright 2012, foo. All rights reserved. --- > Copyright ~year~, ~name~. All rights reserved. Additionally, initial commits of changes to a new project's files aren't littered with "\ No newline at end of file". Maybe other people don't have this problem, but vim auto-adds eols to files that lack them... commit ce34468190ea87b91eb3b1a9b7987f40d49cf97e Author: Bryan Richter Date: Fri Jan 27 22:59:57 2012 -0800 Adds newlines to files that need em. Foundation.hs | 2 +- Handler/Root.hs | 2 +- Import.hs | 2 +- config/models | 2 +- config/postgresql.yml | 2 +- config/settings.yml | 2 +- --- yesod/Scaffolding/CodeGen.hs | 2 +- yesod/scaffold/.ghci.cg | 1 - yesod/scaffold/Application.hs.cg | 1 - yesod/scaffold/LICENSE.cg | 1 - yesod/scaffold/Model.hs.cg | 1 - yesod/scaffold/Settings.hs.cg | 1 - yesod/scaffold/Settings/StaticFiles.hs.cg | 1 - yesod/scaffold/templates/default-layout.hamlet.cg | 1 - yesod/scaffold/templates/default-layout.lucius.cg | 1 - yesod/scaffold/templates/homepage.julius.cg | 1 - yesod/scaffold/templates/homepage.lucius.cg | 1 - 11 files changed, 1 insertion(+), 11 deletions(-) diff --git a/yesod/Scaffolding/CodeGen.hs b/yesod/Scaffolding/CodeGen.hs index de54d98f..7f834e78 100644 --- a/yesod/Scaffolding/CodeGen.hs +++ b/yesod/Scaffolding/CodeGen.hs @@ -14,7 +14,7 @@ data Token = VarToken String | LitToken String | EmptyToken codegenDir :: FilePath -> FilePath -> Q Exp codegenDir dir fp = do s' <- qRunIO $ L.readFile $ (dir ++ "/" ++ fp ++ ".cg") - let s = init $ LT.unpack $ LT.decodeUtf8 s' + let s = LT.unpack $ LT.decodeUtf8 s' case parse (many parseToken) s s of Left e -> error $ show e Right tokens' -> do diff --git a/yesod/scaffold/.ghci.cg b/yesod/scaffold/.ghci.cg index 44fa6f76..76ae5677 100644 --- a/yesod/scaffold/.ghci.cg +++ b/yesod/scaffold/.ghci.cg @@ -1,2 +1 @@ :set -i.:config:dist/build/autogen - diff --git a/yesod/scaffold/Application.hs.cg b/yesod/scaffold/Application.hs.cg index fe326b94..07d0e342 100644 --- a/yesod/scaffold/Application.hs.cg +++ b/yesod/scaffold/Application.hs.cg @@ -61,4 +61,3 @@ getApplicationDev = loader = loadConfig (configSettings Development) { csParseExtra = parseExtra } - diff --git a/yesod/scaffold/LICENSE.cg b/yesod/scaffold/LICENSE.cg index 7830a89e..125c9165 100644 --- a/yesod/scaffold/LICENSE.cg +++ b/yesod/scaffold/LICENSE.cg @@ -23,4 +23,3 @@ OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - diff --git a/yesod/scaffold/Model.hs.cg b/yesod/scaffold/Model.hs.cg index ed11b9d8..86bf5947 100644 --- a/yesod/scaffold/Model.hs.cg +++ b/yesod/scaffold/Model.hs.cg @@ -12,4 +12,3 @@ import Database.Persist.Quasi -- http://www.yesodweb.com/book/persistent/ share [mkPersist ~mkPersistSettings~, mkMigrate "migrateAll"] $(persistFileWith lowerCaseSettings "config/models") - diff --git a/yesod/scaffold/Settings.hs.cg b/yesod/scaffold/Settings.hs.cg index 60884f3c..a8810dd0 100644 --- a/yesod/scaffold/Settings.hs.cg +++ b/yesod/scaffold/Settings.hs.cg @@ -68,4 +68,3 @@ parseExtra :: DefaultEnv -> Object -> Parser Extra parseExtra _ o = Extra <$> o .: "copyright" <*> o .:? "analytics" - diff --git a/yesod/scaffold/Settings/StaticFiles.hs.cg b/yesod/scaffold/Settings/StaticFiles.hs.cg index 2ba792a6..e6048731 100644 --- a/yesod/scaffold/Settings/StaticFiles.hs.cg +++ b/yesod/scaffold/Settings/StaticFiles.hs.cg @@ -19,4 +19,3 @@ staticSite = -- Warning: any files added to your static directory during run-time can't be -- accessed this way. You'll have to use their FilePath or URL to access them. $(staticFiles Settings.staticDir) - diff --git a/yesod/scaffold/templates/default-layout.hamlet.cg b/yesod/scaffold/templates/default-layout.hamlet.cg index bef70857..0c10f18a 100644 --- a/yesod/scaffold/templates/default-layout.hamlet.cg +++ b/yesod/scaffold/templates/default-layout.hamlet.cg @@ -3,4 +3,3 @@ $maybe msg <- mmsg ^{widget}