From 19b4d9eb08500b20359e3da981fef98af99875fd Mon Sep 17 00:00:00 2001
From: bow <bow@bow.web.id>
Date: Wed, 30 Jul 2014 10:32:13 +0200
Subject: [PATCH] Update style and exclude JSON defs from style reformatting
---
.../pipelines/flexiprep/FlexiprepSummary.scala | 15 +++++++++------
scalariformStyle.properties | 2 +-
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/flexiprep/src/main/scala/nl/lumc/sasc/biopet/pipelines/flexiprep/FlexiprepSummary.scala b/flexiprep/src/main/scala/nl/lumc/sasc/biopet/pipelines/flexiprep/FlexiprepSummary.scala
index 29b81574c..d5d8effd3 100644
--- a/flexiprep/src/main/scala/nl/lumc/sasc/biopet/pipelines/flexiprep/FlexiprepSummary.scala
+++ b/flexiprep/src/main/scala/nl/lumc/sasc/biopet/pipelines/flexiprep/FlexiprepSummary.scala
@@ -99,19 +99,22 @@ class FlexiprepSummary(val root: Configurable) extends InProcessFunction with Co
deps ::= fastqSync.output_stats
return fastqSync
}
-
+ // format: OFF
override def run {
logger.debug("Start")
- val summary = ("flexiprep" := (("clipping" := !flexiprep.skipClip) ->:
- ("trimming" := !flexiprep.skipTrim) ->:
- ("paired" := flexiprep.paired) ->:
- jEmptyObject)) ->:
+ val summary =
+ ("flexiprep" := (
+ ("clipping" := !flexiprep.skipClip) ->:
+ ("trimming" := !flexiprep.skipTrim) ->:
+ ("paired" := flexiprep.paired) ->:
+ jEmptyObject)) ->:
("seqstat" := seqstatSummary) ->:
("sha1" := sha1Summary) ->:
("fastqc" := fastqcSummary) ->:
("clipping" :=? clipstatSummary) ->?:
("trimming" :=? trimstatSummary) ->?:
jEmptyObject
+ // format: ON
logger.debug(summary.spaces2) // TODO: need output writter
logger.debug("Stop")
}
@@ -209,4 +212,4 @@ class FlexiprepSummary(val root: Configurable) extends InProcessFunction with Co
return Option(Sickle.mergeSummarys(s.toList))
}
}
-}
\ No newline at end of file
+}
diff --git a/scalariformStyle.properties b/scalariformStyle.properties
index eb4298d0e..20a1fc52d 100644
--- a/scalariformStyle.properties
+++ b/scalariformStyle.properties
@@ -10,7 +10,7 @@ indentLocalDefs=false
indentPackageBlocks=true
indentSpaces=2
placeScaladocAsterisksBeneathSecondAsterisk=false
-preserveDanglingCloseParenthesis=false
+preserveDanglingCloseParenthesis=true
preserveSpaceBeforeArguments=false
rewriteArrowSymbols=false
spaceBeforeColon=false
--
GitLab