diff --git a/.scalafmt.conf b/.scalafmt.conf index e47971ae55..26602c2a45 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -12,7 +12,6 @@ docstrings { indent { main = 4 callSite = 4 - ctorSite = 8 # Double Indent } indentOperator.exemptScope = aloneEnclosed diff --git a/DEVELOPING_OPAL/demos/src/main/scala/org/opalj/ai/ExceptionUsage.scala b/DEVELOPING_OPAL/demos/src/main/scala/org/opalj/ai/ExceptionUsage.scala index 5b5fc4159f..626a85c20b 100644 --- a/DEVELOPING_OPAL/demos/src/main/scala/org/opalj/ai/ExceptionUsage.scala +++ b/DEVELOPING_OPAL/demos/src/main/scala/org/opalj/ai/ExceptionUsage.scala @@ -145,10 +145,10 @@ object ExceptionUsage extends ProjectAnalysisApplication { } case class ExceptionUsage( - method: Method, - definitionSite: PC, - exceptionType: String, - usageInformation: scala.collection.Set[UsageKind.Value] + method: Method, + definitionSite: PC, + exceptionType: String, + usageInformation: scala.collection.Set[UsageKind.Value] ) extends scala.math.Ordered[ExceptionUsage] { override def toString: String = { diff --git a/DEVELOPING_OPAL/demos/src/main/scala/org/opalj/ai/domain/l1/MethodReturnValuesAnalysis.scala b/DEVELOPING_OPAL/demos/src/main/scala/org/opalj/ai/domain/l1/MethodReturnValuesAnalysis.scala index d5a2225c21..96e1a143d4 100644 --- a/DEVELOPING_OPAL/demos/src/main/scala/org/opalj/ai/domain/l1/MethodReturnValuesAnalysis.scala +++ b/DEVELOPING_OPAL/demos/src/main/scala/org/opalj/ai/domain/l1/MethodReturnValuesAnalysis.scala @@ -30,9 +30,9 @@ import scala.collection.parallel.CollectionConverters.IterableIsParallelizable object MethodReturnValuesAnalysis extends ProjectAnalysisApplication { class AnalysisDomain( - override val project: Project[java.net.URL], - val ai: InterruptableAI[_], - val method: Method + override val project: Project[java.net.URL], + val ai: InterruptableAI[_], + val method: Method ) extends CorrelationalDomain with domain.DefaultSpecialDomainValuesBinding with domain.ThrowAllPotentialExceptionsConfiguration diff --git a/DEVELOPING_OPAL/demos/src/main/scala/org/opalj/ai/tutorial/base/IdentifyResourcesAnalysis.scala b/DEVELOPING_OPAL/demos/src/main/scala/org/opalj/ai/tutorial/base/IdentifyResourcesAnalysis.scala index c6f1670a98..eda1eec961 100644 --- a/DEVELOPING_OPAL/demos/src/main/scala/org/opalj/ai/tutorial/base/IdentifyResourcesAnalysis.scala +++ b/DEVELOPING_OPAL/demos/src/main/scala/org/opalj/ai/tutorial/base/IdentifyResourcesAnalysis.scala @@ -58,8 +58,8 @@ object IdentifyResourcesAnalysis extends ProjectAnalysisApplication { // Perform a simple abstract interpretation to check if there is some // method that passes a constant string to a method. class AnalysisDomain( - override val project: Project[URL], - val method: Method + override val project: Project[URL], + val method: Method ) extends CorrelationalDomain with domain.TheProject with domain.TheMethod diff --git a/DEVELOPING_OPAL/demos/src/main/scala/org/opalj/ai/tutorial/ex1/IdentifyResourcesAnalysis.scala b/DEVELOPING_OPAL/demos/src/main/scala/org/opalj/ai/tutorial/ex1/IdentifyResourcesAnalysis.scala index 1fa6d83d91..f5e5a6bf71 100644 --- a/DEVELOPING_OPAL/demos/src/main/scala/org/opalj/ai/tutorial/ex1/IdentifyResourcesAnalysis.scala +++ b/DEVELOPING_OPAL/demos/src/main/scala/org/opalj/ai/tutorial/ex1/IdentifyResourcesAnalysis.scala @@ -24,8 +24,8 @@ import scala.collection.parallel.CollectionConverters.IterableIsParallelizable object IdentifyResourcesAnalysis extends ProjectAnalysisApplication { class AnalysisDomain( - override val project: Project[URL], - val method: Method + override val project: Project[URL], + val method: Method ) extends CorrelationalDomain with domain.DefaultSpecialDomainValuesBinding with domain.ThrowAllPotentialExceptionsConfiguration diff --git a/DEVELOPING_OPAL/tools/src/main/scala/org/opalj/support/debug/XHTMLTracer.scala b/DEVELOPING_OPAL/tools/src/main/scala/org/opalj/support/debug/XHTMLTracer.scala index b3bb76702c..d6d9429c0e 100644 --- a/DEVELOPING_OPAL/tools/src/main/scala/org/opalj/support/debug/XHTMLTracer.scala +++ b/DEVELOPING_OPAL/tools/src/main/scala/org/opalj/support/debug/XHTMLTracer.scala @@ -24,11 +24,11 @@ import org.opalj.collection.mutable.IntArrayStack import org.opalj.io.writeAndOpen case class FlowEntity( - pc: Int, - instruction: Instruction, - operands: Operands[_ >: Null <: Domain#DomainValue], - locals: Locals[_ >: Null <: Domain#DomainValue], - properties: Option[String] + pc: Int, + instruction: Instruction, + operands: Operands[_ >: Null <: Domain#DomainValue], + locals: Locals[_ >: Null <: Domain#DomainValue], + properties: Option[String] ) { val flowId = FlowEntity.nextFlowId } diff --git a/DEVELOPING_OPAL/validate/src/test/scala/org/opalj/fpcf/PropertiesTest.scala b/DEVELOPING_OPAL/validate/src/test/scala/org/opalj/fpcf/PropertiesTest.scala index f7cf2a2693..fef3b9b5d3 100644 --- a/DEVELOPING_OPAL/validate/src/test/scala/org/opalj/fpcf/PropertiesTest.scala +++ b/DEVELOPING_OPAL/validate/src/test/scala/org/opalj/fpcf/PropertiesTest.scala @@ -418,7 +418,7 @@ abstract class PropertiesTest extends AnyFunSpec with Matchers { } case class TestContext( - project: Project[URL], - propertyStore: PropertyStore, - analyses: List[FPCFAnalysis] + project: Project[URL], + propertyStore: PropertyStore, + analyses: List[FPCFAnalysis] ) diff --git a/DEVELOPING_OPAL/validate/src/test/scala/org/opalj/fpcf/properties/allocation_freeness/AllocationFreenessMatcher.scala b/DEVELOPING_OPAL/validate/src/test/scala/org/opalj/fpcf/properties/allocation_freeness/AllocationFreenessMatcher.scala index 528bedf984..a48b9860e8 100644 --- a/DEVELOPING_OPAL/validate/src/test/scala/org/opalj/fpcf/properties/allocation_freeness/AllocationFreenessMatcher.scala +++ b/DEVELOPING_OPAL/validate/src/test/scala/org/opalj/fpcf/properties/allocation_freeness/AllocationFreenessMatcher.scala @@ -16,7 +16,7 @@ import org.opalj.br.fpcf.properties.AllocationFreeness * @author Dominik Helm */ sealed abstract class AllocationFreenessMatcher( - val property: AllocationFreeness + val property: AllocationFreeness ) extends AbstractPropertyMatcher { def validateProperty( diff --git a/DEVELOPING_OPAL/validate/src/test/scala/org/opalj/fpcf/properties/compile_time_constancy/CompileTimeConstancyMatcher.scala b/DEVELOPING_OPAL/validate/src/test/scala/org/opalj/fpcf/properties/compile_time_constancy/CompileTimeConstancyMatcher.scala index c863fb5872..3fe25be717 100644 --- a/DEVELOPING_OPAL/validate/src/test/scala/org/opalj/fpcf/properties/compile_time_constancy/CompileTimeConstancyMatcher.scala +++ b/DEVELOPING_OPAL/validate/src/test/scala/org/opalj/fpcf/properties/compile_time_constancy/CompileTimeConstancyMatcher.scala @@ -17,7 +17,7 @@ import org.opalj.br.fpcf.properties.CompileTimeVaryingField * @author Dominik Helm */ sealed abstract class CompileTimeConstancyMatcher( - val property: CompileTimeConstancy + val property: CompileTimeConstancy ) extends AbstractPropertyMatcher { def validateProperty( diff --git a/DEVELOPING_OPAL/validate/src/test/scala/org/opalj/fpcf/properties/escape/EscapePropertyMatcher.scala b/DEVELOPING_OPAL/validate/src/test/scala/org/opalj/fpcf/properties/escape/EscapePropertyMatcher.scala index 9959dee286..6aec57236d 100644 --- a/DEVELOPING_OPAL/validate/src/test/scala/org/opalj/fpcf/properties/escape/EscapePropertyMatcher.scala +++ b/DEVELOPING_OPAL/validate/src/test/scala/org/opalj/fpcf/properties/escape/EscapePropertyMatcher.scala @@ -23,7 +23,7 @@ import org.opalj.tac.common.DefinitionSite * @author Florian Kuebler */ abstract class EscapePropertyMatcher( - val property: EscapeProperty + val property: EscapeProperty ) extends AbstractPropertyMatcher { override def isRelevant( diff --git a/DEVELOPING_OPAL/validate/src/test/scala/org/opalj/fpcf/properties/immutability/types/TypeImmutabilityMatcher.scala b/DEVELOPING_OPAL/validate/src/test/scala/org/opalj/fpcf/properties/immutability/types/TypeImmutabilityMatcher.scala index 91587f2bcd..43378650de 100644 --- a/DEVELOPING_OPAL/validate/src/test/scala/org/opalj/fpcf/properties/immutability/types/TypeImmutabilityMatcher.scala +++ b/DEVELOPING_OPAL/validate/src/test/scala/org/opalj/fpcf/properties/immutability/types/TypeImmutabilityMatcher.scala @@ -16,7 +16,7 @@ import org.opalj.fpcf.Property import org.opalj.fpcf.properties.AbstractPropertyMatcher class TypeImmutabilityMatcher( - val property: TypeImmutability + val property: TypeImmutability ) extends AbstractPropertyMatcher { import org.opalj.br.analyses.SomeProject diff --git a/Eclipse Java Formatter Preferences.xml b/Eclipse Java Formatter Preferences.xml index 10c113db61..666f60fb08 100644 --- a/Eclipse Java Formatter Preferences.xml +++ b/Eclipse Java Formatter Preferences.xml @@ -1,291 +1,380 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/IntelliJ Java and Scala Formatter Preferences.xml b/IntelliJ Java and Scala Formatter Preferences.xml index ddd8a217fd..e72bd1f1a2 100644 --- a/IntelliJ Java and Scala Formatter Preferences.xml +++ b/IntelliJ Java and Scala Formatter Preferences.xml @@ -1,11 +1,12 @@ - -