From d8c89bd08a5a1372644cf57c4bac7a70afea4488 Mon Sep 17 00:00:00 2001 From: halotukozak Date: Sun, 29 Sep 2024 22:53:26 +0200 Subject: [PATCH 1/5] draft: migrate analyzer to Scala 3.5.0 --- .idea/codeStyles/Project.xml | 19 +- .../commons/analyzer/AnalyzerPlugin.scala | 135 +++--- .../commons/analyzer/AnalyzerRule.scala | 106 +++-- .../commons/analyzer/Any2StringAdd.scala | 44 +- .../analyzer/BadSingletonComponent.scala | 96 ++--- .../commons/analyzer/BasePackage.scala | 58 +-- .../commons/analyzer/CheckBincompat.scala | 38 +- .../commons/analyzer/CheckMacroPrivate.scala | 66 +-- .../analyzer/ConstantDeclarations.scala | 74 ++-- .../commons/analyzer/DiscardedMonixTask.scala | 136 +++--- .../commons/analyzer/ExplicitGenerics.scala | 70 +-- .../commons/analyzer/FindUsages.scala | 40 +- .../commons/analyzer/ImplicitTypes.scala | 30 +- .../commons/analyzer/ImportJavaUtil.scala | 34 +- .../avsystem/commons/analyzer/ShowAst.scala | 60 +-- .../commons/analyzer/ThrowableObjects.scala | 48 +-- .../analyzer/ValueEnumExhaustiveMatch.scala | 100 ++--- .../commons/analyzer/VarargsAtLeast.scala | 75 ++-- .../commons/analyzer/AnalyzerTest.scala | 69 +-- .../commons/analyzer/Any2StringAddTest.scala | 6 +- .../analyzer/BadSingletonComponentTest.scala | 9 +- .../commons/analyzer/BasePackageTest.scala | 53 +-- .../commons/analyzer/CheckBincompatTest.scala | 9 +- .../analyzer/CheckMacroPrivateTest.scala | 6 +- .../analyzer/ConstantDeclarationsTest.scala | 27 +- .../analyzer/DiscardedMonixTaskTest.scala | 9 +- .../analyzer/ExplicitGenericsTest.scala | 7 +- .../commons/analyzer/FindUsagesTest.scala | 10 +- .../commons/analyzer/ImplicitTypesTest.scala | 12 +- .../commons/analyzer/ImportJavaUtilTest.scala | 6 +- .../avsystem/commons/analyzer/TestUtils.scala | 52 ++- .../analyzer/ThrowableObjectsTest.scala | 12 +- .../ValueEnumExhaustiveMatchTest.scala | 62 ++- .../commons/analyzer/VarargsAtLeastTest.scala | 6 +- project/Commons.scala | 401 +++++++++--------- 35 files changed, 1032 insertions(+), 953 deletions(-) diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index cb14e62c6..ec573d7d8 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -1,23 +1,5 @@ - - - - diff --git a/analyzer/src/main/scala/com/avsystem/commons/analyzer/AnalyzerPlugin.scala b/analyzer/src/main/scala/com/avsystem/commons/analyzer/AnalyzerPlugin.scala index e91ef8d0c..50627837e 100644 --- a/analyzer/src/main/scala/com/avsystem/commons/analyzer/AnalyzerPlugin.scala +++ b/analyzer/src/main/scala/com/avsystem/commons/analyzer/AnalyzerPlugin.scala @@ -1,84 +1,85 @@ package com.avsystem.commons package analyzer -import scala.reflect.internal.util.NoPosition -import scala.tools.nsc.plugins.{Plugin, PluginComponent} -import scala.tools.nsc.{Global, Phase} +import dotty.tools.dotc.ast.tpd +import dotty.tools.dotc.core.Contexts.Context +import dotty.tools.dotc.plugins.{PluginPhase, StandardPlugin} +import dotty.tools.dotc.reporting.Diagnostic +import dotty.tools.dotc.transform.{Pickler, Staging} +import dotty.tools.dotc.util.NoSourcePosition -final class AnalyzerPlugin(val global: Global) extends Plugin { plugin => +final class AnalyzerPlugin extends StandardPlugin: + plugin => - override def init(options: List[String], error: String => Unit): Boolean = { + private lazy val rules = List( +// new ImportJavaUtil(global), +// new VarargsAtLeast +// new CheckMacroPrivate(global), +// new ExplicitGenerics(global), +// new ValueEnumExhaustiveMatch(global), +// new ShowAst(global), +// new FindUsages(global), +// new CheckBincompat(global), + new ImportJavaUtil +// new ThrowableObjects(global), +// new DiscardedMonixTask(global), +// new BadSingletonComponent(global), +// new ConstantDeclarations(global), +// new BasePackage(global) + ) + + override val description = "AVSystem custom Scala static analyzer" + val name = "AVSystemAnalyzer" + + override def initialize(options: List[String])(using ctx: Context): List[PluginPhase] = + parseOptions(options) + rules + + end initialize + + private def parseOptions(options: List[String])(using ctx: Context): Unit = + lazy val rulesByName = rules.map(r => (r.name, r)).toMap options.foreach { option => - if (option.startsWith("requireJDK=")) { - val jdkVersionRegex = option.substring(option.indexOf('=') + 1) - val javaVersion = System.getProperty("java.version", "") - if (!javaVersion.matches(jdkVersionRegex)) { - global.reporter.error(NoPosition, - s"This project must be compiled on JDK version that matches $jdkVersionRegex but got $javaVersion") - } - } else { - val level = option.charAt(0) match { - case '-' => Level.Off - case '*' => Level.Info - case '+' => Level.Error - case _ => Level.Warn - } - val nameArg = if (level != Level.Warn) option.drop(1) else option - if (nameArg == "_") { - rules.foreach(_.level = level) - } else { - val (name, arg) = nameArg.split(":", 2) match { + if option.startsWith("requireJDK=") then validateJdk(option) + else + val level = Level.fromChar(option.charAt(0)) + val nameArg = if level != Level.Warn then option.drop(1) else option + if nameArg == "_" then rules.foreach(_.level = level) + else + val (name, arg) = nameArg.split(":", 2) match case Array(n, a) => (n, a) - case Array(n) => (n, null) - } - rulesByName.get(name) match { + case Array(n) => (n, null) + rulesByName.get(name) match case Some(rule) => rule.level = level rule.argument = arg case None => - error(s"Unrecognized AVS analyzer rule: $name") - } - } - } - } - true - } - - private lazy val rules = List( - new ImportJavaUtil(global), - new VarargsAtLeast(global), - new CheckMacroPrivate(global), - new ExplicitGenerics(global), - new ValueEnumExhaustiveMatch(global), - new ShowAst(global), - new FindUsages(global), - new CheckBincompat(global), - new Any2StringAdd(global), - new ThrowableObjects(global), - new DiscardedMonixTask(global), - new BadSingletonComponent(global), - new ConstantDeclarations(global), - new BasePackage(global), - ) + ctx.reporter.report( + Diagnostic.Error( + s"Unrecognized AVS analyzer rule: $name", + NoSourcePosition + ) + ) + end match - private lazy val rulesByName = rules.map(r => (r.name, r)).toMap + end if + } - val name = "AVSystemAnalyzer" - val description = "AVSystem custom Scala static analyzer" - val components: List[PluginComponent] = List(component) + end parseOptions - private object component extends PluginComponent { - val global: plugin.global.type = plugin.global - val runsAfter = List("typer") - override val runsBefore = List("patmat", "silencer") - val phaseName = "avsAnalyze" + private def validateJdk(option: String)(using ctx: Context): Unit = + val jdkVersionRegex = option.substring(option.indexOf('=') + 1) + val javaVersion = System.getProperty("java.version", "") + if !javaVersion.matches(jdkVersionRegex) then + ctx.reporter.report( + Diagnostic.Error( + s"This project must be compiled on JDK version that matches $jdkVersionRegex but got $javaVersion", + NoSourcePosition + ) + ) - import global._ + end if - def newPhase(prev: Phase): StdPhase = new StdPhase(prev) { - def apply(unit: CompilationUnit): Unit = - rules.foreach(rule => if (rule.level != Level.Off) rule.analyze(unit.asInstanceOf[rule.global.CompilationUnit])) - } - } + end validateJdk -} +end AnalyzerPlugin diff --git a/analyzer/src/main/scala/com/avsystem/commons/analyzer/AnalyzerRule.scala b/analyzer/src/main/scala/com/avsystem/commons/analyzer/AnalyzerRule.scala index d5b42f0f0..a3d95eca1 100644 --- a/analyzer/src/main/scala/com/avsystem/commons/analyzer/AnalyzerRule.scala +++ b/analyzer/src/main/scala/com/avsystem/commons/analyzer/AnalyzerRule.scala @@ -1,56 +1,72 @@ package com.avsystem.commons package analyzer -import java.io.{PrintWriter, StringWriter} -import scala.tools.nsc.Global -import scala.tools.nsc.Reporting.WarningCategory -import scala.util.control.NonFatal +import dotty.tools.dotc.ast.tpd +import dotty.tools.dotc.core.Contexts.Context +import dotty.tools.dotc.core.Decorators.* +import dotty.tools.dotc.core.Symbols.* +import dotty.tools.dotc.plugins.PluginPhase +import dotty.tools.dotc.reporting.{Diagnostic, Message} +import dotty.tools.dotc.transform.{Pickler, Staging} +import dotty.tools.dotc.util.SourcePosition -abstract class AnalyzerRule(val global: Global, val name: String, defaultLevel: Level = Level.Warn) { +import scala.compiletime.uninitialized - import global._ +abstract class AnalyzerRule(val name: String, defaultLevel: Level = Level.Warn) extends PluginPhase: + import tpd.* +// final def analyze(tree: Tree)(using Context): Tree = +// try analyzeTree.applyOrElse(tree, (_: Tree) => ()) +// catch +// case NonFatal(t) => +// val sw = new StringWriter +// t.printStackTrace(new PrintWriter(sw)) +// report(s"Analyzer rule $this failed: " + sw.toString)(using tree.sourcePos) +// +// end try +// tree +// +// end analyze + override val runsAfter: Set[String] = Set(Pickler.name) + override val runsBefore: Set[String] = Set(Staging.name) + override val phaseName = s"avsAnalyze$name" var level: Level = defaultLevel - var argument: String = _ + var argument: String = uninitialized + override def toString: String = getClass.getSimpleName - protected def classType(fullName: String): Type = - try rootMirror.staticClass(fullName).asType.toType.erasure catch { - case _: ScalaReflectionException => NoType - } + protected final def report( + message: String, + site: Symbol = NoSymbol + )(using + position: SourcePosition, + context: Context + ): Unit = context.reporter.report { + level match + case Level.Off => + return // awful + case Level.Info => + Diagnostic.Info(adjustMsg(message), position) + case Level.Warn => + Diagnostic.UncheckedWarning(adjustMsg(message), position) // todo not sure if correct type of warning + case Level.Error => + Diagnostic.Error(adjustMsg(message), position) + } - protected def analyzeTree(fun: PartialFunction[Tree, Unit])(tree: Tree): Unit = - try fun.applyOrElse(tree, (_: Tree) => ()) catch { - case NonFatal(t) => - val sw = new StringWriter - t.printStackTrace(new PrintWriter(sw)) - reporter.error(tree.pos, s"Analyzer rule $this failed: " + sw.toString) - } + private def adjustMsg(msg: String): Message = s"[AVS] $msg".toMessage - private def adjustMsg(msg: String): String = s"[AVS] $msg" +end AnalyzerRule - protected final def report( - pos: Position, - message: String, - category: WarningCategory = WarningCategory.Lint, - site: Symbol = NoSymbol - ): Unit = - level match { - case Level.Off => - case Level.Info => reporter.echo(pos, adjustMsg(message)) - case Level.Warn => currentRun.reporting.warning(pos, adjustMsg(message), category, site) - case Level.Error => reporter.error(pos, adjustMsg(message)) - } - - def analyze(unit: CompilationUnit): Unit - - override def toString: String = - getClass.getSimpleName -} - -sealed trait Level -object Level { - case object Off extends Level - case object Info extends Level - case object Warn extends Level - case object Error extends Level -} +enum Level: + case Off, Info, Warn, Error + +end Level + +object Level: + + def fromChar(c: Char): Level = c match + case '-' => Level.Off + case '*' => Level.Info + case '+' => Level.Error + case _ => Level.Warn + +end Level diff --git a/analyzer/src/main/scala/com/avsystem/commons/analyzer/Any2StringAdd.scala b/analyzer/src/main/scala/com/avsystem/commons/analyzer/Any2StringAdd.scala index 8d1e8d36f..03aff4094 100644 --- a/analyzer/src/main/scala/com/avsystem/commons/analyzer/Any2StringAdd.scala +++ b/analyzer/src/main/scala/com/avsystem/commons/analyzer/Any2StringAdd.scala @@ -1,20 +1,24 @@ -package com.avsystem.commons -package analyzer - -import scala.tools.nsc.Global - -class Any2StringAdd(g: Global) extends AnalyzerRule(g, "any2stringadd", Level.Off) { - - import global._ - - private lazy val any2stringaddSym = - typeOf[Predef.type].member(TermName("any2stringadd")).alternatives.find(_.isMethod).get - - def analyze(unit: CompilationUnit): Unit = { - unit.body.foreach(analyzeTree { - case t if t.symbol == any2stringaddSym => - report(t.pos, "concatenating arbitrary values with strings is disabled, " + - "use explicit toString or string interpolation") - }) - } -} +//package com.avsystem.commons +//package analyzer +// +//import dotty.tools.dotc.ast.tpd +//import dotty.tools.dotc.core.Contexts.Context +//import dotty.tools.dotc.core.Symbols +//import dotty.tools.dotc.core.Symbols.* +// +//final class Any2StringAdd extends AnalyzerRule("any2stringadd", Level.Off): +// import tpd.* +// +// private lazy val any2stringaddSym: Context ?=> Symbol = +// Symbols.requiredClass("scala.Predef").classDenot.requiredMethod("any2stringadd") +// +// override protected def analyzeTree(using Context): PartialFunction[Tree, Unit] = { +// case tree if tree.symbol == any2stringaddSym => +// report( +// "concatenating arbitrary values with strings is disabled, " + +// "use explicit toString or string interpolation", +// tree.symbol +// )(using tree.sourcePos) +// } +// +//end Any2StringAdd diff --git a/analyzer/src/main/scala/com/avsystem/commons/analyzer/BadSingletonComponent.scala b/analyzer/src/main/scala/com/avsystem/commons/analyzer/BadSingletonComponent.scala index b7e4107d9..d763d0a1f 100644 --- a/analyzer/src/main/scala/com/avsystem/commons/analyzer/BadSingletonComponent.scala +++ b/analyzer/src/main/scala/com/avsystem/commons/analyzer/BadSingletonComponent.scala @@ -1,48 +1,48 @@ -package com.avsystem.commons -package analyzer - -import scala.annotation.tailrec -import scala.tools.nsc.Global - -class BadSingletonComponent(g: Global) extends AnalyzerRule(g, "badSingletonComponent") { - - import global._ - - lazy val componentsTpe: Type = classType("com.avsystem.commons.di.Components") - lazy val cachedSym: Symbol = componentsTpe.member(TermName("cached")) - - object UnwrapApply { - @tailrec def unapply(tree: Tree): Some[Tree] = tree match { - case Apply(fun, _) => unapply(fun) - case TypeApply(fun, _) => unapply(fun) - case t => Some(t) - } - } - - object Unwrap { - @tailrec def unapply(t: Tree): Some[Tree] = t match { - case Block(Nil, expr) => unapply(expr) - case Typed(expr, _) => unapply(expr) - case Annotated(_, expr) => unapply(expr) - case UnwrapApply(Select(prefix, _)) if prefix.tpe =:= t.tpe => unapply(prefix) - case _ => Some(t) - } - } - - def analyze(unit: CompilationUnit): Unit = - if (componentsTpe != NoType) { - object traverser extends Traverser { - override def traverse(tree: Tree): Unit = tree match { - case mdef@DefDef(_, _, Nil, Nil, _, Unwrap(app@Apply(_, List(arg, _)))) - if app.symbol == cachedSym && mdef.symbol.owner.isClass && ThisType(mdef.symbol.owner) <:< componentsTpe => - traverse(arg) - case t if t.symbol == cachedSym => - report(t.pos, "singleton(...) macro can only be used as a body of a parameterless method in a Components trait implementation") - case _ => - super.traverse(tree) - } - } - - traverser.traverse(unit.body) - } -} +//package com.avsystem.commons +//package analyzer +// +//import scala.annotation.tailrec +//import scala.tools.nsc.Global +// +//class BadSingletonComponent(g: Global) extends AnalyzerRule(g, "badSingletonComponent") { +// +// import global._ +// +// lazy val componentsTpe: Type = classType("com.avsystem.commons.di.Components") +// lazy val cachedSym: Symbol = componentsTpe.member(TermName("cached")) +// +// object UnwrapApply { +// @tailrec def unapply(tree: Tree): Some[Tree] = tree match { +// case Apply(fun, _) => unapply(fun) +// case TypeApply(fun, _) => unapply(fun) +// case t => Some(t) +// } +// } +// +// object Unwrap { +// @tailrec def unapply(t: Tree): Some[Tree] = t match { +// case Block(Nil, expr) => unapply(expr) +// case Typed(expr, _) => unapply(expr) +// case Annotated(_, expr) => unapply(expr) +// case UnwrapApply(Select(prefix, _)) if prefix.tpe =:= t.tpe => unapply(prefix) +// case _ => Some(t) +// } +// } +// +// def analyze(unit: CompilationUnit): Unit = +// if (componentsTpe != NoType) { +// object traverser extends Traverser { +// override def traverse(tree: Tree): Unit = tree match { +// case mdef@DefDef(_, _, Nil, Nil, _, Unwrap(app@Apply(_, List(arg, _)))) +// if app.symbol == cachedSym && mdef.symbol.owner.isClass && ThisType(mdef.symbol.owner) <:< componentsTpe => +// traverse(arg) +// case t if t.symbol == cachedSym => +// report(t.pos, "singleton(...) macro can only be used as a body of a parameterless method in a Components trait implementation") +// case _ => +// super.traverse(tree) +// } +// } +// +// traverser.traverse(unit.body) +// } +//} diff --git a/analyzer/src/main/scala/com/avsystem/commons/analyzer/BasePackage.scala b/analyzer/src/main/scala/com/avsystem/commons/analyzer/BasePackage.scala index a8d2805a8..c25a58eeb 100644 --- a/analyzer/src/main/scala/com/avsystem/commons/analyzer/BasePackage.scala +++ b/analyzer/src/main/scala/com/avsystem/commons/analyzer/BasePackage.scala @@ -1,29 +1,29 @@ -package com.avsystem.commons -package analyzer - -import scala.annotation.tailrec -import scala.tools.nsc.Global - -class BasePackage(g: Global) extends AnalyzerRule(g, "basePackage") { - - import global._ - - object SkipImports { - @tailrec def unapply(stats: List[Tree]): Some[List[Tree]] = stats match { - case Import(_, _) :: tail => unapply(tail) - case stats => Some(stats) - } - } - - def analyze(unit: CompilationUnit): Unit = if (argument != null) { - val requiredBasePackage = argument - - @tailrec def validate(tree: Tree): Unit = tree match { - case PackageDef(pid, _) if pid.symbol.hasPackageFlag && pid.symbol.fullName == requiredBasePackage => - case PackageDef(_, SkipImports(List(stat))) => validate(stat) - case t => report(t.pos, s"`$requiredBasePackage` must be one of the base packages in this file") - } - - validate(unit.body) - } -} +//package com.avsystem.commons +//package analyzer +// +//import scala.annotation.tailrec +//import scala.tools.nsc.Global +// +//class BasePackage(g: Global) extends AnalyzerRule(g, "basePackage") { +// +// import global._ +// +// object SkipImports { +// @tailrec def unapply(stats: List[Tree]): Some[List[Tree]] = stats match { +// case Import(_, _) :: tail => unapply(tail) +// case stats => Some(stats) +// } +// } +// +// def analyze(unit: CompilationUnit): Unit = if (argument != null) { +// val requiredBasePackage = argument +// +// @tailrec def validate(tree: Tree): Unit = tree match { +// case PackageDef(pid, _) if pid.symbol.hasPackageFlag && pid.symbol.fullName == requiredBasePackage => +// case PackageDef(_, SkipImports(List(stat))) => validate(stat) +// case t => report(t.pos, s"`$requiredBasePackage` must be one of the base packages in this file") +// } +// +// validate(unit.body) +// } +//} diff --git a/analyzer/src/main/scala/com/avsystem/commons/analyzer/CheckBincompat.scala b/analyzer/src/main/scala/com/avsystem/commons/analyzer/CheckBincompat.scala index 2d0874a97..2245b8bc6 100644 --- a/analyzer/src/main/scala/com/avsystem/commons/analyzer/CheckBincompat.scala +++ b/analyzer/src/main/scala/com/avsystem/commons/analyzer/CheckBincompat.scala @@ -1,19 +1,19 @@ -package com.avsystem.commons -package analyzer - -import scala.tools.nsc.Global - -class CheckBincompat(g: Global) extends AnalyzerRule(g, "bincompat") { - - import global._ - - private lazy val bincompatAnnotType = classType("com.avsystem.commons.annotation.bincompat") - - def analyze(unit: CompilationUnit): Unit = - unit.body.foreach(analyzeTree { - case tree@(_: Ident | _: Select | _: New) if tree.symbol != null && - tree.symbol.annotations.exists(_.tree.tpe <:< bincompatAnnotType) => - report(tree.pos, "Symbols annotated as @bincompat exist only for binary compatibility " + - "and should not be used directly") - }) -} +//package com.avsystem.commons +//package analyzer +// +//import scala.tools.nsc.Global +// +//class CheckBincompat(g: Global) extends AnalyzerRule(g, "bincompat") { +// +// import global._ +// +// private lazy val bincompatAnnotType = classType("com.avsystem.commons.annotation.bincompat") +// +// def analyze(unit: CompilationUnit): Unit = +// unit.body.foreach(analyzeTree { +// case tree@(_: Ident | _: Select | _: New) if tree.symbol != null && +// tree.symbol.annotations.exists(_.tree.tpe <:< bincompatAnnotType) => +// report(tree.pos, "Symbols annotated as @bincompat exist only for binary compatibility " + +// "and should not be used directly") +// }) +//} diff --git a/analyzer/src/main/scala/com/avsystem/commons/analyzer/CheckMacroPrivate.scala b/analyzer/src/main/scala/com/avsystem/commons/analyzer/CheckMacroPrivate.scala index 7be50395c..53954710c 100644 --- a/analyzer/src/main/scala/com/avsystem/commons/analyzer/CheckMacroPrivate.scala +++ b/analyzer/src/main/scala/com/avsystem/commons/analyzer/CheckMacroPrivate.scala @@ -1,33 +1,33 @@ -package com.avsystem.commons -package analyzer - -import scala.tools.nsc.Global - -class CheckMacroPrivate(g: Global) extends AnalyzerRule(g, "macroPrivate") { - - import global._ - - lazy val macroPrivateAnnotTpe = classType("com.avsystem.commons.annotation.macroPrivate") - - def analyze(unit: CompilationUnit) = if (macroPrivateAnnotTpe != NoType) { - def analyzeTree(tree: Tree): Unit = analyzer.macroExpandee(tree) match { - case `tree` | EmptyTree => - tree match { - case _: Ident | _: Select | _: SelectFromTypeTree | _: New - if tree.symbol != null && tree.pos != NoPosition => - - val sym = tree.symbol - val macroPrivate = (sym :: sym.overrides).iterator - .flatMap(_.annotations).exists(_.tree.tpe <:< macroPrivateAnnotTpe) - if (macroPrivate) { - report(tree.pos, s"$sym can only be used in macro-generated code") - } - case _ => - } - tree.children.foreach(analyzeTree) - case prevTree => - analyzeTree(prevTree) - } - analyzeTree(unit.body) - } -} +//package com.avsystem.commons +//package analyzer +// +//import scala.tools.nsc.Global +// +//class CheckMacroPrivate(g: Global) extends AnalyzerRule(g, "macroPrivate") { +// +// import global._ +// +// lazy val macroPrivateAnnotTpe = classType("com.avsystem.commons.annotation.macroPrivate") +// +// def analyze(unit: CompilationUnit) = if (macroPrivateAnnotTpe != NoType) { +// def analyzeTree(tree: Tree): Unit = analyzer.macroExpandee(tree) match { +// case `tree` | EmptyTree => +// tree match { +// case _: Ident | _: Select | _: SelectFromTypeTree | _: New +// if tree.symbol != null && tree.pos != NoPosition => +// +// val sym = tree.symbol +// val macroPrivate = (sym :: sym.overrides).iterator +// .flatMap(_.annotations).exists(_.tree.tpe <:< macroPrivateAnnotTpe) +// if (macroPrivate) { +// report(tree.pos, s"$sym can only be used in macro-generated code") +// } +// case _ => +// } +// tree.children.foreach(analyzeTree) +// case prevTree => +// analyzeTree(prevTree) +// } +// analyzeTree(unit.body) +// } +//} diff --git a/analyzer/src/main/scala/com/avsystem/commons/analyzer/ConstantDeclarations.scala b/analyzer/src/main/scala/com/avsystem/commons/analyzer/ConstantDeclarations.scala index 7911fb9dd..f6180b4ab 100644 --- a/analyzer/src/main/scala/com/avsystem/commons/analyzer/ConstantDeclarations.scala +++ b/analyzer/src/main/scala/com/avsystem/commons/analyzer/ConstantDeclarations.scala @@ -1,37 +1,37 @@ -package com.avsystem.commons -package analyzer - -import scala.tools.nsc.Global - -class ConstantDeclarations(g: Global) extends AnalyzerRule(g, "constantDeclarations", Level.Off) { - - import global._ - - def analyze(unit: CompilationUnit): Unit = unit.body.foreach { - case t@ValDef(_, name, tpt, rhs) - if t.symbol.hasGetter && t.symbol.owner.isEffectivelyFinal => - - val getter = t.symbol.getterIn(t.symbol.owner) - if (getter.isPublic && getter.isStable && getter.overrides.isEmpty) { - val constantValue = rhs.tpe match { - case ConstantType(_) => true - case _ => false - } - - def doReport(msg: String): Unit = - report(t.pos, msg, site = t.symbol) - - val firstChar = name.toString.charAt(0) - if (constantValue && (firstChar.isLower || !getter.isFinal)) { - doReport("a literal-valued constant should be declared as a `final val` with an UpperCamelCase name") - } - if (!constantValue && firstChar.isUpper && !getter.isFinal) { - doReport("a constant with UpperCamelCase name should be declared as a `final val`") - } - if (getter.isFinal && constantValue && !(tpt.tpe =:= rhs.tpe)) { - doReport("a constant with a literal value should not have an explicit type annotation") - } - } - case _ => - } -} +//package com.avsystem.commons +//package analyzer +// +//import scala.tools.nsc.Global +// +//class ConstantDeclarations(g: Global) extends AnalyzerRule(g, "constantDeclarations", Level.Off) { +// +// import global._ +// +// def analyze(unit: CompilationUnit): Unit = unit.body.foreach { +// case t@ValDef(_, name, tpt, rhs) +// if t.symbol.hasGetter && t.symbol.owner.isEffectivelyFinal => +// +// val getter = t.symbol.getterIn(t.symbol.owner) +// if (getter.isPublic && getter.isStable && getter.overrides.isEmpty) { +// val constantValue = rhs.tpe match { +// case ConstantType(_) => true +// case _ => false +// } +// +// def doReport(msg: String): Unit = +// report(t.pos, msg, site = t.symbol) +// +// val firstChar = name.toString.charAt(0) +// if (constantValue && (firstChar.isLower || !getter.isFinal)) { +// doReport("a literal-valued constant should be declared as a `final val` with an UpperCamelCase name") +// } +// if (!constantValue && firstChar.isUpper && !getter.isFinal) { +// doReport("a constant with UpperCamelCase name should be declared as a `final val`") +// } +// if (getter.isFinal && constantValue && !(tpt.tpe =:= rhs.tpe)) { +// doReport("a constant with a literal value should not have an explicit type annotation") +// } +// } +// case _ => +// } +//} diff --git a/analyzer/src/main/scala/com/avsystem/commons/analyzer/DiscardedMonixTask.scala b/analyzer/src/main/scala/com/avsystem/commons/analyzer/DiscardedMonixTask.scala index 310738be5..59ecdfa74 100644 --- a/analyzer/src/main/scala/com/avsystem/commons/analyzer/DiscardedMonixTask.scala +++ b/analyzer/src/main/scala/com/avsystem/commons/analyzer/DiscardedMonixTask.scala @@ -1,68 +1,68 @@ -package com.avsystem.commons -package analyzer - -import scala.tools.nsc.Global - -class DiscardedMonixTask(g: Global) extends AnalyzerRule(g, "discardedMonixTask") { - - import global._ - - lazy val monixTaskTpe: Type = classType("monix.eval.Task") match { - case NoType => NoType - case tpe => TypeRef(NoPrefix, tpe.typeSymbol, List(definitions.AnyTpe)) - } - - private def checkDiscardedTask(tree: Tree, discarded: Boolean): Unit = tree match { - case tree if !discarded && tree.tpe != null && tree.tpe =:= definitions.UnitTpe => - checkDiscardedTask(tree, discarded = true) - - case Block(stats, expr) => - stats.foreach(checkDiscardedTask(_, discarded = true)) - checkDiscardedTask(expr, discarded) - - case Template(parents, self, body) => - parents.foreach(checkDiscardedTask(_, discarded = false)) - checkDiscardedTask(self, discarded = false) - body.foreach(checkDiscardedTask(_, discarded = true)) - - case If(_, thenp, elsep) => - checkDiscardedTask(thenp, discarded) - checkDiscardedTask(elsep, discarded) - - case LabelDef(_, _, rhs) => - checkDiscardedTask(rhs, discarded = true) - - case Try(body, catches, finalizer) => - checkDiscardedTask(body, discarded) - catches.foreach(checkDiscardedTask(_, discarded)) - checkDiscardedTask(finalizer, discarded = true) - - case CaseDef(_, _, body) => - checkDiscardedTask(body, discarded) - - case Match(_, cases) => - cases.foreach(checkDiscardedTask(_, discarded)) - - case Annotated(_, arg) => - checkDiscardedTask(arg, discarded) - - case Typed(expr, _) => - checkDiscardedTask(expr, discarded) - - case Apply(TypeApply(Select(prefix, TermName("foreach")), List(_)), List(Function(_, body))) => - checkDiscardedTask(prefix, discarded = false) - checkDiscardedTask(body, discarded) - - case _: Ident | _: Select | _: Apply | _: TypeApply if discarded && - tree.tpe != null && tree.tpe <:< monixTaskTpe && !(tree.tpe <:< definitions.NullTpe) => - report(tree.pos, "discarded Monix Task - this is probably a mistake because the Task must be run for its side effects") - - case tree => - tree.children.foreach(checkDiscardedTask(_, discarded = false)) - } - - def analyze(unit: CompilationUnit): Unit = - if (monixTaskTpe != NoType) { - checkDiscardedTask(unit.body, discarded = false) - } -} +//package com.avsystem.commons +//package analyzer +// +//import scala.tools.nsc.Global +// +//class DiscardedMonixTask(g: Global) extends AnalyzerRule(g, "discardedMonixTask") { +// +// import global._ +// +// lazy val monixTaskTpe: Type = classType("monix.eval.Task") match { +// case NoType => NoType +// case tpe => TypeRef(NoPrefix, tpe.typeSymbol, List(definitions.AnyTpe)) +// } +// +// private def checkDiscardedTask(tree: Tree, discarded: Boolean): Unit = tree match { +// case tree if !discarded && tree.tpe != null && tree.tpe =:= definitions.UnitTpe => +// checkDiscardedTask(tree, discarded = true) +// +// case Block(stats, expr) => +// stats.foreach(checkDiscardedTask(_, discarded = true)) +// checkDiscardedTask(expr, discarded) +// +// case Template(parents, self, body) => +// parents.foreach(checkDiscardedTask(_, discarded = false)) +// checkDiscardedTask(self, discarded = false) +// body.foreach(checkDiscardedTask(_, discarded = true)) +// +// case If(_, thenp, elsep) => +// checkDiscardedTask(thenp, discarded) +// checkDiscardedTask(elsep, discarded) +// +// case LabelDef(_, _, rhs) => +// checkDiscardedTask(rhs, discarded = true) +// +// case Try(body, catches, finalizer) => +// checkDiscardedTask(body, discarded) +// catches.foreach(checkDiscardedTask(_, discarded)) +// checkDiscardedTask(finalizer, discarded = true) +// +// case CaseDef(_, _, body) => +// checkDiscardedTask(body, discarded) +// +// case Match(_, cases) => +// cases.foreach(checkDiscardedTask(_, discarded)) +// +// case Annotated(_, arg) => +// checkDiscardedTask(arg, discarded) +// +// case Typed(expr, _) => +// checkDiscardedTask(expr, discarded) +// +// case Apply(TypeApply(Select(prefix, TermName("foreach")), List(_)), List(Function(_, body))) => +// checkDiscardedTask(prefix, discarded = false) +// checkDiscardedTask(body, discarded) +// +// case _: Ident | _: Select | _: Apply | _: TypeApply if discarded && +// tree.tpe != null && tree.tpe <:< monixTaskTpe && !(tree.tpe <:< definitions.NullTpe) => +// report(tree.pos, "discarded Monix Task - this is probably a mistake because the Task must be run for its side effects") +// +// case tree => +// tree.children.foreach(checkDiscardedTask(_, discarded = false)) +// } +// +// def analyze(unit: CompilationUnit): Unit = +// if (monixTaskTpe != NoType) { +// checkDiscardedTask(unit.body, discarded = false) +// } +//} diff --git a/analyzer/src/main/scala/com/avsystem/commons/analyzer/ExplicitGenerics.scala b/analyzer/src/main/scala/com/avsystem/commons/analyzer/ExplicitGenerics.scala index 585f58ce5..6711c25c2 100644 --- a/analyzer/src/main/scala/com/avsystem/commons/analyzer/ExplicitGenerics.scala +++ b/analyzer/src/main/scala/com/avsystem/commons/analyzer/ExplicitGenerics.scala @@ -1,35 +1,35 @@ -package com.avsystem.commons -package analyzer - -import scala.tools.nsc.Global - -class ExplicitGenerics(g: Global) extends AnalyzerRule(g, "explicitGenerics") { - - import global._ - - lazy val explicitGenericsAnnotTpe = classType("com.avsystem.commons.annotation.explicitGenerics") - - def analyze(unit: CompilationUnit) = if (explicitGenericsAnnotTpe != NoType) { - def requiresExplicitGenerics(sym: Symbol): Boolean = - sym != NoSymbol && (sym :: sym.overrides).flatMap(_.annotations).exists(_.tree.tpe <:< explicitGenericsAnnotTpe) - - def analyzeTree(tree: Tree): Unit = analyzer.macroExpandee(tree) match { - case `tree` | EmptyTree => - tree match { - case t@TypeApply(pre, args) if requiresExplicitGenerics(pre.symbol) => - val inferredTypeParams = args.forall { - case tt: TypeTree => tt.original == null || tt.original == EmptyTree - case _ => false - } - if (inferredTypeParams) { - report(t.pos, s"${pre.symbol} requires that its type arguments are explicit (not inferred)") - } - case _ => - } - tree.children.foreach(analyzeTree) - case prevTree => - analyzeTree(prevTree) - } - analyzeTree(unit.body) - } -} +//package com.avsystem.commons +//package analyzer +// +//import scala.tools.nsc.Global +// +//class ExplicitGenerics(g: Global) extends AnalyzerRule(g, "explicitGenerics") { +// +// import global._ +// +// lazy val explicitGenericsAnnotTpe = classType("com.avsystem.commons.annotation.explicitGenerics") +// +// def analyze(unit: CompilationUnit) = if (explicitGenericsAnnotTpe != NoType) { +// def requiresExplicitGenerics(sym: Symbol): Boolean = +// sym != NoSymbol && (sym :: sym.overrides).flatMap(_.annotations).exists(_.tree.tpe <:< explicitGenericsAnnotTpe) +// +// def analyzeTree(tree: Tree): Unit = analyzer.macroExpandee(tree) match { +// case `tree` | EmptyTree => +// tree match { +// case t@TypeApply(pre, args) if requiresExplicitGenerics(pre.symbol) => +// val inferredTypeParams = args.forall { +// case tt: TypeTree => tt.original == null || tt.original == EmptyTree +// case _ => false +// } +// if (inferredTypeParams) { +// report(t.pos, s"${pre.symbol} requires that its type arguments are explicit (not inferred)") +// } +// case _ => +// } +// tree.children.foreach(analyzeTree) +// case prevTree => +// analyzeTree(prevTree) +// } +// analyzeTree(unit.body) +// } +//} diff --git a/analyzer/src/main/scala/com/avsystem/commons/analyzer/FindUsages.scala b/analyzer/src/main/scala/com/avsystem/commons/analyzer/FindUsages.scala index 1febb6729..a72481519 100644 --- a/analyzer/src/main/scala/com/avsystem/commons/analyzer/FindUsages.scala +++ b/analyzer/src/main/scala/com/avsystem/commons/analyzer/FindUsages.scala @@ -1,20 +1,20 @@ -package com.avsystem.commons -package analyzer - -import scala.tools.nsc.Global - -class FindUsages(g: Global) extends AnalyzerRule(g, "findUsages") { - - import global._ - - lazy val rejectedSymbols: Set[String] = - if (argument == null) Set.empty else argument.split(";").toSet - - override def analyze(unit: CompilationUnit): Unit = if (rejectedSymbols.nonEmpty) { - unit.body.foreach { tree => - if (tree.symbol != null && rejectedSymbols.contains(tree.symbol.fullName)) { - report(tree.pos, s"found usage of ${tree.symbol.fullName}") - } - } - } -} +//package com.avsystem.commons +//package analyzer +// +//import scala.tools.nsc.Global +// +//class FindUsages(g: Global) extends AnalyzerRule(g, "findUsages") { +// +// import global._ +// +// lazy val rejectedSymbols: Set[String] = +// if (argument == null) Set.empty else argument.split(";").toSet +// +// override def analyze(unit: CompilationUnit): Unit = if (rejectedSymbols.nonEmpty) { +// unit.body.foreach { tree => +// if (tree.symbol != null && rejectedSymbols.contains(tree.symbol.fullName)) { +// report(tree.pos, s"found usage of ${tree.symbol.fullName}") +// } +// } +// } +//} diff --git a/analyzer/src/main/scala/com/avsystem/commons/analyzer/ImplicitTypes.scala b/analyzer/src/main/scala/com/avsystem/commons/analyzer/ImplicitTypes.scala index fa48a6f54..29283a74b 100644 --- a/analyzer/src/main/scala/com/avsystem/commons/analyzer/ImplicitTypes.scala +++ b/analyzer/src/main/scala/com/avsystem/commons/analyzer/ImplicitTypes.scala @@ -1,15 +1,15 @@ -package com.avsystem.commons -package analyzer - -import scala.tools.nsc.Global - -class ImplicitTypes(g: Global) extends AnalyzerRule(g, "implicitTypes") { - - import global._ - - def analyze(unit: CompilationUnit): Unit = unit.body.foreach { - case t@ValOrDefDef(mods, _, tpt@TypeTree(), _) if tpt.original == null && mods.isImplicit && !mods.isSynthetic => - report(t.pos, s"Implicit definitions must have type annotated explicitly") - case _ => - } -} +//package com.avsystem.commons +//package analyzer +// +//import scala.tools.nsc.Global +// +//class ImplicitTypes(g: Global) extends AnalyzerRule(g, "implicitTypes") { +// +// import global._ +// +// def analyze(unit: CompilationUnit): Unit = unit.body.foreach { +// case t@ValOrDefDef(mods, _, tpt@TypeTree(), _) if tpt.original == null && mods.isImplicit && !mods.isSynthetic => +// report(t.pos, s"Implicit definitions must have type annotated explicitly") +// case _ => +// } +//} diff --git a/analyzer/src/main/scala/com/avsystem/commons/analyzer/ImportJavaUtil.scala b/analyzer/src/main/scala/com/avsystem/commons/analyzer/ImportJavaUtil.scala index 4418ab394..8e15a2a65 100644 --- a/analyzer/src/main/scala/com/avsystem/commons/analyzer/ImportJavaUtil.scala +++ b/analyzer/src/main/scala/com/avsystem/commons/analyzer/ImportJavaUtil.scala @@ -1,17 +1,29 @@ package com.avsystem.commons package analyzer -import scala.tools.nsc.Global +import dotty.tools.dotc.ast.untpd.ImportSelector +import dotty.tools.dotc.ast.{Trees, tpd} +import dotty.tools.dotc.core.Contexts.Context +import dotty.tools.dotc.core.Symbols +import dotty.tools.dotc.core.Symbols.* -class ImportJavaUtil(g: Global) extends AnalyzerRule(g, "importJavaUtil") { +final class ImportJavaUtil extends AnalyzerRule("importJavaUtil"): + import tpd.* + override def transformOther(tree: tpd.Tree)(using Context): tpd.Tree = + val pkg = Symbols.requiredPackage("java.util").defTree + tree match + case tree @ Import(pkg, _)=> + report( + "Don't import java.util: either import with rename (e.g. import java.{util => ju}) " + + "or use type aliases from JavaInterop (e.g. JList, JSet, etc)", + tree.symbol + )(using tree.sourcePos) + case tree => - import global._ + end match - def analyze(unit: CompilationUnit): Unit = { - unit.body.foreach(analyzeTree { - case tree@q"import java.util" => - report(tree.pos, "Don't import java.util: either import with rename (e.g. import java.{util => ju}) " + - "or use type aliases from JavaInterop (e.g. JList, JSet, etc)") - }) - } -} + tree + + end transformOther + +end ImportJavaUtil diff --git a/analyzer/src/main/scala/com/avsystem/commons/analyzer/ShowAst.scala b/analyzer/src/main/scala/com/avsystem/commons/analyzer/ShowAst.scala index 990372707..f872e3258 100644 --- a/analyzer/src/main/scala/com/avsystem/commons/analyzer/ShowAst.scala +++ b/analyzer/src/main/scala/com/avsystem/commons/analyzer/ShowAst.scala @@ -1,30 +1,30 @@ -package com.avsystem.commons -package analyzer - -import scala.tools.nsc.Global - -class ShowAst(g: Global) extends AnalyzerRule(g, "showAst", Level.Error) { - - import global._ - - lazy val showAstAnnotType: Type = classType("com.avsystem.commons.annotation.showAst") - - def analyze(unit: CompilationUnit) = if (showAstAnnotType != NoType) { - def analyzeTree(tree: Tree): Unit = analyzer.macroExpandee(tree) match { - case `tree` | EmptyTree => - tree match { - case Annotated(annot, arg) if annot.tpe <:< showAstAnnotType => - report(arg.pos, showCode(arg)) - case Typed(expr, tpt) if tpt.tpe.annotations.exists(_.tpe <:< showAstAnnotType) => - report(expr.pos, showCode(expr)) - case _: MemberDef if tree.symbol.annotations.exists(_.tpe <:< showAstAnnotType) => - report(tree.pos, showCode(tree)) - case _ => - } - tree.children.foreach(analyzeTree) - case prevTree => - analyzeTree(prevTree) - } - analyzeTree(unit.body) - } -} +//package com.avsystem.commons +//package analyzer +// +//import scala.tools.nsc.Global +// +//class ShowAst(g: Global) extends AnalyzerRule(g, "showAst", Level.Error) { +// +// import global._ +// +// lazy val showAstAnnotType: Type = classType("com.avsystem.commons.annotation.showAst") +// +// def analyze(unit: CompilationUnit) = if (showAstAnnotType != NoType) { +// def analyzeTree(tree: Tree): Unit = analyzer.macroExpandee(tree) match { +// case `tree` | EmptyTree => +// tree match { +// case Annotated(annot, arg) if annot.tpe <:< showAstAnnotType => +// report(arg.pos, showCode(arg)) +// case Typed(expr, tpt) if tpt.tpe.annotations.exists(_.tpe <:< showAstAnnotType) => +// report(expr.pos, showCode(expr)) +// case _: MemberDef if tree.symbol.annotations.exists(_.tpe <:< showAstAnnotType) => +// report(tree.pos, showCode(tree)) +// case _ => +// } +// tree.children.foreach(analyzeTree) +// case prevTree => +// analyzeTree(prevTree) +// } +// analyzeTree(unit.body) +// } +//} diff --git a/analyzer/src/main/scala/com/avsystem/commons/analyzer/ThrowableObjects.scala b/analyzer/src/main/scala/com/avsystem/commons/analyzer/ThrowableObjects.scala index 62a2b5c65..b9dceb49a 100644 --- a/analyzer/src/main/scala/com/avsystem/commons/analyzer/ThrowableObjects.scala +++ b/analyzer/src/main/scala/com/avsystem/commons/analyzer/ThrowableObjects.scala @@ -1,24 +1,24 @@ -package com.avsystem.commons -package analyzer - -import scala.tools.nsc.Global - -class ThrowableObjects(g: Global) extends AnalyzerRule(g, "throwableObjects", Level.Warn) { - - import global._ - - private lazy val throwableTpe = typeOf[Throwable] - private lazy val throwableSym = throwableTpe.dealias.typeSymbol - - def analyze(unit: CompilationUnit): Unit = unit.body.foreach { - case md: ModuleDef => - val tpe = md.symbol.typeSignature - def fillInStackTraceSym: Symbol = - tpe.member(TermName("fillInStackTrace")).alternatives.find(_.paramLists == List(Nil)).get - - if (tpe <:< throwableTpe && fillInStackTraceSym.owner == throwableSym) { - report(md.pos, "objects should never extend Throwable unless they have no stack trace") - } - case _ => - } -} +//package com.avsystem.commons +//package analyzer +// +//import scala.tools.nsc.Global +// +//class ThrowableObjects(g: Global) extends AnalyzerRule(g, "throwableObjects", Level.Warn) { +// +// import global._ +// +// private lazy val throwableTpe = typeOf[Throwable] +// private lazy val throwableSym = throwableTpe.dealias.typeSymbol +// +// def analyze(unit: CompilationUnit): Unit = unit.body.foreach { +// case md: ModuleDef => +// val tpe = md.symbol.typeSignature +// def fillInStackTraceSym: Symbol = +// tpe.member(TermName("fillInStackTrace")).alternatives.find(_.paramLists == List(Nil)).get +// +// if (tpe <:< throwableTpe && fillInStackTraceSym.owner == throwableSym) { +// report(md.pos, "objects should never extend Throwable unless they have no stack trace") +// } +// case _ => +// } +//} diff --git a/analyzer/src/main/scala/com/avsystem/commons/analyzer/ValueEnumExhaustiveMatch.scala b/analyzer/src/main/scala/com/avsystem/commons/analyzer/ValueEnumExhaustiveMatch.scala index afbe280c7..548aab590 100644 --- a/analyzer/src/main/scala/com/avsystem/commons/analyzer/ValueEnumExhaustiveMatch.scala +++ b/analyzer/src/main/scala/com/avsystem/commons/analyzer/ValueEnumExhaustiveMatch.scala @@ -1,50 +1,50 @@ -package com.avsystem.commons -package analyzer - -import scala.collection.mutable -import scala.tools.nsc.Global - -class ValueEnumExhaustiveMatch(g: Global) extends AnalyzerRule(g, "valueEnumExhaustiveMatch") { - - import global._ - - lazy val valueEnumTpe: Type = classType("com.avsystem.commons.misc.ValueEnum") - lazy val ExistentialType(_, TypeRef(miscPackageTpe, valueEnumCompanionSym, _)) = - classType("com.avsystem.commons.misc.ValueEnumCompanion") - - def analyze(unit: CompilationUnit): Unit = if (valueEnumTpe != NoType) { - unit.body.foreach(analyzeTree { - case tree@Match(selector, cases) if selector.tpe <:< valueEnumTpe => - val expectedCompanionTpe = TypeRef(miscPackageTpe, valueEnumCompanionSym, List(selector.tpe)) - val companion = selector.tpe.typeSymbol.companion - val companionTpe = companion.toType - if (companionTpe <:< expectedCompanionTpe) { - val unmatched = new mutable.LinkedHashSet[Symbol] - companionTpe.decls.iterator - .filter(s => s.isVal && s.isFinal && !s.isLazy && s.typeSignature <:< selector.tpe) - .map(_.getterIn(companion)).filter(_.isPublic).foreach(unmatched.add) - - def findMatchedEnums(pattern: Tree): Unit = pattern match { - case Bind(_, body) => findMatchedEnums(body) - case Alternative(patterns) => patterns.foreach(findMatchedEnums) - case Ident(termNames.WILDCARD) => unmatched.clear() - case _: Ident | _: Select => unmatched.remove(pattern.symbol) - case _: Literal => - case _ => unmatched.clear() - } - - cases.iterator.foreach { - case CaseDef(pattern, EmptyTree, _) => findMatchedEnums(pattern) - case _ => unmatched.clear() - } - - if (unmatched.nonEmpty) { - val what = - if (unmatched.size > 1) "inputs: " + unmatched.map(_.nameString).mkString(", ") - else "input: " + unmatched.head.nameString - report(tree.pos, "match may not be exhaustive.\nIt would fail on the following " + what) - } - } - }) - } -} +//package com.avsystem.commons +//package analyzer +// +//import scala.collection.mutable +//import scala.tools.nsc.Global +// +//class ValueEnumExhaustiveMatch(g: Global) extends AnalyzerRule(g, "valueEnumExhaustiveMatch") { +// +// import global._ +// +// lazy val valueEnumTpe: Type = classType("com.avsystem.commons.misc.ValueEnum") +// lazy val ExistentialType(_, TypeRef(miscPackageTpe, valueEnumCompanionSym, _)) = +// classType("com.avsystem.commons.misc.ValueEnumCompanion") +// +// def analyze(unit: CompilationUnit): Unit = if (valueEnumTpe != NoType) { +// unit.body.foreach(analyzeTree { +// case tree@Match(selector, cases) if selector.tpe <:< valueEnumTpe => +// val expectedCompanionTpe = TypeRef(miscPackageTpe, valueEnumCompanionSym, List(selector.tpe)) +// val companion = selector.tpe.typeSymbol.companion +// val companionTpe = companion.toType +// if (companionTpe <:< expectedCompanionTpe) { +// val unmatched = new mutable.LinkedHashSet[Symbol] +// companionTpe.decls.iterator +// .filter(s => s.isVal && s.isFinal && !s.isLazy && s.typeSignature <:< selector.tpe) +// .map(_.getterIn(companion)).filter(_.isPublic).foreach(unmatched.add) +// +// def findMatchedEnums(pattern: Tree): Unit = pattern match { +// case Bind(_, body) => findMatchedEnums(body) +// case Alternative(patterns) => patterns.foreach(findMatchedEnums) +// case Ident(termNames.WILDCARD) => unmatched.clear() +// case _: Ident | _: Select => unmatched.remove(pattern.symbol) +// case _: Literal => +// case _ => unmatched.clear() +// } +// +// cases.iterator.foreach { +// case CaseDef(pattern, EmptyTree, _) => findMatchedEnums(pattern) +// case _ => unmatched.clear() +// } +// +// if (unmatched.nonEmpty) { +// val what = +// if (unmatched.size > 1) "inputs: " + unmatched.map(_.nameString).mkString(", ") +// else "input: " + unmatched.head.nameString +// report(tree.pos, "match may not be exhaustive.\nIt would fail on the following " + what) +// } +// } +// }) +// } +//} diff --git a/analyzer/src/main/scala/com/avsystem/commons/analyzer/VarargsAtLeast.scala b/analyzer/src/main/scala/com/avsystem/commons/analyzer/VarargsAtLeast.scala index 50e2ff5b7..223cf2edc 100644 --- a/analyzer/src/main/scala/com/avsystem/commons/analyzer/VarargsAtLeast.scala +++ b/analyzer/src/main/scala/com/avsystem/commons/analyzer/VarargsAtLeast.scala @@ -1,36 +1,39 @@ -package com.avsystem.commons -package analyzer - -import scala.tools.nsc.Global - -class VarargsAtLeast(g: Global) extends AnalyzerRule(g, "varargsAtLeast") { - - import global._ - - lazy val atLeastAnnotTpe = classType("com.avsystem.commons.annotation.atLeast") - - def analyze(unit: CompilationUnit): Unit = if (atLeastAnnotTpe != NoType) { - def isVarargParam(tree: Tree) = tree match { - case Typed(_, Ident(typeNames.WILDCARD_STAR)) => true - case _ => false - } - - unit.body.foreach(analyzeTree { - case t@Apply(fun, args) - if fun.tpe != null && fun.tpe.params.lastOption.map(_.tpe.typeSymbol).contains(definitions.RepeatedParamClass) && - !args.lastOption.exists(isVarargParam) => - - val required = - fun.tpe.params.last.annotations.find(_.tree.tpe <:< atLeastAnnotTpe).map(_.tree.children.tail).collect { - case List(Literal(Constant(n: Int))) => n - }.getOrElse(0) - - val actual = args.size - fun.tpe.params.size + 1 - - if (actual < required) { - report(t.pos, - s"This method requires at least $required arguments for its repeated parameter, $actual passed.") - } - }) - } -} +//package com.avsystem.commons +//package analyzer +// +//final class VarargsAtLeast extends AnalyzerRule("varargsAtLeast"): +// +// lazy val atLeastAnnotTpe = classType("com.avsystem.commons.annotation.atLeast") +// +// def analyze(unit: CompilationUnit): Unit = if atLeastAnnotTpe != NoType then +// def isVarargParam(tree: Tree) = tree match +// case Typed(_, Ident(typeNames.WILDCARD_STAR)) => true +// case _ => false +// +// unit.body.foreach(analyzeTree { +// case t @ Apply(fun, args) +// if fun.tpe != null && fun.tpe.params.lastOption +// .map(_.tpe.typeSymbol) +// .contains(definitions.RepeatedParamClass) && +// !args.lastOption.exists(isVarargParam) => +// val required = +// fun.tpe.params.last.annotations +// .find(_.tree.tpe <:< atLeastAnnotTpe) +// .map(_.tree.children.tail) +// .collect { case List(Literal(Constant(n: Int))) => +// n +// } +// .getOrElse(0) +// +// val actual = args.size - fun.tpe.params.size + 1 +// +// if actual < required then +// report( +// t.pos, +// s"This method requires at least $required arguments for its repeated parameter, $actual passed." +// ) +// +// end if +// }) +// +//end VarargsAtLeast diff --git a/analyzer/src/test/scala/com/avsystem/commons/analyzer/AnalyzerTest.scala b/analyzer/src/test/scala/com/avsystem/commons/analyzer/AnalyzerTest.scala index 989647382..7b8a700a3 100644 --- a/analyzer/src/test/scala/com/avsystem/commons/analyzer/AnalyzerTest.scala +++ b/analyzer/src/test/scala/com/avsystem/commons/analyzer/AnalyzerTest.scala @@ -1,42 +1,57 @@ package com.avsystem.commons package analyzer +import dotty.tools.dotc.Compiler +import dotty.tools.dotc.core.Contexts.{Context, ContextBase} +import dotty.tools.dotc.plugins.Plugin import org.scalactic.source.Position import org.scalatest.Assertions -import scala.reflect.internal.util.BatchSourceFile -import scala.tools.nsc.plugins.Plugin -import scala.tools.nsc.{Global, Settings} +import scala.util.chaining.scalaUtilChainingOps -trait AnalyzerTest { this: Assertions => - val settings = new Settings - settings.usejavacp.value = true - settings.Yrangepos.value = true - settings.pluginOptions.value ++= List("AVSystemAnalyzer:+_") +trait AnalyzerTest: + analyzer: Assertions => - val compiler: Global = new Global(settings) { global => - override protected def loadRoughPluginsList(): List[Plugin] = - new AnalyzerPlugin(global) :: super.loadRoughPluginsList() - } + lazy val compiler = new Compiler +// val compiler: Global = new Global(settings): +// global => - def compile(source: String): Unit = { - compiler.reporter.reset() - val run = new compiler.Run - run.compileSources(List(new BatchSourceFile("test.scala", source))) - } +// +// settings.Yrangepos.value = true + protected val pluginOptions: List[String] = Nil - def assertErrors(source: String)(implicit pos: Position): Unit = { + protected final def assertErrors(source: String)(using pos: Position, ctx: Context): Unit = compile(source) - assert(compiler.reporter.hasErrors) - } + assert(ctx.reporter.hasErrors) - def assertErrors(errors: Int, source: String)(implicit pos: Position): Unit = { + end assertErrors + + protected final def assertErrors(errors: Int, source: String)(using pos: Position, ctx: Context): Unit = compile(source) - assert(compiler.reporter.errorCount == errors) - } + assert(ctx.reporter.errorCount == errors) + + end assertErrors - def assertNoErrors(source: String)(implicit pos: Position): Unit = { + protected final def assertNoErrors(source: String)(using pos: Position, ctx: Context): Unit = compile(source) - assert(!compiler.reporter.hasErrors) - } -} + assert(!ctx.reporter.hasErrors) + + end assertNoErrors + + private def compile(source: String)(using pos: Position, ctx: Context): Unit = + compiler.newRun.compileFromStrings(source :: Nil) + + protected given compilerContext: Context = + val base = new ContextBase: + override protected def loadRoughPluginsList(using Context): List[Plugin] = + new AnalyzerPlugin :: super.loadRoughPluginsList + + base.initialCtx.fresh.tap { ctx => + ctx.setSetting(ctx.settings.usejavacp, true) + ctx.setSetting(ctx.settings.pluginOptions, "AVSystemAnalyzer:+_" :: analyzer.pluginOptions) + base.initialize()(using ctx) + } + + end compilerContext + +end AnalyzerTest diff --git a/analyzer/src/test/scala/com/avsystem/commons/analyzer/Any2StringAddTest.scala b/analyzer/src/test/scala/com/avsystem/commons/analyzer/Any2StringAddTest.scala index 0da8b89c1..234bb1656 100644 --- a/analyzer/src/test/scala/com/avsystem/commons/analyzer/Any2StringAddTest.scala +++ b/analyzer/src/test/scala/com/avsystem/commons/analyzer/Any2StringAddTest.scala @@ -3,7 +3,8 @@ package analyzer import org.scalatest.funsuite.AnyFunSuite -class Any2StringAddTest extends AnyFunSuite with AnalyzerTest { +final class Any2StringAddTest extends AnyFunSuite with AnalyzerTest: + test("any2stringadd should be rejected") { assertErrors( """ @@ -33,4 +34,5 @@ class Any2StringAddTest extends AnyFunSuite with AnalyzerTest { """.stripMargin ) } -} + +end Any2StringAddTest diff --git a/analyzer/src/test/scala/com/avsystem/commons/analyzer/BadSingletonComponentTest.scala b/analyzer/src/test/scala/com/avsystem/commons/analyzer/BadSingletonComponentTest.scala index d6e5c1037..6a5b9a1b3 100644 --- a/analyzer/src/test/scala/com/avsystem/commons/analyzer/BadSingletonComponentTest.scala +++ b/analyzer/src/test/scala/com/avsystem/commons/analyzer/BadSingletonComponentTest.scala @@ -3,9 +3,11 @@ package analyzer import org.scalatest.funsuite.AnyFunSuite -class BadSingletonComponentTest extends AnyFunSuite with AnalyzerTest { +final class BadSingletonComponentTest extends AnyFunSuite with AnalyzerTest: + test("general") { - assertErrors(5, + assertErrors( + 5, """ |import com.avsystem.commons.di._ | @@ -26,4 +28,5 @@ class BadSingletonComponentTest extends AnyFunSuite with AnalyzerTest { """.stripMargin ) } -} + +end BadSingletonComponentTest diff --git a/analyzer/src/test/scala/com/avsystem/commons/analyzer/BasePackageTest.scala b/analyzer/src/test/scala/com/avsystem/commons/analyzer/BasePackageTest.scala index 1d6a03009..64f2e63b2 100644 --- a/analyzer/src/test/scala/com/avsystem/commons/analyzer/BasePackageTest.scala +++ b/analyzer/src/test/scala/com/avsystem/commons/analyzer/BasePackageTest.scala @@ -3,12 +3,11 @@ package analyzer import org.scalatest.funsuite.AnyFunSuite -class BasePackageTest extends AnyFunSuite with AnalyzerTest { - settings.pluginOptions.value ++= List("AVSystemAnalyzer:+basePackage:com.avsystem.commons") +final class BasePackageTest extends AnyFunSuite with AnalyzerTest: + override protected val pluginOptions = List("AVSystemAnalyzer:+basePackage:com.avsystem.commons") test("base package only") { - assertNoErrors( - """ + assertNoErrors(""" |package com.avsystem.commons | |object bar @@ -16,8 +15,7 @@ class BasePackageTest extends AnyFunSuite with AnalyzerTest { } test("chained base package") { - assertNoErrors( - """ + assertNoErrors(""" |package com.avsystem |package commons | @@ -26,8 +24,7 @@ class BasePackageTest extends AnyFunSuite with AnalyzerTest { } test("base package with chained subpackage") { - assertNoErrors( - """ + assertNoErrors(""" |package com.avsystem.commons |package core | @@ -36,8 +33,7 @@ class BasePackageTest extends AnyFunSuite with AnalyzerTest { } test("base package object") { - assertNoErrors( - """ + assertNoErrors(""" |package com.avsystem | |package object commons @@ -45,8 +41,7 @@ class BasePackageTest extends AnyFunSuite with AnalyzerTest { } test("base package object with imports") { - assertNoErrors( - """ + assertNoErrors(""" |package com.avsystem | |import scala.collection.mutable.Seq @@ -57,43 +52,51 @@ class BasePackageTest extends AnyFunSuite with AnalyzerTest { } test("no base package") { - assertErrors(1, + assertErrors( + 1, """ |object bar - |""".stripMargin) + |""".stripMargin + ) } test("no base package with imports") { - assertErrors(1, + assertErrors( + 1, """ |import scala.collection.mutable.Seq |import scala.collection.mutable.Set | |object bar - |""".stripMargin) + |""".stripMargin + ) } - test("wrong base package") { - assertErrors(1, + assertErrors( + 1, """ |package com.avsystem.kommons | |object bar - |""".stripMargin) + |""".stripMargin + ) } test("unchained subpackage") { - assertErrors(1, + assertErrors( + 1, """ |package com.avsystem.commons.core | |object bar - |""".stripMargin) + |""".stripMargin + ) } test("unchained subpackage with imports") { - assertErrors(1, + assertErrors( + 1, """ |package com.avsystem.commons.core | @@ -101,6 +104,8 @@ class BasePackageTest extends AnyFunSuite with AnalyzerTest { |import scala.collection.mutable.Set | |object bar - |""".stripMargin) + |""".stripMargin + ) } -} + +end BasePackageTest diff --git a/analyzer/src/test/scala/com/avsystem/commons/analyzer/CheckBincompatTest.scala b/analyzer/src/test/scala/com/avsystem/commons/analyzer/CheckBincompatTest.scala index 94d9946b3..02fe600c2 100644 --- a/analyzer/src/test/scala/com/avsystem/commons/analyzer/CheckBincompatTest.scala +++ b/analyzer/src/test/scala/com/avsystem/commons/analyzer/CheckBincompatTest.scala @@ -3,7 +3,8 @@ package analyzer import org.scalatest.funsuite.AnyFunSuite -class CheckBincompatTest extends AnyFunSuite with AnalyzerTest { +final class CheckBincompatTest extends AnyFunSuite with AnalyzerTest: + test("definitions of @bincompat annotated symbols should not be rejected") { assertNoErrors( """ @@ -19,7 +20,8 @@ class CheckBincompatTest extends AnyFunSuite with AnalyzerTest { } test("usage of @bincompat annotated symbols should be rejected") { - assertErrors(3, + assertErrors( + 3, """ |import com.avsystem.commons.annotation.bincompat | @@ -39,4 +41,5 @@ class CheckBincompatTest extends AnyFunSuite with AnalyzerTest { """.stripMargin ) } -} + +end CheckBincompatTest diff --git a/analyzer/src/test/scala/com/avsystem/commons/analyzer/CheckMacroPrivateTest.scala b/analyzer/src/test/scala/com/avsystem/commons/analyzer/CheckMacroPrivateTest.scala index dd5765c62..50c3b402e 100644 --- a/analyzer/src/test/scala/com/avsystem/commons/analyzer/CheckMacroPrivateTest.scala +++ b/analyzer/src/test/scala/com/avsystem/commons/analyzer/CheckMacroPrivateTest.scala @@ -3,7 +3,8 @@ package analyzer import org.scalatest.funsuite.AnyFunSuite -class CheckMacroPrivateTest extends AnyFunSuite with AnalyzerTest { +final class CheckMacroPrivateTest extends AnyFunSuite with AnalyzerTest: + test("macro private method invoked directly should be rejected") { assertErrors( """ @@ -56,4 +57,5 @@ class CheckMacroPrivateTest extends AnyFunSuite with AnalyzerTest { """.stripMargin ) } -} + +end CheckMacroPrivateTest diff --git a/analyzer/src/test/scala/com/avsystem/commons/analyzer/ConstantDeclarationsTest.scala b/analyzer/src/test/scala/com/avsystem/commons/analyzer/ConstantDeclarationsTest.scala index a4e52edd4..a0b79ed9f 100644 --- a/analyzer/src/test/scala/com/avsystem/commons/analyzer/ConstantDeclarationsTest.scala +++ b/analyzer/src/test/scala/com/avsystem/commons/analyzer/ConstantDeclarationsTest.scala @@ -3,9 +3,11 @@ package analyzer import org.scalatest.funsuite.AnyFunSuite -class ConstantDeclarationsTest extends AnyFunSuite with AnalyzerTest { +final class ConstantDeclarationsTest extends AnyFunSuite with AnalyzerTest: + test("literal-valued constants should be non-lazy final vals with UpperCamelCase and no type annotation") { - assertErrors(4, + assertErrors( + 4, """ |object Whatever { | // bad @@ -17,11 +19,13 @@ class ConstantDeclarationsTest extends AnyFunSuite with AnalyzerTest { | // good | final val E = 10 |} - """.stripMargin) + """.stripMargin + ) } test("effectively final, non-literal UpperCamelCase vals should be final") { - assertErrors(1, + assertErrors( + 1, """ |object Whatever { | // bad @@ -31,12 +35,12 @@ class ConstantDeclarationsTest extends AnyFunSuite with AnalyzerTest { | final val B = "foo".trim | val c = "foo".trim |} - """.stripMargin) + """.stripMargin + ) } test("no constant checking in traits or non-final classes") { - assertNoErrors( - """ + assertNoErrors(""" |trait Whatever { | val a = 10 | val B = 10 @@ -56,8 +60,7 @@ class ConstantDeclarationsTest extends AnyFunSuite with AnalyzerTest { } test("no constant checking for overrides") { - assertNoErrors( - """ + assertNoErrors(""" |trait Whatever { | def a: Int |} @@ -69,8 +72,7 @@ class ConstantDeclarationsTest extends AnyFunSuite with AnalyzerTest { } test("no constant checking for privates") { - assertNoErrors( - """ + assertNoErrors(""" |object Whatever { | private val a = 10 | private val B = 10 @@ -80,4 +82,5 @@ class ConstantDeclarationsTest extends AnyFunSuite with AnalyzerTest { |} """.stripMargin) } -} + +end ConstantDeclarationsTest diff --git a/analyzer/src/test/scala/com/avsystem/commons/analyzer/DiscardedMonixTaskTest.scala b/analyzer/src/test/scala/com/avsystem/commons/analyzer/DiscardedMonixTaskTest.scala index 61fc5df95..7ea1c85fa 100644 --- a/analyzer/src/test/scala/com/avsystem/commons/analyzer/DiscardedMonixTaskTest.scala +++ b/analyzer/src/test/scala/com/avsystem/commons/analyzer/DiscardedMonixTaskTest.scala @@ -3,9 +3,11 @@ package analyzer import org.scalatest.funsuite.AnyFunSuite -class DiscardedMonixTaskTest extends AnyFunSuite with AnalyzerTest { +final class DiscardedMonixTaskTest extends AnyFunSuite with AnalyzerTest: + test("simple") { - assertErrors(10, + assertErrors( + 10, """ |import monix.eval.Task | @@ -34,4 +36,5 @@ class DiscardedMonixTaskTest extends AnyFunSuite with AnalyzerTest { """.stripMargin ) } -} + +end DiscardedMonixTaskTest diff --git a/analyzer/src/test/scala/com/avsystem/commons/analyzer/ExplicitGenericsTest.scala b/analyzer/src/test/scala/com/avsystem/commons/analyzer/ExplicitGenericsTest.scala index aa6e0417a..c8622d26e 100644 --- a/analyzer/src/test/scala/com/avsystem/commons/analyzer/ExplicitGenericsTest.scala +++ b/analyzer/src/test/scala/com/avsystem/commons/analyzer/ExplicitGenericsTest.scala @@ -3,7 +3,8 @@ package analyzer import org.scalatest.funsuite.AnyFunSuite -class ExplicitGenericsTest extends AnyFunSuite with AnalyzerTest { +final class ExplicitGenericsTest extends AnyFunSuite with AnalyzerTest: + test("inferred generic should be rejected") { assertErrors( """ @@ -28,7 +29,6 @@ class ExplicitGenericsTest extends AnyFunSuite with AnalyzerTest { ) } - test("explicit generic should not be rejected") { assertNoErrors( """ @@ -52,4 +52,5 @@ class ExplicitGenericsTest extends AnyFunSuite with AnalyzerTest { """.stripMargin ) } -} + +end ExplicitGenericsTest diff --git a/analyzer/src/test/scala/com/avsystem/commons/analyzer/FindUsagesTest.scala b/analyzer/src/test/scala/com/avsystem/commons/analyzer/FindUsagesTest.scala index f1a7fd471..7d5cecc69 100644 --- a/analyzer/src/test/scala/com/avsystem/commons/analyzer/FindUsagesTest.scala +++ b/analyzer/src/test/scala/com/avsystem/commons/analyzer/FindUsagesTest.scala @@ -3,11 +3,12 @@ package analyzer import org.scalatest.funsuite.AnyFunSuite -class FindUsagesTest extends AnyFunSuite with AnalyzerTest { - settings.pluginOptions.value ++= List("AVSystemAnalyzer:+findUsages:java.lang.String") +final class FindUsagesTest extends AnyFunSuite with AnalyzerTest: + override protected val pluginOptions = List("AVSystemAnalyzer:+findUsages:java.lang.String") test("java.lang.String usages should be found") { - assertErrors(2, + assertErrors( + 2, """ |object whatever { | val x: String = String.valueOf(123) @@ -15,4 +16,5 @@ class FindUsagesTest extends AnyFunSuite with AnalyzerTest { """.stripMargin ) } -} + +end FindUsagesTest diff --git a/analyzer/src/test/scala/com/avsystem/commons/analyzer/ImplicitTypesTest.scala b/analyzer/src/test/scala/com/avsystem/commons/analyzer/ImplicitTypesTest.scala index f7d07a83f..47ddb2122 100644 --- a/analyzer/src/test/scala/com/avsystem/commons/analyzer/ImplicitTypesTest.scala +++ b/analyzer/src/test/scala/com/avsystem/commons/analyzer/ImplicitTypesTest.scala @@ -3,9 +3,11 @@ package analyzer import org.scalatest.funsuite.AnyFunSuite -class ImplicitTypesTest extends AnyFunSuite with AnalyzerTest { +final class ImplicitTypesTest extends AnyFunSuite with AnalyzerTest: + test("implicit definitions without explicit types should be rejected") { - assertErrors(2, + assertErrors( + 2, """ |object whatever { | implicit val x = 5 @@ -15,6 +17,8 @@ class ImplicitTypesTest extends AnyFunSuite with AnalyzerTest { | implicit object objekt | implicit class wtf(x: Int) |} - """.stripMargin) + """.stripMargin + ) } -} + +end ImplicitTypesTest diff --git a/analyzer/src/test/scala/com/avsystem/commons/analyzer/ImportJavaUtilTest.scala b/analyzer/src/test/scala/com/avsystem/commons/analyzer/ImportJavaUtilTest.scala index 162179c8d..b7118bbf1 100644 --- a/analyzer/src/test/scala/com/avsystem/commons/analyzer/ImportJavaUtilTest.scala +++ b/analyzer/src/test/scala/com/avsystem/commons/analyzer/ImportJavaUtilTest.scala @@ -3,7 +3,8 @@ package analyzer import org.scalatest.funsuite.AnyFunSuite -class ImportJavaUtilTest extends AnyFunSuite with AnalyzerTest { +final class ImportJavaUtilTest extends AnyFunSuite with AnalyzerTest: + test("import java.util should be rejected") { assertErrors( """ @@ -13,4 +14,5 @@ class ImportJavaUtilTest extends AnyFunSuite with AnalyzerTest { """.stripMargin ) } -} + +end ImportJavaUtilTest diff --git a/analyzer/src/test/scala/com/avsystem/commons/analyzer/TestUtils.scala b/analyzer/src/test/scala/com/avsystem/commons/analyzer/TestUtils.scala index 9a4e00c70..03f872e9d 100644 --- a/analyzer/src/test/scala/com/avsystem/commons/analyzer/TestUtils.scala +++ b/analyzer/src/test/scala/com/avsystem/commons/analyzer/TestUtils.scala @@ -1,31 +1,27 @@ package com.avsystem.commons package analyzer -import com.avsystem.commons.annotation.{atLeast, explicitGenerics, macroPrivate} - -import scala.reflect.macros.blackbox - -object TestUtils { - def need3Params(@atLeast(3) args: Any*) = () - - @macroPrivate - def macroPrivateMethod = 42 - - def invokeMacroPrivateMethod: Int = macro invokeMacroPrivateMethodImpl - - def invokeMacroPrivateMethodImpl(c: blackbox.Context): c.Tree = { - import c.universe._ - q"${c.prefix}.macroPrivateMethod" - } - - object Extractor { - @macroPrivate def unapply(any: Any): Option[Any] = None - } - - def genericMacroImpl[T](c: blackbox.Context)(arg: c.Tree): c.Tree = arg - - @explicitGenerics - def genericMethod[T](arg: T): T = arg - @explicitGenerics - def genericMacro[T](arg: T): T = macro genericMacroImpl[T] -} +//import com.avsystem.commons.annotation.{atLeast, explicitGenerics, macroPrivate} + +//object TestUtils: +// def need3Params(@atLeast(3) args: Any*) = () +// +// @macroPrivate +// def macroPrivateMethod = 42 +// def genericMacroImpl[T](c: blackbox.Context)(arg: c.Tree): c.Tree = arg +// @explicitGenerics +// def genericMethod[T](arg: T): T = arg +// def invokeMacroPrivateMethod: Int = macro invokeMacroPrivateMethodImpl +// def invokeMacroPrivateMethodImpl(c: blackbox.Context): c.Tree = +// import c.universe.* +// q"${c.prefix}.macroPrivateMethod" +// +// end invokeMacroPrivateMethodImpl +// @explicitGenerics +// def genericMacro[T](arg: T): T = macro genericMacroImpl[T] +// object Extractor: +// @macroPrivate def unapply(any: Any): Option[Any] = None +// +// end Extractor +// +//end TestUtils diff --git a/analyzer/src/test/scala/com/avsystem/commons/analyzer/ThrowableObjectsTest.scala b/analyzer/src/test/scala/com/avsystem/commons/analyzer/ThrowableObjectsTest.scala index 32f365927..c0dc141c0 100644 --- a/analyzer/src/test/scala/com/avsystem/commons/analyzer/ThrowableObjectsTest.scala +++ b/analyzer/src/test/scala/com/avsystem/commons/analyzer/ThrowableObjectsTest.scala @@ -3,12 +3,16 @@ package analyzer import org.scalatest.funsuite.AnyFunSuite -class ThrowableObjectsTest extends AnyFunSuite with AnalyzerTest { +final class ThrowableObjectsTest extends AnyFunSuite with AnalyzerTest: + test("throwable objects with stack trace should be rejected") { - assertErrors(1, + assertErrors( + 1, """ |object throwableObject extends Throwable |object noStackTraceThrowableObject extends Throwable with scala.util.control.NoStackTrace - """.stripMargin) + """.stripMargin + ) } -} + +end ThrowableObjectsTest diff --git a/analyzer/src/test/scala/com/avsystem/commons/analyzer/ValueEnumExhaustiveMatchTest.scala b/analyzer/src/test/scala/com/avsystem/commons/analyzer/ValueEnumExhaustiveMatchTest.scala index 5b1512c09..2f17efb76 100644 --- a/analyzer/src/test/scala/com/avsystem/commons/analyzer/ValueEnumExhaustiveMatchTest.scala +++ b/analyzer/src/test/scala/com/avsystem/commons/analyzer/ValueEnumExhaustiveMatchTest.scala @@ -3,7 +3,8 @@ package analyzer import org.scalatest.funsuite.AnyFunSuite -class ValueEnumExhaustiveMatchTest extends AnyFunSuite with AnalyzerTest { +final class ValueEnumExhaustiveMatchTest extends AnyFunSuite with AnalyzerTest: + def source(caseDefs: String): String = s""" |import com.avsystem.commons.misc._ @@ -23,62 +24,77 @@ class ValueEnumExhaustiveMatchTest extends AnyFunSuite with AnalyzerTest { """.stripMargin test("should report two unmatched enum values") { - assertErrors(source( - """ + assertErrors( + source( + """ |case Enumz.One => |case null => """.stripMargin - )) + ) + ) } test("should report one unmatched enum value") { - assertErrors(source( - """ + assertErrors( + source( + """ |case Enumz.One => |case Enumz.Two => """.stripMargin - )) + ) + ) } test("should report one unmatched by alternative enum value") { - assertErrors(source( - """ + assertErrors( + source( + """ |case One | Two => """.stripMargin - )) + ) + ) } test("should not report unmatched values on wildcard") { - assertNoErrors(source( - """ + assertNoErrors( + source( + """ |case _ => """.stripMargin - )) + ) + ) } test("should not report unmatched values with guard") { - assertNoErrors(source( - """ + assertNoErrors( + source( + """ |case x if x.ordinal > 1 => """.stripMargin - )) + ) + ) } test("should not report no unmatched values in alternative") { - assertNoErrors(source( - """ + assertNoErrors( + source( + """ |case One | Two | Three => """.stripMargin - )) + ) + ) } test("should not report no unmatched values") { - assertNoErrors(source( - """ + assertNoErrors( + source( + """ |case Enumz.One => |case Enumz.Two => |case Three => """.stripMargin - )) + ) + ) } -} + +end ValueEnumExhaustiveMatchTest diff --git a/analyzer/src/test/scala/com/avsystem/commons/analyzer/VarargsAtLeastTest.scala b/analyzer/src/test/scala/com/avsystem/commons/analyzer/VarargsAtLeastTest.scala index f6604398d..a24eb8ddd 100644 --- a/analyzer/src/test/scala/com/avsystem/commons/analyzer/VarargsAtLeastTest.scala +++ b/analyzer/src/test/scala/com/avsystem/commons/analyzer/VarargsAtLeastTest.scala @@ -3,7 +3,8 @@ package analyzer import org.scalatest.funsuite.AnyFunSuite -class VarargsAtLeastTest extends AnyFunSuite with AnalyzerTest { +final class VarargsAtLeastTest extends AnyFunSuite with AnalyzerTest: + test("too few varargs parameters should be rejected") { assertErrors( """ @@ -40,4 +41,5 @@ class VarargsAtLeastTest extends AnyFunSuite with AnalyzerTest { """.stripMargin ) } -} + +end VarargsAtLeastTest diff --git a/project/Commons.scala b/project/Commons.scala index d20714536..0ed014ac4 100644 --- a/project/Commons.scala +++ b/project/Commons.scala @@ -1,15 +1,11 @@ import com.github.ghik.sbt.nosbt.ProjectGroup import com.typesafe.tools.mima.plugin.MimaKeys.* import org.portablescala.sbtplatformdeps.PlatformDepsPlugin.autoImport.* -import org.scalajs.jsdependencies.sbtplugin.JSDependenciesPlugin import org.scalajs.jsenv.nodejs.NodeJSEnv -import org.scalajs.sbtplugin.ScalaJSPlugin import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport.* -import pl.project13.scala.sbt.JmhPlugin import pl.project13.scala.sbt.JmhPlugin.JmhKeys.* import sbt.* import sbt.Keys.* -import sbtghactions.GenerativePlugin import sbtghactions.GenerativePlugin.autoImport.* import sbtide.Keys.* import sbtunidoc.BaseUnidocPlugin.autoImport.{unidoc, unidocProjectFilter} @@ -41,9 +37,9 @@ object Commons extends ProjectGroup("commons") { val upickleVersion = "3.1.2" // benchmark only val scalajsBenchmarkVersion = "0.10.0" val slf4jVersion = "2.0.13" // test only - - // for binary compatibility checking - val previousCompatibleVersions: Set[String] = Set("2.2.4") +// +// // for binary compatibility checking +// val previousCompatibleVersions: Set[String] = Set("2.2.4") override def globalSettings: Seq[Def.Setting[_]] = Seq( cancelable := true, @@ -69,7 +65,8 @@ object Commons extends ProjectGroup("commons") { Developer("ghik", "Roman Janusz", "r.janusz@avsystem.com", url("https://github.com/ghik")), ), - scalaVersion := "2.13.14", +// scalaVersion := "2.13.14", + scalaVersion := "3.5.0", compileOrder := CompileOrder.Mixed, githubWorkflowTargetTags ++= Seq("v*"), @@ -123,7 +120,7 @@ object Commons extends ProjectGroup("commons") { override def commonSettings: Seq[Def.Setting[_]] = Seq( Compile / scalacOptions ++= Seq( "-encoding", "utf-8", - "-Yrangepos", +// "-Yrangepos", "-explaintypes", "-feature", "-deprecation", @@ -133,11 +130,11 @@ object Commons extends ProjectGroup("commons") { "-language:dynamics", "-language:experimental.macros", "-language:higherKinds", - "-Xfatal-warnings", - "-Xsource:3", - "-Xlint:-missing-interpolator,-adapted-args,-unused,_", - "-Ycache-plugin-class-loader:last-modified", - "-Ycache-macro-class-loader:last-modified", +// "-Xfatal-warnings", +// "-Xsource:3", +// "-Xlint:-missing-interpolator,-adapted-args,-unused,_", +// "-Ycache-plugin-class-loader:last-modified", +// "-Ycache-macro-class-loader:last-modified", ), Compile / scalacOptions ++= { @@ -172,9 +169,9 @@ object Commons extends ProjectGroup("commons") { "org.apache.commons" % "commons-io" % commonsIoVersion % Test, "org.slf4j" % "slf4j-simple" % slf4jVersion % Test, ), - mimaPreviousArtifacts := previousCompatibleVersions.map { previousVersion => - organization.value % s"${name.value}_${scalaBinaryVersion.value}" % previousVersion - }, +// mimaPreviousArtifacts := previousCompatibleVersions.map { previousVersion => +// organization.value % s"${name.value}_${scalaBinaryVersion.value}" % previousVersion +// }, Test / jsEnv := new NodeJSEnv(NodeJSEnv.Config().withEnv(Map( "RESOURCES_DIR" -> (Test / resourceDirectory).value.absolutePath) )), @@ -208,7 +205,7 @@ object Commons extends ProjectGroup("commons") { .enablePlugins(ScalaUnidocPlugin) .aggregate( jvm, - js, +// js, ) .settings( noPublishSettings, @@ -218,38 +215,38 @@ object Commons extends ProjectGroup("commons") { ScalaUnidoc / unidoc / unidocProjectFilter := inAnyProject -- inProjects( analyzer, - macros, - `core-js`, - comprof, +// macros, +// `core-js`, +// comprof, ), ) lazy val jvm = mkSubProject.in(file(".jvm")) .aggregate( analyzer, - macros, - core, - jetty, - mongo, - hocon, - spring, - redis, - ) - .settings(aggregateProjectSettings) - - lazy val js = mkSubProject.in(file(".js")) - .aggregate( - `core-js`, - `mongo-js`, +// macros, +// core, +// jetty, +// mongo, +// hocon, +// spring, +// redis, ) .settings(aggregateProjectSettings) +// +// lazy val js = mkSubProject.in(file(".js")) +// .aggregate( +// `core-js`, +// `mongo-js`, +// ) +// .settings(aggregateProjectSettings) lazy val analyzer = mkSubProject - .dependsOn(core % Test) +// .dependsOn(core % Test) .settings( jvmCommonSettings, libraryDependencies ++= Seq( - "org.scala-lang" % "scala-compiler" % scalaVersion.value, + "org.scala-lang" % "scala3-compiler_3" % scalaVersion.value, "io.monix" %% "monix" % monixVersion % Test, ), ) @@ -271,169 +268,169 @@ object Commons extends ProjectGroup("commons") { if (forIdeaImport) Seq.empty else Seq(name := (proj / name).value) - lazy val macros = mkSubProject.settings( - jvmCommonSettings, - libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaVersion.value, - ) - - lazy val core = mkSubProject - .dependsOn(macros) - .settings( - jvmCommonSettings, - sourceDirsSettings(_ / "jvm"), - libraryDependencies ++= Seq( - "com.google.code.findbugs" % "jsr305" % jsr305Version % Optional, - "com.google.guava" % "guava" % guavaVersion % Optional, - "io.monix" %% "monix" % monixVersion % Optional, - ), - ) - - lazy val `core-js` = mkSubProject.in(core.base / "js") - .enablePlugins(ScalaJSPlugin) - .configure(p => if (forIdeaImport) p.dependsOn(core) else p) - .dependsOn(macros) - .settings( - jsCommonSettings, - sameNameAs(core), - sourceDirsSettings(_.getParentFile), - libraryDependencies ++= Seq( - "io.monix" %%% "monix" % monixVersion % Optional, - ) - ) - - lazy val mongo = mkSubProject - .dependsOn(core % CompileAndTest) - .settings( - jvmCommonSettings, - sourceDirsSettings(_ / "jvm"), - libraryDependencies ++= Seq( - "com.google.guava" % "guava" % guavaVersion, - "io.monix" %% "monix" % monixVersion, - "org.mongodb" % "mongodb-driver-core" % mongoVersion, - "org.mongodb" % "mongodb-driver-sync" % mongoVersion % Optional, - "org.mongodb" % "mongodb-driver-reactivestreams" % mongoVersion % Optional, - "org.mongodb.scala" %% "mongo-scala-driver" % mongoVersion % Optional, - ), - ) - - // only to allow @mongoId & MongoEntity to be usedJS/JVM cross-compiled code - lazy val `mongo-js` = mkSubProject.in(mongo.base / "js") - .enablePlugins(ScalaJSPlugin) - .configure(p => if (forIdeaImport) p.dependsOn(mongo) else p) - .dependsOn(`core-js`) - .settings( - jsCommonSettings, - sameNameAs(mongo), - sourceDirsSettings(_.getParentFile), - ) - - lazy val redis = mkSubProject - .dependsOn(core % CompileAndTest) - .settings( - jvmCommonSettings, - libraryDependencies ++= Seq( - "com.google.guava" % "guava" % guavaVersion, - "org.apache.pekko" %% "pekko-stream" % pekkoVersion, - "com.typesafe.scala-logging" %% "scala-logging" % scalaLoggingVersion, - "io.monix" %% "monix" % monixVersion, - ), - Test / parallelExecution := false, - ) - - lazy val hocon = mkSubProject - .dependsOn(core % CompileAndTest) - .settings( - jvmCommonSettings, - libraryDependencies ++= Seq( - "com.typesafe" % "config" % typesafeConfigVersion, - ), - ) - - lazy val spring = mkSubProject - .dependsOn(hocon % CompileAndTest) - .settings( - jvmCommonSettings, - libraryDependencies ++= Seq( - "org.springframework" % "spring-context" % springVersion, - "com.google.code.findbugs" % "jsr305" % jsr305Version % Optional, - ), - ) - - lazy val jetty = mkSubProject - .dependsOn(core % CompileAndTest) - .settings( - jvmCommonSettings, - libraryDependencies ++= Seq( - "org.eclipse.jetty" % "jetty-client" % jettyVersion, - "org.eclipse.jetty" % "jetty-server" % jettyVersion, - "com.typesafe.scala-logging" %% "scala-logging" % scalaLoggingVersion, - - "org.eclipse.jetty" % "jetty-servlet" % jettyVersion % Test, - ), - ) - - lazy val benchmark = mkSubProject - .dependsOn(redis, mongo) - .enablePlugins(JmhPlugin) - .settings( - jvmCommonSettings, - noPublishSettings, - sourceDirsSettings(_ / "jvm"), - libraryDependencies ++= Seq( - "io.circe" %% "circe-core" % circeVersion, - "io.circe" %% "circe-generic" % circeVersion, - "io.circe" %% "circe-jawn" % circeVersion, - "io.circe" %% "circe-parser" % circeVersion, - "com.lihaoyi" %% "upickle" % upickleVersion, - ), - ideExcludedDirectories := (Jmh / managedSourceDirectories).value, - ) - - lazy val `benchmark-js` = mkSubProject.in(benchmark.base / "js") - .enablePlugins(ScalaJSPlugin, JSDependenciesPlugin) - .configure(p => if (forIdeaImport) p.dependsOn(benchmark) else p) - .dependsOn(`core-js`) - .settings( - jsCommonSettings, - noPublishSettings, - sameNameAs(benchmark), - sourceDirsSettings(_.getParentFile), - libraryDependencies ++= Seq( - "io.circe" %%% "circe-core" % circeVersion, - "io.circe" %%% "circe-generic" % circeVersion, - "io.circe" %%% "circe-parser" % circeVersion, - "com.lihaoyi" %%% "upickle" % upickleVersion, - "com.github.japgolly.scalajs-benchmark" %%% "benchmark" % scalajsBenchmarkVersion, - ), - scalaJSUseMainModuleInitializer := true, - ) - - lazy val comprof = mkSubProject - .disablePlugins(GenerativePlugin) - .dependsOn(core) - .settings( - jvmCommonSettings, - noPublishSettings, - ideSkipProject := true, - addCompilerPlugin("ch.epfl.scala" %% "scalac-profiling" % "1.0.0"), - scalacOptions ++= Seq( - s"-P:scalac-profiling:sourceroot:${baseDirectory.value}", - "-P:scalac-profiling:generate-macro-flamegraph", - "-P:scalac-profiling:no-profiledb", - "-Xmacro-settings:statsEnabled", - "-Ystatistics:typer", - ), - Compile / sourceGenerators += Def.task { - val originalSrc = (core / sourceDirectory).value / - "test/scala/com/avsystem/commons/rest/RestTestApi.scala" - val originalContent = IO.read(originalSrc) - (0 until 100).map { i => - val pkg = f"oa$i%02d" - val newContent = originalContent.replace("package rest", s"package rest\npackage $pkg") - val newFile = (Compile / sourceManaged).value / pkg / "RestTestApi.scala" - IO.write(newFile, newContent) - newFile - } - }.taskValue - ) +// lazy val macros = mkSubProject.settings( +// jvmCommonSettings, +// libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaVersion.value, +// ) +// +// lazy val core = mkSubProject +// .dependsOn(macros) +// .settings( +// jvmCommonSettings, +// sourceDirsSettings(_ / "jvm"), +// libraryDependencies ++= Seq( +// "com.google.code.findbugs" % "jsr305" % jsr305Version % Optional, +// "com.google.guava" % "guava" % guavaVersion % Optional, +// "io.monix" %% "monix" % monixVersion % Optional, +// ), +// ) +// +// lazy val `core-js` = mkSubProject.in(core.base / "js") +// .enablePlugins(ScalaJSPlugin) +// .configure(p => if (forIdeaImport) p.dependsOn(core) else p) +// .dependsOn(macros) +// .settings( +// jsCommonSettings, +// sameNameAs(core), +// sourceDirsSettings(_.getParentFile), +// libraryDependencies ++= Seq( +// "io.monix" %%% "monix" % monixVersion % Optional, +// ) +// ) +// +// lazy val mongo = mkSubProject +// .dependsOn(core % CompileAndTest) +// .settings( +// jvmCommonSettings, +// sourceDirsSettings(_ / "jvm"), +// libraryDependencies ++= Seq( +// "com.google.guava" % "guava" % guavaVersion, +// "io.monix" %% "monix" % monixVersion, +// "org.mongodb" % "mongodb-driver-core" % mongoVersion, +// "org.mongodb" % "mongodb-driver-sync" % mongoVersion % Optional, +// "org.mongodb" % "mongodb-driver-reactivestreams" % mongoVersion % Optional, +// "org.mongodb.scala" %% "mongo-scala-driver" % mongoVersion % Optional, +// ), +// ) +// +// // only to allow @mongoId & MongoEntity to be usedJS/JVM cross-compiled code +// lazy val `mongo-js` = mkSubProject.in(mongo.base / "js") +// .enablePlugins(ScalaJSPlugin) +// .configure(p => if (forIdeaImport) p.dependsOn(mongo) else p) +// .dependsOn(`core-js`) +// .settings( +// jsCommonSettings, +// sameNameAs(mongo), +// sourceDirsSettings(_.getParentFile), +// ) +// +// lazy val redis = mkSubProject +// .dependsOn(core % CompileAndTest) +// .settings( +// jvmCommonSettings, +// libraryDependencies ++= Seq( +// "com.google.guava" % "guava" % guavaVersion, +// "org.apache.pekko" %% "pekko-stream" % pekkoVersion, +// "com.typesafe.scala-logging" %% "scala-logging" % scalaLoggingVersion, +// "io.monix" %% "monix" % monixVersion, +// ), +// Test / parallelExecution := false, +// ) +// +// lazy val hocon = mkSubProject +// .dependsOn(core % CompileAndTest) +// .settings( +// jvmCommonSettings, +// libraryDependencies ++= Seq( +// "com.typesafe" % "config" % typesafeConfigVersion, +// ), +// ) +// +// lazy val spring = mkSubProject +// .dependsOn(hocon % CompileAndTest) +// .settings( +// jvmCommonSettings, +// libraryDependencies ++= Seq( +// "org.springframework" % "spring-context" % springVersion, +// "com.google.code.findbugs" % "jsr305" % jsr305Version % Optional, +// ), +// ) +// +// lazy val jetty = mkSubProject +// .dependsOn(core % CompileAndTest) +// .settings( +// jvmCommonSettings, +// libraryDependencies ++= Seq( +// "org.eclipse.jetty" % "jetty-client" % jettyVersion, +// "org.eclipse.jetty" % "jetty-server" % jettyVersion, +// "com.typesafe.scala-logging" %% "scala-logging" % scalaLoggingVersion, +// +// "org.eclipse.jetty" % "jetty-servlet" % jettyVersion % Test, +// ), +// ) +// +// lazy val benchmark = mkSubProject +// .dependsOn(redis, mongo) +// .enablePlugins(JmhPlugin) +// .settings( +// jvmCommonSettings, +// noPublishSettings, +// sourceDirsSettings(_ / "jvm"), +// libraryDependencies ++= Seq( +// "io.circe" %% "circe-core" % circeVersion, +// "io.circe" %% "circe-generic" % circeVersion, +// "io.circe" %% "circe-jawn" % circeVersion, +// "io.circe" %% "circe-parser" % circeVersion, +// "com.lihaoyi" %% "upickle" % upickleVersion, +// ), +// ideExcludedDirectories := (Jmh / managedSourceDirectories).value, +// ) +// +// lazy val `benchmark-js` = mkSubProject.in(benchmark.base / "js") +// .enablePlugins(ScalaJSPlugin, JSDependenciesPlugin) +// .configure(p => if (forIdeaImport) p.dependsOn(benchmark) else p) +// .dependsOn(`core-js`) +// .settings( +// jsCommonSettings, +// noPublishSettings, +// sameNameAs(benchmark), +// sourceDirsSettings(_.getParentFile), +// libraryDependencies ++= Seq( +// "io.circe" %%% "circe-core" % circeVersion, +// "io.circe" %%% "circe-generic" % circeVersion, +// "io.circe" %%% "circe-parser" % circeVersion, +// "com.lihaoyi" %%% "upickle" % upickleVersion, +// "com.github.japgolly.scalajs-benchmark" %%% "benchmark" % scalajsBenchmarkVersion, +// ), +// scalaJSUseMainModuleInitializer := true, +// ) +// +// lazy val comprof = mkSubProject +// .disablePlugins(GenerativePlugin) +// .dependsOn(core) +// .settings( +// jvmCommonSettings, +// noPublishSettings, +// ideSkipProject := true, +// addCompilerPlugin("ch.epfl.scala" %% "scalac-profiling" % "1.0.0"), +// scalacOptions ++= Seq( +// s"-P:scalac-profiling:sourceroot:${baseDirectory.value}", +// "-P:scalac-profiling:generate-macro-flamegraph", +// "-P:scalac-profiling:no-profiledb", +// "-Xmacro-settings:statsEnabled", +// "-Ystatistics:typer", +// ), +// Compile / sourceGenerators += Def.task { +// val originalSrc = (core / sourceDirectory).value / +// "test/scala/com/avsystem/commons/rest/RestTestApi.scala" +// val originalContent = IO.read(originalSrc) +// (0 until 100).map { i => +// val pkg = f"oa$i%02d" +// val newContent = originalContent.replace("package rest", s"package rest\npackage $pkg") +// val newFile = (Compile / sourceManaged).value / pkg / "RestTestApi.scala" +// IO.write(newFile, newContent) +// newFile +// } +// }.taskValue +// ) } From 26054c0ad81e46acebe8559ede40ed7be49e9e85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20Kozak?= Date: Tue, 1 Oct 2024 10:54:35 +0200 Subject: [PATCH 2/5] lil cleanup, core3 project, explicitGenerics draft, --- .idea/codeStyles/Project.xml | 1 - .../commons/analyzer/AnalyzerPlugin.scala | 34 ++------ .../commons/analyzer/AnalyzerRule.scala | 29 +++---- .../commons/analyzer/ExplicitGenerics.scala | 86 +++++++++++-------- .../commons/analyzer/ImplicitTypes.scala | 15 ---- .../commons/analyzer/ImportJavaUtil.scala | 23 +++-- .../commons/analyzer/AnalyzerTest.scala | 17 ++-- .../analyzer/ExplicitGenericsTest.scala | 1 - .../commons/analyzer/ImplicitTypesTest.scala | 24 ------ .../commons/analyzer/ImportJavaUtilTest.scala | 19 ++++ .../avsystem/commons/analyzer/TestUtils.scala | 48 ++++++----- .../commons/annotation/explicitGenerics.scala | 21 +++++ .../avsystem/commons/debug/PrintTree.scala | 12 +++ core3/src/test/resources/SimpleApi.txt | 6 ++ core3/src/test/resources/StringApi.txt | 54 ++++++++++++ project/Commons.scala | 15 +++- 16 files changed, 243 insertions(+), 162 deletions(-) delete mode 100644 analyzer/src/main/scala/com/avsystem/commons/analyzer/ImplicitTypes.scala delete mode 100644 analyzer/src/test/scala/com/avsystem/commons/analyzer/ImplicitTypesTest.scala create mode 100644 core3/src/main/scala/com/avsystem/commons/annotation/explicitGenerics.scala create mode 100644 core3/src/main/scala/com/avsystem/commons/debug/PrintTree.scala create mode 100644 core3/src/test/resources/SimpleApi.txt create mode 100644 core3/src/test/resources/StringApi.txt diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index ec573d7d8..095539431 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -53,7 +53,6 @@