scalafmt

d10xa · d10xa · commit 1b63e121efca · 2025-03-31T23:41:17.000+03:00
diff --git a/frontend-laminar/src/main/scala/ru/d10xa/jsonlogviewer/Ansi2HtmlWithClasses.scala b/frontend-laminar/src/main/scala/ru/d10xa/jsonlogviewer/Ansi2HtmlWithClasses.scala
@@ -2,7 +2,6 @@ package ru.d10xa.jsonlogviewer
 
 import fansi.ErrorMode
 import fansi.Str
-
 import scala.scalajs.js.annotation.JSExport
 
 /** https://github.com/com-lihaoyi/fansi/issues/62
diff --git a/frontend-laminar/src/main/scala/ru/d10xa/jsonlogviewer/App.scala b/frontend-laminar/src/main/scala/ru/d10xa/jsonlogviewer/App.scala
@@ -8,13 +8,6 @@ import com.raquo.waypoint.*
 import org.scalajs.dom
 import org.scalajs.dom.HTMLButtonElement
 import org.scalajs.dom.HTMLDivElement
-import ru.d10xa.jsonlogviewer.Router0.*
-import ru.d10xa.jsonlogviewer.Router0.EditPage
-import ru.d10xa.jsonlogviewer.Router0.HelpPage
-import ru.d10xa.jsonlogviewer.Router0.LivePage
-import ru.d10xa.jsonlogviewer.Router0.Page
-import ru.d10xa.jsonlogviewer.Router0.ViewPage
-import ru.d10xa.jsonlogviewer.Router0.navigateTo
 import ru.d10xa.jsonlogviewer.decline.Config
 import ru.d10xa.jsonlogviewer.decline.Config.FormatIn
 import ru.d10xa.jsonlogviewer.decline.Config.FormatIn.Csv
@@ -23,7 +16,13 @@ import ru.d10xa.jsonlogviewer.decline.Config.FormatIn.Logfmt
 import ru.d10xa.jsonlogviewer.decline.Config.FormatOut
 import ru.d10xa.jsonlogviewer.decline.DeclineOpts
 import ru.d10xa.jsonlogviewer.query.QueryCompiler
-
+import ru.d10xa.jsonlogviewer.Router0.*
+import ru.d10xa.jsonlogviewer.Router0.navigateTo
+import ru.d10xa.jsonlogviewer.Router0.EditPage
+import ru.d10xa.jsonlogviewer.Router0.HelpPage
+import ru.d10xa.jsonlogviewer.Router0.LivePage
+import ru.d10xa.jsonlogviewer.Router0.Page
+import ru.d10xa.jsonlogviewer.Router0.ViewPage
 import scala.util.matching.Regex
 
 object App {
@@ -98,7 +97,7 @@ object App {
   def main(args: Array[String]): Unit = {
     lazy val container = dom.document.getElementById("app-container")
 
-    lazy val appElement = {
+    lazy val appElement =
       div(
         cls := "container-fluid",
         ul(
@@ -124,7 +123,6 @@ object App {
           child <-- selectedAppSignal
         )
       )
-    }
     renderOnDomContentLoaded(container, appElement)
   }
 
@@ -216,7 +214,7 @@ object App {
       formatInVar.now() match
         case Config.FormatIn.Json   => textVar.set(jsonLogSample)
         case Config.FormatIn.Logfmt => textVar.set(logfmtSample)
-        case Config.FormatIn.Csv => textVar.set(csvSample)
+        case Config.FormatIn.Csv    => textVar.set(csvSample)
     }
   )
   private def renderLivePage(): HtmlElement = {
@@ -245,7 +243,7 @@ object App {
       Help.fromCommand(DeclineOpts.command).toString
     )
 
-  private def renderEditPage(): HtmlElement = {
+  private def renderEditPage(): HtmlElement =
     div(
       formatInDiv,
       formatOutDiv,
@@ -254,7 +252,6 @@ object App {
       buttonGenerateLogs,
       editElementDiv
     )
-  }
 
   val linkPages: List[Page] = List(
     LivePage,
diff --git a/frontend-laminar/src/main/scala/ru/d10xa/jsonlogviewer/ViewElement.scala b/frontend-laminar/src/main/scala/ru/d10xa/jsonlogviewer/ViewElement.scala
@@ -13,7 +13,6 @@ import ru.d10xa.jsonlogviewer.decline.yaml.ConfigYaml
 import ru.d10xa.jsonlogviewer.decline.yaml.Feed
 import ru.d10xa.jsonlogviewer.decline.Config
 import ru.d10xa.jsonlogviewer.shell.ShellImpl
-
 import scala.util.chaining.*
 
 object ViewElement {
diff --git a/json-log-viewer/jvm/src/main/scala/ru/d10xa/jsonlogviewer/StdInLinesStreamImpl.scala b/json-log-viewer/jvm/src/main/scala/ru/d10xa/jsonlogviewer/StdInLinesStreamImpl.scala
@@ -1,8 +1,8 @@
 package ru.d10xa.jsonlogviewer
 import cats.effect.IO
+import fs2.io.stdinUtf8
 import fs2.Chunk
 import fs2.Stream
-import fs2.io.stdinUtf8
 
 class StdInLinesStreamImpl extends StdInLinesStream {
 
diff --git a/json-log-viewer/jvm/src/main/scala/ru/d10xa/jsonlogviewer/decline/ConfigInitImpl.scala b/json-log-viewer/jvm/src/main/scala/ru/d10xa/jsonlogviewer/decline/ConfigInitImpl.scala
@@ -7,7 +7,6 @@ import cats.effect.Resource
 import fs2.io.file.Files
 import fs2.io.file.Path
 import fs2.io.file.Watcher
-
 import java.io.File
 import ru.d10xa.jsonlogviewer.decline.yaml.ConfigYaml
 import ru.d10xa.jsonlogviewer.decline.yaml.ConfigYamlReader
diff --git a/json-log-viewer/jvm/src/main/scala/ru/d10xa/jsonlogviewer/decline/yaml/ConfigYamlLoaderImpl.scala b/json-log-viewer/jvm/src/main/scala/ru/d10xa/jsonlogviewer/decline/yaml/ConfigYamlLoaderImpl.scala
@@ -193,7 +193,7 @@ class ConfigYamlLoaderImpl extends ConfigYamlLoader {
           parseOptionalString(feedFields, "inlineInput")
         val filterValidated = parseOptionalQueryAST(feedFields, "filter")
         val formatInValidated
-        : Validated[NonEmptyList[String], Option[FormatIn]] =
+          : Validated[NonEmptyList[String], Option[FormatIn]] =
           parseOptionalFormatIn(feedFields, "formatIn")
         val fieldNamesValidated =
           parseOptionalFieldNames(feedFields, "fieldNames")
@@ -246,7 +246,8 @@ class ConfigYamlLoaderImpl extends ConfigYamlLoader {
               val showEmptyFieldsValidated =
                 parseOptionalBoolean(fields, "showEmptyFields")
 
-              (fieldNamesValidated, feedsValidated, showEmptyFieldsValidated).mapN(ConfigYaml.apply)
+              (fieldNamesValidated, feedsValidated, showEmptyFieldsValidated)
+                .mapN(ConfigYaml.apply)
           }
       }
     }
diff --git a/json-log-viewer/jvm/src/main/scala/ru/d10xa/jsonlogviewer/decline/yaml/ConfigYamlReader.scala b/json-log-viewer/jvm/src/main/scala/ru/d10xa/jsonlogviewer/decline/yaml/ConfigYamlReader.scala
@@ -4,7 +4,6 @@ import cats.data.ValidatedNel
 import cats.effect.IO
 import ru.d10xa.jsonlogviewer.decline.yaml.ConfigYaml
 import ru.d10xa.jsonlogviewer.decline.yaml.ConfigYamlLoader
-
 import scala.io.Source
 
 object ConfigYamlReader {
diff --git a/json-log-viewer/shared/src/main/scala/ru/d10xa/jsonlogviewer/JsonLogLineParser.scala b/json-log-viewer/shared/src/main/scala/ru/d10xa/jsonlogviewer/JsonLogLineParser.scala
@@ -7,8 +7,10 @@ import io.circe.HCursor
 import io.circe.Json
 import ru.d10xa.jsonlogviewer.config.ResolvedConfig
 
-class JsonLogLineParser(config: ResolvedConfig, jsonPrefixPostfix: JsonPrefixPostfix)
-  extends LogLineParser:
+class JsonLogLineParser(
+  config: ResolvedConfig,
+  jsonPrefixPostfix: JsonPrefixPostfix
+) extends LogLineParser:
   given Decoder[ParsedLine] = (c: HCursor) =>
     val timestampFieldName = config.fieldNames.timestampFieldName
     val levelFieldName = config.fieldNames.levelFieldName
@@ -18,12 +20,18 @@ class JsonLogLineParser(config: ResolvedConfig, jsonPrefixPostfix: JsonPrefixPos
     val threadNameFieldName = config.fieldNames.threadNameFieldName
 
     val knownFieldNames = Set(
-      timestampFieldName, "@timestamp",
-      levelFieldName, "level",
-      messageFieldName, "message",
-      stackTraceFieldName, "stack_trace",
-      loggerNameFieldName, "logger_name",
-      threadNameFieldName, "thread_name"
+      timestampFieldName,
+      "@timestamp",
+      levelFieldName,
+      "level",
+      messageFieldName,
+      "message",
+      stackTraceFieldName,
+      "stack_trace",
+      loggerNameFieldName,
+      "logger_name",
+      threadNameFieldName,
+      "thread_name"
     )
 
     // Function to find value by multiple possible keys
@@ -49,12 +57,20 @@ class JsonLogLineParser(config: ResolvedConfig, jsonPrefixPostfix: JsonPrefixPos
 
     for
       // Check both standard and configured field names
-      timestampOpt <- Either.right(findByKeys("@timestamp", "timestamp", timestampFieldName))
+      timestampOpt <- Either.right(
+        findByKeys("@timestamp", "timestamp", timestampFieldName)
+      )
       levelOpt <- Either.right(findByKeys("level", levelFieldName))
       messageOpt <- Either.right(findByKeys("message", messageFieldName))
-      stackTraceOpt <- Either.right(findByKeys("stack_trace", stackTraceFieldName))
-      loggerNameOpt <- Either.right(findByKeys("logger_name", loggerNameFieldName))
-      threadNameOpt <- Either.right(findByKeys("thread_name", threadNameFieldName))
+      stackTraceOpt <- Either.right(
+        findByKeys("stack_trace", stackTraceFieldName)
+      )
+      loggerNameOpt <- Either.right(
+        findByKeys("logger_name", loggerNameFieldName)
+      )
+      threadNameOpt <- Either.right(
+        findByKeys("thread_name", threadNameFieldName)
+      )
       attributes <- c
         .as[Map[String, Json]]
         .map(mapOtherAttributes)
@@ -87,4 +103,4 @@ class JsonLogLineParser(config: ResolvedConfig, jsonPrefixPostfix: JsonPrefixPos
           prefix = prefixOpt,
           postfix = postfixOpt
         )
-      )
+      )
diff --git a/json-log-viewer/shared/src/main/scala/ru/d10xa/jsonlogviewer/LogLineQueryPredicateImpl.scala b/json-log-viewer/shared/src/main/scala/ru/d10xa/jsonlogviewer/LogLineQueryPredicateImpl.scala
@@ -3,11 +3,11 @@ package ru.d10xa.jsonlogviewer
 import ru.d10xa.jsonlogviewer.query.AndExpr
 import ru.d10xa.jsonlogviewer.query.Eq
 import ru.d10xa.jsonlogviewer.query.LikeExpr
+import ru.d10xa.jsonlogviewer.query.Neq
 import ru.d10xa.jsonlogviewer.query.OrExpr
 import ru.d10xa.jsonlogviewer.query.QueryAST
 import ru.d10xa.jsonlogviewer.query.StrIdentifier
 import ru.d10xa.jsonlogviewer.query.StrLiteral
-import ru.d10xa.jsonlogviewer.query.Neq
 
 class LogLineQueryPredicateImpl(q: QueryAST, parseResultKeys: ParseResultKeys) {
   import LogLineQueryPredicateImpl.*
diff --git a/json-log-viewer/shared/src/main/scala/ru/d10xa/jsonlogviewer/TimestampFilter.scala b/json-log-viewer/shared/src/main/scala/ru/d10xa/jsonlogviewer/TimestampFilter.scala
@@ -2,7 +2,6 @@ package ru.d10xa.jsonlogviewer
 
 import cats.effect.IO
 import fs2.Pipe
-
 import java.time.ZonedDateTime
 
 class TimestampFilter:
@@ -22,9 +21,9 @@ class TimestampFilter:
     p =>
       t match
         case Some(valueFromRequest) =>
-          p.filter(p0 => {
+          p.filter(p0 =>
             p0.parsed
               .flatMap(_.timestampAsZonedDateTime)
               .forall(l => predicate(l, valueFromRequest))
-          })
+          )
         case None => p
diff --git a/json-log-viewer/shared/src/main/scala/ru/d10xa/jsonlogviewer/csv/CsvLogLineParser.scala b/json-log-viewer/shared/src/main/scala/ru/d10xa/jsonlogviewer/csv/CsvLogLineParser.scala
@@ -1,18 +1,22 @@
 package ru.d10xa.jsonlogviewer.csv
 
+import ru.d10xa.jsonlogviewer.config.ResolvedConfig
 import ru.d10xa.jsonlogviewer.LogLineParser
 import ru.d10xa.jsonlogviewer.ParseResult
 import ru.d10xa.jsonlogviewer.ParsedLine
-import ru.d10xa.jsonlogviewer.config.ResolvedConfig
 
-class CsvLogLineParser(config: ResolvedConfig, headers: List[String]) extends LogLineParser {
+class CsvLogLineParser(config: ResolvedConfig, headers: List[String])
+  extends LogLineParser {
   private val csvParser = new CsvParser()
   private val timestampFieldName: String = config.fieldNames.timestampFieldName
   private val levelFieldName: String = config.fieldNames.levelFieldName
   private val messageFieldName: String = config.fieldNames.messageFieldName
-  private val stackTraceFieldName: String = config.fieldNames.stackTraceFieldName
-  private val loggerNameFieldName: String = config.fieldNames.loggerNameFieldName
-  private val threadNameFieldName: String = config.fieldNames.threadNameFieldName
+  private val stackTraceFieldName: String =
+    config.fieldNames.stackTraceFieldName
+  private val loggerNameFieldName: String =
+    config.fieldNames.loggerNameFieldName
+  private val threadNameFieldName: String =
+    config.fieldNames.threadNameFieldName
 
   private val knownFieldNames: Seq[String] = Seq(
     timestampFieldName,
@@ -40,7 +44,8 @@ class CsvLogLineParser(config: ResolvedConfig, headers: List[String]) extends Lo
     val loggerName = fieldsMap.get(loggerNameFieldName)
     val threadName = fieldsMap.get(threadNameFieldName)
 
-    val otherAttributes = fieldsMap.view.filterKeys(!knownFieldNames.contains(_)).toMap
+    val otherAttributes =
+      fieldsMap.view.filterKeys(!knownFieldNames.contains(_)).toMap
 
     ParseResult(
       raw = s,
@@ -68,4 +73,4 @@ object CsvLogLineParser {
     val headers = csvParser.parseLine(headerLine)
     new CsvLogLineParser(config, headers)
   }
-}
+}
diff --git a/json-log-viewer/shared/src/main/scala/ru/d10xa/jsonlogviewer/decline/Config.scala b/json-log-viewer/shared/src/main/scala/ru/d10xa/jsonlogviewer/decline/Config.scala
@@ -2,7 +2,6 @@ package ru.d10xa.jsonlogviewer.decline
 
 import ru.d10xa.jsonlogviewer.decline.Config.ConfigGrep
 import ru.d10xa.jsonlogviewer.query.QueryAST
-
 import scala.util.matching.Regex
 
 final case class Config(
diff --git a/json-log-viewer/shared/src/main/scala/ru/d10xa/jsonlogviewer/decline/DeclineOpts.scala b/json-log-viewer/shared/src/main/scala/ru/d10xa/jsonlogviewer/decline/DeclineOpts.scala
@@ -7,7 +7,6 @@ import cats.syntax.all.*
 import com.monovore.decline.*
 import com.monovore.decline.time.*
 import com.monovore.decline.Opts
-
 import java.time.ZonedDateTime
 import ru.d10xa.jsonlogviewer.decline.Config.ConfigGrep
 import ru.d10xa.jsonlogviewer.decline.Config.FormatIn
@@ -130,15 +129,15 @@ object DeclineOpts {
       showEmptyFields
     ).mapN {
       case (
-        configFile,
-        fieldNamesConfig,
-        timestampConfig,
-        grepConfig,
-        filterConfig,
-        formatIn,
-        formatOut,
-        showEmptyFields
-        ) =>
+            configFile,
+            fieldNamesConfig,
+            timestampConfig,
+            grepConfig,
+            filterConfig,
+            formatIn,
+            formatOut,
+            showEmptyFields
+          ) =>
         Config(
           configFile = configFile,
           fieldNames = fieldNamesConfig,
diff --git a/json-log-viewer/shared/src/main/scala/ru/d10xa/jsonlogviewer/decline/FormatInValidator.scala b/json-log-viewer/shared/src/main/scala/ru/d10xa/jsonlogviewer/decline/FormatInValidator.scala
@@ -10,6 +10,6 @@ object FormatInValidator {
   ): Validated[NonEmptyList[String], FormatIn] = str match
     case "json"   => Validated.valid(FormatIn.Json)
     case "logfmt" => Validated.valid(FormatIn.Logfmt)
-    case "csv" => Validated.valid(FormatIn.Csv)
+    case "csv"    => Validated.valid(FormatIn.Csv)
     case other    => Validated.invalidNel(s"Wrong format: $other")
 }
diff --git a/json-log-viewer/shared/src/main/scala/ru/d10xa/jsonlogviewer/logfmt/LogfmtLogLineParser.scala b/json-log-viewer/shared/src/main/scala/ru/d10xa/jsonlogviewer/logfmt/LogfmtLogLineParser.scala
@@ -64,4 +64,4 @@ object LogfmtLogLineParser:
         (pairs, other.map(_.toString).mkString)
       case other => (Map.empty, other.toString)
 
-end LogfmtLogLineParser
+end LogfmtLogLineParser
diff --git a/json-log-viewer/shared/src/main/scala/ru/d10xa/jsonlogviewer/query/QueryLexer.scala b/json-log-viewer/shared/src/main/scala/ru/d10xa/jsonlogviewer/query/QueryLexer.scala
@@ -9,24 +9,22 @@ object QueryLexer extends RegexParsers:
 
   override protected val whiteSpace: Regex = "[ \t\r\f\n]+".r
 
-  def identifier: Parser[IDENTIFIER] = {
+  def identifier: Parser[IDENTIFIER] =
     "[a-zA-Z_][a-zA-Z0-9_]*".r ^^ { str => IDENTIFIER(str) }
-  }
 
-  def literal: Parser[LITERAL] = {
+  def literal: Parser[LITERAL] =
     """'[^']*'""".r ^^ { str =>
       val content = str.substring(1, str.length - 1)
       LITERAL(content)
     }
-  }
-  def equal: Parser[QueryToken] = { "=" ^^ (_ => EQUAL) }
-  def notEqual: Parser[QueryToken] = { "!=" ^^ (_ => NOT_EQUAL) }
-  def or: Parser[QueryToken] = { "OR" ^^ (_ => OR) }
-  def and: Parser[QueryToken] = { "AND" ^^ (_ => AND) }
-  def like: Parser[QueryToken] = { "LIKE" ^^ (_ => LIKE) }
-  def notlike: Parser[QueryToken] = { "NOT LIKE" ^^ (_ => NOTLIKE) }
-  def lparen: Parser[QueryToken] = { "(" ^^ (_ => LPAREN) }
-  def rparen: Parser[QueryToken] = { ")" ^^ (_ => RPAREN) }
+  def equal: Parser[QueryToken] = "=" ^^ (_ => EQUAL)
+  def notEqual: Parser[QueryToken] = "!=" ^^ (_ => NOT_EQUAL)
+  def or: Parser[QueryToken] = "OR" ^^ (_ => OR)
+  def and: Parser[QueryToken] = "AND" ^^ (_ => AND)
+  def like: Parser[QueryToken] = "LIKE" ^^ (_ => LIKE)
+  def notlike: Parser[QueryToken] = "NOT LIKE" ^^ (_ => NOTLIKE)
+  def lparen: Parser[QueryToken] = "(" ^^ (_ => LPAREN)
+  def rparen: Parser[QueryToken] = ")" ^^ (_ => RPAREN)
 
   def tokens: Parser[List[QueryToken]] =
     phrase(

Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@ class ConfigYamlLoaderImpl extends ConfigYamlLoader {`
`193`	`193`	`parseOptionalString(feedFields, "inlineInput")`
`194`	`194`	`val filterValidated = parseOptionalQueryAST(feedFields, "filter")`
`195`	`195`	`val formatInValidated`
`196`		`- : Validated[NonEmptyList[String], Option[FormatIn]] =`
	`196`	`+ : Validated[NonEmptyList[String], Option[FormatIn]] =`
`197`	`197`	`parseOptionalFormatIn(feedFields, "formatIn")`
`198`	`198`	`val fieldNamesValidated =`
`199`	`199`	`parseOptionalFieldNames(feedFields, "fieldNames")`
`@@ -246,7 +246,8 @@ class ConfigYamlLoaderImpl extends ConfigYamlLoader {`
`246`	`246`	`val showEmptyFieldsValidated =`
`247`	`247`	`parseOptionalBoolean(fields, "showEmptyFields")`
`248`	`248`
`249`		`- (fieldNamesValidated, feedsValidated, showEmptyFieldsValidated).mapN(ConfigYaml.apply)`
	`249`	`+ (fieldNamesValidated, feedsValidated, showEmptyFieldsValidated)`
	`250`	`+ .mapN(ConfigYaml.apply)`
`250`	`251`	`}`
`251`	`252`	`}`
`252`	`253`	`}`