refactor: Refactor searching for config and remove handling of no lon…

…ger relevant option
kasiaMarek · Oct 27, 2023 · f985a07 · f985a07
1 parent 238fcde
commit f985a07
Showing 1 changed file with 3 additions and 10 deletions.
diff --git a/metals/src/main/scala/scala/meta/internal/metals/FormattingProvider.scala b/metals/src/main/scala/scala/meta/internal/metals/FormattingProvider.scala
@@ -234,10 +234,6 @@ final class FormattingProvider(
           tables.dismissedNotifications.CreateScalafmtFile
             .dismiss(24, TimeUnit.HOURS)
           None
-        } else if (item == Messages.dontShowAgain) {
-          tables.dismissedNotifications.CreateScalafmtFile
-            .dismissForever()
-          None
         } else None
       }
     } else Future.successful(None)
@@ -425,13 +421,10 @@ final class FormattingProvider(
     val configpath = userConfig().scalafmtConfigPath
     val default: Option[AbsolutePath] = {
       val defaultLocation = projectRoot.resolve(defaultScalafmtLocation)
-      lazy val scalacliDefault =
+      val scalacliDefault =
         projectRoot.resolve(".scala-build/.scalafmt.conf")
-      lazy val hiddenDefault = projectRoot.resolve(Directories.hiddenScalafmt)
-      if (defaultLocation.exists) Some(defaultLocation)
-      else if (scalacliDefault.exists) Some(scalacliDefault)
-      else if (hiddenDefault.exists) Some(hiddenDefault)
-      else None
+      val hiddenDefault = projectRoot.resolve(Directories.hiddenScalafmt)
+      List(defaultLocation, scalacliDefault, hiddenDefault).find(_.exists)
     }
     configpath.orElse(default)
   }