From d0437834a9c0ccefe5314ae316b4f0391e1874a9 Mon Sep 17 00:00:00 2001 From: Matt Russell Date: Sat, 26 Feb 2011 08:29:50 +0000 Subject: [PATCH] Preparing for 0.0.9 release --- CHANGELOG | 13 ++++++++++--- README.rst | 23 ++++++++++++----------- docs/release-process.txt | 12 +++++------- scalariform/notes/0.0.9.markdown | 10 ++++++++++ scripts/version-list.txt | 1 - 5 files changed, 37 insertions(+), 22 deletions(-) create mode 100644 scalariform/notes/0.0.9.markdown diff --git a/CHANGELOG b/CHANGELOG index 65d6d396..251a6550 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,12 +1,13 @@ -0.0.9 (..) +0.0.9 (26/February/11) + +* Add support for AST selection * Improve basic formatting of Scaladoc comments +* Improve stairway indenting of argument lists, infix exprs * Add preference "PreserveDanglingCloseParenthesis" to keep newlines before a dangling right paren (issue #6) * Allow single-expression case clauses to be formatted adjacent to the case arrow (issue #7) * Improve formatting after a single-line comment (issue #8) * Allow missing param types for -Yinfer-argument-types (issue #9) * FIX: erroneous spaces after "type" (issue #10) -* Improve stairway indenting of argument lists, infix exprs -* Add support for AST selection * Add --forceOutput command-line argument to pass input through untouched if there is a parse error (#issue 11/12) * Pull out separate, non-System.exit()ing 'process' method separate to main() (issue #13) @@ -34,6 +35,7 @@ * Tweaks to else clause formatting 0.0.6 (4/October/10) + * Lexer performance tweaks * FIX: whitespace in XML end tags (e.g. ) * Tweak multiline case clause indentation @@ -45,6 +47,7 @@ * FIX: honour previously-ignored formatXml preference 0.0.5 (15/September/10) + * Support Scala scripts * Better staircase expr formatting * Handle Scala parsing exceptions in command-line tool @@ -56,6 +59,7 @@ * FIX: a package / NEWLINE parsing bug 0.0.4 (17/July/10) + * Add Maven/Tycho build * Adjust spacing between comments and adjacent tokens * Improved formatting for import blocks @@ -66,12 +70,15 @@ * Add "listFiles" command line option -- thanks to Olivier Michallat (olim7t) for patch 0.0.3 (9/June/10) + * command line tool (scalariform.commandline.Main) * _~_ formatting fix 0.0.2 (31/May/10) + * parser update for multiple guards in a generator to match new scalac behaviour * small compiler fixes to match trunk 0.0.1 (11/April/10) + * initial release diff --git a/README.rst b/README.rst index 6d32fb9a..bda0acbd 100644 --- a/README.rst +++ b/README.rst @@ -1,13 +1,14 @@ Scalariform =========== -Scalariform is a code formatter for Scala 2.8+. It is a -library and a stand-alone command line tool, with integrations -available for Eclipse, Emacs (via ENSIME), jEdit, Maven, sbt and -TextMate. Currently, Scalariform supports only a limited set of -options, although it is intended to be compatible with the -recommendations of the `Scala Style Guide`_ (see below). Please let me -know what other features people would like. +Scalariform is a code formatter for Scala 2.8+. It is a library and a +stand-alone command line tool, with integrations available for various +editors (see below). + +Currently, Scalariform supports only a limited set of options. The +plan is to add further features as and when people ask for them, so +please do raise a ticket if it doesn't format your code the way you'd +like it, and I'll see what I can do. Scalariform is licenced under `The MIT Licence`_. @@ -19,11 +20,11 @@ Download Scalariform is available from Scala-tools.org: - http://scala-tools.org/repo-releases/org/scalariform/scalariform_2.8.0/0.0.8/ + http://scala-tools.org/repo-releases/org/scalariform/scalariform_2.8.0/0.0.9/ If you're using sbt, you can declare a dependency as follows:: - val scalariform = "org.scalariform" %% "scalariform" % "0.0.8" + val scalariform = "org.scalariform" %% "scalariform" % "0.0.9" Integration with Eclipse ------------------------ @@ -75,7 +76,7 @@ Usage:: org.scalariform scalariform-maven-plugin - 0.0.8 + 0.0.9 process-sources @@ -120,7 +121,7 @@ Command line tool Scalariform includes a stand-alone command line utility. Sample script:: #!/bin/bash - scala -cp /path/to/scalariform-0.0.8.jar scalariform.commandline.Main "$@" + scala -cp /path/to/scalariform-0.0.9.jar scalariform.commandline.Main "$@" Usage:: diff --git a/docs/release-process.txt b/docs/release-process.txt index fe388010..736ebafa 100644 --- a/docs/release-process.txt +++ b/docs/release-process.txt @@ -1,15 +1,13 @@ # 1. Prepare trunk -export FROM=0.0.7 -export TO=0.0.8 -export NEW=0.0.9 +export FROM=0.0.8 +export TO=0.0.9 +export NEW=0.1.0 sed -i s/$FROM/$TO/g README.rst -sed -i s/$FROM/$TO/g docs/source/README.rst -git diff README.rst docs/source/README.rst -# + data to CHANGELOG -# create scalariform/notes/0.0.8.markdown, check at at http://wmd-editor.com/demo +# + date to CHANGELOG +# create scalariform/notes/$TO.markdown, check at at http://wmd-editor.com/demo # 2. Branch diff --git a/scalariform/notes/0.0.9.markdown b/scalariform/notes/0.0.9.markdown new file mode 100644 index 00000000..a5408047 --- /dev/null +++ b/scalariform/notes/0.0.9.markdown @@ -0,0 +1,10 @@ +* Add support for AST selection +* Improve basic formatting of Scaladoc comments +* Improve stairway indenting of argument lists, infix exprs +* Add preference `PreserveDanglingCloseParenthesis` to keep newlines before a dangling right paren (issue #6) +* Allow single-expression case clauses to be formatted adjacent to the case arrow (issue #7) +* Improve formatting after a single-line comment (issue #8) +* Allow missing param types for `-Yinfer-argument-types` (issue #9) +* FIX: erroneous spaces after `type` (issue #10) +* Add `--forceOutput` command-line argument to pass input through untouched if there is a parse error (#issue 11/12) +* Pull out separate, non-`System.exit()`ing `process` method separate to `main()` (issue #13) diff --git a/scripts/version-list.txt b/scripts/version-list.txt index 95552634..f13037af 100644 --- a/scripts/version-list.txt +++ b/scripts/version-list.txt @@ -11,6 +11,5 @@ scalariform.feature/feature.xml scalariform.update/site.xml scalariform/src/main/scala/scalariform/package.scala README.rst -docs/source/README.rst perf/pom.xml scalariform.maven-plugin/pom.xml