提交 0e205a15 编写于 作者: I IceMimosa

Format code

上级 08904ebd
...@@ -2,8 +2,8 @@ package io.github.dreamylost.plugin ...@@ -2,8 +2,8 @@ package io.github.dreamylost.plugin
import com.intellij.openapi.Disposable import com.intellij.openapi.Disposable
import io.github.dreamylost.plugin.processor.Processor import io.github.dreamylost.plugin.processor.Processor
import io.github.dreamylost.plugin.processor.clazz.{ApplyProcessor, BuilderProcessor, ConstructorProcessor, JsonProcessor, LogProcessor} import io.github.dreamylost.plugin.processor.clazz.{ ApplyProcessor, BuilderProcessor, ConstructorProcessor, JsonProcessor, LogProcessor }
import org.jetbrains.plugins.scala.lang.psi.api.toplevel.typedef.{ScClass, ScObject, ScTypeDefinition} import org.jetbrains.plugins.scala.lang.psi.api.toplevel.typedef.{ ScClass, ScObject, ScTypeDefinition }
import scala.collection.mutable import scala.collection.mutable
...@@ -33,9 +33,9 @@ class ScalaMacroProcessorProvider extends Disposable { ...@@ -33,9 +33,9 @@ class ScalaMacroProcessorProvider extends Disposable {
def findProcessors(source: ScTypeDefinition): Seq[Processor] = { def findProcessors(source: ScTypeDefinition): Seq[Processor] = {
processors.filter { p => processors.filter { p =>
source match { source match {
case obj: ScObject => obj.hasAnnotation(p._1) || obj.fakeCompanionClassOrCompanionClass.hasAnnotation(p._1) case obj: ScObject => obj.hasAnnotation(p._1) || obj.fakeCompanionClassOrCompanionClass.hasAnnotation(p._1)
case clazz: ScClass => clazz.hasAnnotation(p._1) case clazz: ScClass => clazz.hasAnnotation(p._1)
case _ => source.hasAnnotation(p._1) case _ => source.hasAnnotation(p._1)
} }
}.values.toSeq }.values.toSeq
} }
......
package io.github.dreamylost.plugin.processor.clazz package io.github.dreamylost.plugin.processor.clazz
import io.github.dreamylost.plugin.processor.ProcessType.ProcessType import io.github.dreamylost.plugin.processor.ProcessType.ProcessType
import io.github.dreamylost.plugin.processor.{AbsProcessor, ProcessType} import io.github.dreamylost.plugin.processor.{ AbsProcessor, ProcessType }
import org.jetbrains.plugins.scala.lang.psi.api.toplevel.typedef.{ScClass, ScObject, ScTypeDefinition} import org.jetbrains.plugins.scala.lang.psi.api.toplevel.typedef.{ ScClass, ScObject, ScTypeDefinition }
/** /**
* Desc: Processor for annotation apply * Desc: Processor for annotation apply
......
...@@ -2,10 +2,10 @@ package io.github.dreamylost.plugin.processor.clazz ...@@ -2,10 +2,10 @@ package io.github.dreamylost.plugin.processor.clazz
import io.github.dreamylost.plugin.ScalaMacroNames import io.github.dreamylost.plugin.ScalaMacroNames
import io.github.dreamylost.plugin.processor.ProcessType.ProcessType import io.github.dreamylost.plugin.processor.ProcessType.ProcessType
import io.github.dreamylost.plugin.processor.{AbsProcessor, ProcessType} import io.github.dreamylost.plugin.processor.{ AbsProcessor, ProcessType }
import org.jetbrains.plugins.scala.lang.psi.api.expr.ScMethodCall import org.jetbrains.plugins.scala.lang.psi.api.expr.ScMethodCall
import org.jetbrains.plugins.scala.lang.psi.api.statements.ScVariableDefinition import org.jetbrains.plugins.scala.lang.psi.api.statements.ScVariableDefinition
import org.jetbrains.plugins.scala.lang.psi.api.toplevel.typedef.{ScClass, ScTypeDefinition} import org.jetbrains.plugins.scala.lang.psi.api.toplevel.typedef.{ ScClass, ScTypeDefinition }
import org.jetbrains.plugins.scala.lang.psi.types.ScLiteralType import org.jetbrains.plugins.scala.lang.psi.types.ScLiteralType
/** /**
......
...@@ -21,15 +21,16 @@ class LogProcessor extends AbsProcessor { ...@@ -21,15 +21,16 @@ class LogProcessor extends AbsProcessor {
typ match { typ match {
case ProcessType.Field => case ProcessType.Field =>
source match { source match {
case clazz@(_: ScClass | _: ScObject) => case clazz @ (_: ScClass | _: ScObject) =>
clazz.annotations(ScalaMacroNames.LOG).lastOption.fold[Seq[String]](Nil) { an => { clazz.annotations(ScalaMacroNames.LOG).lastOption.fold[Seq[String]](Nil) { an =>
an.annotationExpr.getText match { {
case expr if expr.contains("Slf4j") => Seq(logExpr("org.slf4j.Logger")) an.annotationExpr.getText match {
case expr if expr.contains("Log4j2") => Seq(logExpr("org.apache.logging.log4j.Logger")) case expr if expr.contains("Slf4j") => Seq(logExpr("org.slf4j.Logger"))
case _ => Seq(logExpr()) case expr if expr.contains("Log4j2") => Seq(logExpr("org.apache.logging.log4j.Logger"))
case _ => Seq(logExpr())
}
} }
} }
}
case _ => Nil case _ => Nil
} }
case _ => Nil case _ => Nil
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册