Merge branch 'master' of https://github.com/mdr/ensime into mdr-master

KirinDave · Dec 1, 2010 · 394fd92 · 394fd92
2 parents ec853c7 + ae577c0
commit 394fd92
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/etc/manual.ltx b/etc/manual.ltx
@@ -277,6 +277,7 @@ Customize the behavior of the source formatter. All Scalariform preferences are
   {\bf :alignParameters} & t or nil  \\ \hline
   {\bf :compactStringConcatenation} & t or nil  \\ \hline
   {\bf :doubleIndentClassDeclaration} & t or nil  \\ \hline
+  {\bf :indentPackageBlocks} & t or nil  \\ \hline
   {\bf :indentSpaces} & 1-10  \\ \hline
   {\bf :preserveSpaceBeforeArguments} & t or nil  \\ \hline
   {\bf :rewriteArrowSymbols} & t or nil  \\ \hline

diff --git a/project/build/Ensime.scala b/project/build/Ensime.scala
@@ -14,7 +14,7 @@ class EnsimeProject(info: ProjectInfo) extends DefaultProject(info){
   val maven = "org.apache.maven" % "maven-ant-tasks" % "2.1.0" % "compile;runtime;test"
   val scalatest = "org.scalatest" % "scalatest" % "1.2" % "test"
   val jdt = "org.eclipse.jdt" % "core" % "3.4.2.v_883_R34x" % "compile;runtime;test"
-  val scalariform = "org.scalariform" % "scalariform_2.8.0" % "0.0.5"%"compile;runtime;test"
+  val scalariform = "org.scalariform" % "scalariform_2.8.0" % "0.0.7"%"compile;runtime;test"
 //  val refactoring = "org.scala-refactoring" % "org.scala-refactoring.library" % "0.2.0-SNAPSHOT"%"compile;runtime;test"
   val asm = "asm" % "asm" % "3.2"
   val asmCommons = "asm" % "asm-commons" % "3.2"

diff --git a/src/main/scala/org/ensime/config/ProjectConfig.scala b/src/main/scala/org/ensime/config/ProjectConfig.scala
@@ -262,6 +262,8 @@ class ProjectConfig(
       fp.setPreference(DoubleIndentClassDeclaration, value)
       case ('formatXml, value: Boolean) =>
       fp.setPreference(FormatXml, value)
+      case ('indentPackageBlocks, value: Boolean) =>
+      fp.setPreference(IndentPackageBlocks, value)
       case ('indentSpaces, value: Int) =>
       fp.setPreference(IndentSpaces, value)
       case ('preserveSpaceBeforeArguments, value: Boolean) =>