Skip to content

Commit f4123d4

Browse files
nikololiahimnikololiahim
authored
Merge pull request #56 from nikololiahim/organize_imports
Enabled a scalafix rule to organize imports
2 parents bc0ef3a + a0acbbd commit f4123d4

49 files changed

Lines changed: 216 additions & 180 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.scalafix.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
rules = [
22
ExplicitResultTypes,
33
NoAutoTupling,
4-
RemoveUnused,
4+
OrganizeImports,
55
DisableSyntax,
66
LeakingImplicitClassVal,
77
NoValInForComprehension,

‎analysis/src/main/scala/org/polystat/odin/analysis/EOOdinAnalyzer.scala‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
package org.polystat.odin.analysis
22

33
import cats._
4-
import cats.data.{EitherNel, NonEmptyList}
4+
import cats.data.EitherNel
5+
import cats.data.NonEmptyList
56
import cats.effect.Sync
67
import cats.syntax.all._
78
import fs2.Stream

‎analysis/src/main/scala/org/polystat/odin/analysis/liskov/Analyzer.scala‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,17 @@
11
package org.polystat.odin.analysis.liskov
22

33
import cats.data.EitherNel
4-
import org.polystat.odin.analysis.utils.inlining.Inliner.{
5-
AnalysisInfo,
6-
ObjectTreeForAnalysis
7-
}
8-
import org.polystat.odin.core.ast.EONamedBnd
9-
import org.polystat.odin.parser.eo.Parser
104
import cats.syntax.parallel._
11-
import org.polystat.odin.analysis.unjustifiedassumptions.Analyzer.{
12-
getMethodsInfo,
13-
processMethod
14-
}
15-
import org.polystat.odin.analysis.utils.inlining.{
16-
Inliner,
17-
MethodInfo,
18-
MethodInfoForAnalysis
19-
}
5+
import org.polystat.odin.analysis.unjustifiedassumptions.Analyzer.getMethodsInfo
6+
import org.polystat.odin.analysis.unjustifiedassumptions.Analyzer.processMethod
7+
import org.polystat.odin.analysis.utils.inlining.Inliner
8+
import org.polystat.odin.analysis.utils.inlining.Inliner.AnalysisInfo
9+
import org.polystat.odin.analysis.utils.inlining.Inliner.ObjectTreeForAnalysis
10+
import org.polystat.odin.analysis.utils.inlining.MethodInfo
11+
import org.polystat.odin.analysis.utils.inlining.MethodInfoForAnalysis
2012
import org.polystat.odin.analysis.utils.logicalextraction.ExtractLogic.checkImplication
13+
import org.polystat.odin.core.ast.EONamedBnd
14+
import org.polystat.odin.parser.eo.Parser
2115

2216
object Analyzer {
2317

‎analysis/src/main/scala/org/polystat/odin/analysis/mutualrec/advanced/CallGraph.scala‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package org.polystat.odin.analysis.mutualrec.advanced
22

3-
import scala.annotation.tailrec
43
import org.polystat.odin.analysis.mutualrec.advanced.Program._
54

5+
import scala.annotation.tailrec
6+
67
object CallGraph {
78

89
type CallGraph = Map[MethodName, Set[MethodName]]

‎analysis/src/main/scala/org/polystat/odin/analysis/mutualrec/naive/package.scala‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,19 @@ import cats._
44
import cats.data.Chain
55
import cats.effect._
66
import cats.implicits._
7+
import higherkindness.droste.data.Fix
8+
import org.polystat.odin.analysis.mutualrec.naive.services.MethodAttribute
79
import org.polystat.odin.analysis.mutualrec.naive.services.MethodAttribute.MethodInfo
10+
import org.polystat.odin.analysis.mutualrec.naive.services.TopLevelObjects
811
import org.polystat.odin.analysis.mutualrec.naive.services.TopLevelObjects.createTopLevelObjectsWithRefs
9-
import higherkindness.droste.data.Fix
10-
import org.polystat.odin.analysis.mutualrec.naive.services.{
11-
MethodAttribute,
12-
TopLevelObjects
13-
}
12+
import org.polystat.odin.core.ast.EOArray
13+
import org.polystat.odin.core.ast.EOBndExpr
14+
import org.polystat.odin.core.ast.EOCopy
15+
import org.polystat.odin.core.ast.EODot
16+
import org.polystat.odin.core.ast.EOObj
17+
import org.polystat.odin.core.ast.EOProg
18+
import org.polystat.odin.core.ast.EOSimpleApp
1419
import org.polystat.odin.core.ast.astparams.EOExprOnly
15-
import org.polystat.odin.core.ast.{
16-
EOArray,
17-
EOBndExpr,
18-
EOCopy,
19-
EODot,
20-
EOObj,
21-
EOProg,
22-
EOSimpleApp
23-
}
2420

2521
package object naive {
2622

‎analysis/src/main/scala/org/polystat/odin/analysis/mutualrec/naive/services/TopLevelObject.scala‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
package org.polystat.odin.analysis.mutualrec.naive.services
22

33
import cats.data.OptionT
4-
import cats.effect.Sync
54
import cats.effect.Ref
5+
import cats.effect.Sync
66
import cats.implicits._
7-
import org.polystat.odin.analysis.mutualrec.naive.exceptions.DuplicatedMethodAttributes
8-
import MethodAttribute.createMethodAttribute
97
import higherkindness.droste.data.Fix
8+
import org.polystat.odin.analysis.mutualrec.naive.exceptions.DuplicatedMethodAttributes
9+
import org.polystat.odin.core.ast.EOBndExpr
10+
import org.polystat.odin.core.ast.EOObj
1011
import org.polystat.odin.core.ast.astparams.EOExprOnly
11-
import org.polystat.odin.core.ast.{EOBndExpr, EOObj}
12+
13+
import MethodAttribute.createMethodAttribute
1214

1315
trait TopLevelObject[F[_]] {
1416
def objName: String

‎analysis/src/main/scala/org/polystat/odin/analysis/mutualrec/naive/services/TopLevelObjects.scala‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,21 @@ package org.polystat.odin.analysis.mutualrec.naive.services
33
import cats.data.OptionT
44
import cats.effect.Sync
55
import cats.implicits._
6-
import org.polystat.odin.analysis.mutualrec.naive.exceptions.{
7-
DecorateeNotFound,
8-
UnsupportedDecoration
9-
}
10-
import TopLevelObject.createTopLevelObject
116
import higherkindness.droste.data.Fix
7+
import org.polystat.odin.analysis.mutualrec.naive.exceptions.DecorateeNotFound
8+
import org.polystat.odin.analysis.mutualrec.naive.exceptions.UnsupportedDecoration
9+
import org.polystat.odin.core.ast.EOApp
10+
import org.polystat.odin.core.ast.EOBndExpr
11+
import org.polystat.odin.core.ast.EOCopy
12+
import org.polystat.odin.core.ast.EODecoration
13+
import org.polystat.odin.core.ast.EOObj
14+
import org.polystat.odin.core.ast.EOSimpleApp
1215
import org.polystat.odin.core.ast.astparams.EOExprOnly
13-
import org.polystat.odin.core.ast.{
14-
EOApp,
15-
EOBndExpr,
16-
EOCopy,
17-
EODecoration,
18-
EOObj,
19-
EOSimpleApp
20-
}
2116

2217
import scala.annotation.tailrec
2318

19+
import TopLevelObject.createTopLevelObject
20+
2421
trait TopLevelObjects[F[_]] {
2522
def objects: F[Vector[TopLevelObject[F]]]
2623
def add(objName: String, obj: EOObj[EOExprOnly]): F[Unit]

‎analysis/src/main/scala/org/polystat/odin/analysis/unjustifiedassumptions/Analyzer.scala‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,20 @@
11
package org.polystat.odin.analysis.unjustifiedassumptions
22

3-
import org.polystat.odin.analysis.utils.logicalextraction.SMTUtils.Info
4-
import cats.data.{EitherNel, NonEmptyList => Nel}
3+
import cats.data.EitherNel
4+
import cats.data.{NonEmptyList => Nel}
55
import cats.syntax.align._
66
import cats.syntax.traverse._
77
import org.polystat.odin.analysis.utils.inlining.Inliner.AnalysisInfo
8-
import org.polystat.odin.analysis.utils.inlining.{
9-
MethodInfoForAnalysis,
10-
ObjectTree
11-
}
12-
import org.polystat.odin.analysis.utils.logicalextraction.ExtractLogic.{
13-
checkImplication,
14-
extractInfo,
15-
mkEqualsBndAttr
16-
}
8+
import org.polystat.odin.analysis.utils.inlining.MethodInfoForAnalysis
9+
import org.polystat.odin.analysis.utils.inlining.ObjectTree
10+
import org.polystat.odin.analysis.utils.logicalextraction.ExtractLogic.checkImplication
11+
import org.polystat.odin.analysis.utils.logicalextraction.ExtractLogic.extractInfo
12+
import org.polystat.odin.analysis.utils.logicalextraction.ExtractLogic.mkEqualsBndAttr
1713
import org.polystat.odin.analysis.utils.logicalextraction.SMTUtils
14+
import org.polystat.odin.analysis.utils.logicalextraction.SMTUtils.Info
1815
import org.polystat.odin.core.ast._
19-
import smtlib.theories.Core.{And, True}
16+
import smtlib.theories.Core.And
17+
import smtlib.theories.Core.True
2018
import smtlib.theories.Ints.IntSort
2119
import smtlib.trees.Terms._
2220

‎analysis/src/main/scala/org/polystat/odin/analysis/utils/Abstract.scala‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,19 @@
11
package org.polystat.odin.analysis.utils
22

3-
import cats.{Applicative, Eval, Foldable, Id, Monoid}
3+
import cats.Applicative
4+
import cats.Eval
5+
import cats.Foldable
6+
import cats.Id
7+
import cats.Monoid
8+
import cats.implicits.catsSyntaxSemigroup
9+
import cats.implicits.toFoldableOps
10+
import cats.implicits.toFunctorOps
411
import com.github.tarao.nonempty.collection.NonEmpty
512
import higherkindness.droste.data.Fix
6-
import Optics.{lenses, traversals}
7-
import cats.implicits.{catsSyntaxSemigroup, toFoldableOps, toFunctorOps}
8-
import org.polystat.odin.core.ast.astparams.EOExprOnly
913
import org.polystat.odin.core.ast._
14+
import org.polystat.odin.core.ast.astparams.EOExprOnly
15+
16+
import Optics.{lenses, traversals}
1017

1118
object Abstract {
1219

‎analysis/src/main/scala/org/polystat/odin/analysis/utils/Optics.scala‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,19 @@
11
package org.polystat.odin.analysis.utils
22

33
import cats.Applicative
4-
import cats.implicits.{catsSyntaxTuple2Semigroupal, toFunctorOps, toTraverseOps}
4+
import cats.implicits.catsSyntaxTuple2Semigroupal
5+
import cats.implicits.toFunctorOps
6+
import cats.implicits.toTraverseOps
57
import com.github.tarao.nonempty.collection.NonEmpty
68
import higherkindness.droste.data.Fix
9+
import monocle.Lens
10+
import monocle.Optional
11+
import monocle.Prism
12+
import monocle.Traversal
713
import monocle.macros.GenLens
8-
import monocle.{Lens, Optional, Prism, Traversal}
914
import org.polystat.odin.analysis.utils.inlining.types.CopyArgs
10-
import org.polystat.odin.core.ast.astparams.EOExprOnly
1115
import org.polystat.odin.core.ast._
16+
import org.polystat.odin.core.ast.astparams.EOExprOnly
1217

1318
object Optics {
1419

0 commit comments

Comments
 (0)