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 <bryan.richter@gmail.com>
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 +-
<and so on>
This commit is contained in:
parent
c58a938e63
commit
a0f8c45b4f
@ -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
|
||||
|
||||
@ -1,2 +1 @@
|
||||
:set -i.:config:dist/build/autogen
|
||||
|
||||
|
||||
@ -61,4 +61,3 @@ getApplicationDev =
|
||||
loader = loadConfig (configSettings Development)
|
||||
{ csParseExtra = parseExtra
|
||||
}
|
||||
|
||||
|
||||
@ -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.
|
||||
|
||||
|
||||
@ -12,4 +12,3 @@ import Database.Persist.Quasi
|
||||
-- http://www.yesodweb.com/book/persistent/
|
||||
share [mkPersist ~mkPersistSettings~, mkMigrate "migrateAll"]
|
||||
$(persistFileWith lowerCaseSettings "config/models")
|
||||
|
||||
|
||||
@ -68,4 +68,3 @@ parseExtra :: DefaultEnv -> Object -> Parser Extra
|
||||
parseExtra _ o = Extra
|
||||
<$> o .: "copyright"
|
||||
<*> o .:? "analytics"
|
||||
|
||||
|
||||
@ -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)
|
||||
|
||||
|
||||
@ -3,4 +3,3 @@ $maybe msg <- mmsg
|
||||
^{widget}
|
||||
<footer>
|
||||
#{extraCopyright $ appExtra $ settings master}
|
||||
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
body {
|
||||
font-family: sans-serif;
|
||||
}
|
||||
|
||||
|
||||
@ -1,2 +1 @@
|
||||
document.getElementById("#{h2id}").innerHTML = "<i>Added from JavaScript.</i>";
|
||||
|
||||
|
||||
@ -4,4 +4,3 @@ h1 {
|
||||
h2##{h2id} {
|
||||
color: #990
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user