Update dependencies

Author: rikvdkleij

build.sbt

@@ -1,37 +1,33 @@
 lazy val commonSettings = Seq(
   version := "1.0.0-beta88",
-  scalaVersion := "2.13.6"
+  scalaVersion := "2.13.8"
 )
 
-val scalaTest = "org.scalatest" %% "scalatest" % "3.2.9" % Test
+val scalaTest = "org.scalatest" %% "scalatest" % "3.2.12" % Test
 val sprayJson = "io.spray" %% "spray-json" % "1.3.6"
-val snakeYaml = "org.yaml" % "snakeyaml" % "1.29"
-val scaffeine = "com.github.blemale" %% "scaffeine" % "5.1.1"
+val snakeYaml = "org.yaml" % "snakeyaml" % "1.30"
+val scaffeine = "com.github.blemale" %% "scaffeine" % "5.1.2"
 val directories = "io.github.soc" % "directories" % "12"
 val fastparse = "com.lihaoyi" %% "fastparse" % "2.3.3"
 
-intellijPluginName in ThisBuild := "IntelliJ-Haskell"
+(ThisBuild / intellijPluginName) := "IntelliJ-Haskell"
 
 lazy val intellijHaskell = (project in file(".")).
   enablePlugins(SbtIdeaPlugin).
   settings(commonSettings: _*).
   settings(
     name := "IntelliJ Haskell",
     javacOptions in Global ++= Seq("-source", "1.8", "-target", "1.8"),
-    scalacOptions in Global ++= Seq("-target:jvm-1.8", "-deprecation", "-feature"),
+    scalacOptions in Global ++= Seq("-target:jvm-1.8", "-deprecation", "-feature", "-unchecked"),
     libraryDependencies += scalaTest,
     libraryDependencies += sprayJson,
     libraryDependencies += snakeYaml,
     libraryDependencies += scaffeine,
     libraryDependencies += directories,
     libraryDependencies += fastparse,
-    unmanagedSourceDirectories in Compile += baseDirectory.value / "gen"
+    (Compile / unmanagedSourceDirectories) += baseDirectory.value / "gen"
   )
 
-intellijBuild in ThisBuild := "212.4746.92"
+(ThisBuild / intellijBuild) := "212.4746.92"
 
 intellijPlugins += "com.intellij.java".toPlugin
-
-// Get rid of:
-//   Unrecognized VM option 'UseConcMarkSweepGC'
-intellijVMOptions := intellijVMOptions.value.copy(gc = "")

project/build.properties

@@ -1 +1 @@
-sbt.version=1.5.5
+sbt.version=1.6.2

project/plugins.sbt

@@ -1,4 +1,4 @@
-addSbtPlugin("org.jetbrains" % "sbt-idea-plugin" % "3.13.1")
+addSbtPlugin("org.jetbrains" % "sbt-idea-plugin" % "3.14.3")
 
 resolvers += Resolver.url("jetbrains-bintray",
   url("https://dl.bintray.com/jetbrains/sbt-plugins/"))(Resolver.ivyStylePatterns)

src/main/scala/intellij/haskell/external/component/HLintRefactoringsParser.scala

@@ -33,12 +33,14 @@ object HLintRefactoringsParser {
     case Failure(label, i, _) => Left(s"Could not parse HLint output | HLintOutput: $hlintOutput | Label: $label | Index: $i")
   }
 
+  @annotation.nowarn
   private def refactoringParser[_: P]: P[Refactoring] = P("[" ~ (deleteParser | replaceParser | modifyCommentParser | insertCommentParser | removeAsKeywordParser) ~ "]")
 
   private[component] def parseSubts(hlintOutput: String): Parsed[Subts] = parse(hlintOutput, subtsParser(_), verboseFailures = true)
 
   private[component] def parsePos(hlintOutput: String): Parsed[SrcSpan] = parse(hlintOutput, posParser(_), verboseFailures = true)
 
+  @annotation.nowarn
   private def deleteParser[_: P]: P[Delete] = P("Delete" ~ keyRtypePosParser(Pass)).map({ case (x, y, _) => Delete(x, y) })
 
   private def replaceParser[_: P]: P[Replace] = P("Replace" ~ keyRtypePosParser(commaParser ~ "subts =" ~ subtsParser ~ commaParser ~ keyValueParser("orig", string)) ~ (commaParser ~ deleteParser).rep)
@@ -83,11 +85,13 @@ object HLintRefactoringsParser {
 
   private def string[_: P] = P("\"" ~/ (strChars | escape).rep.! ~ "\"")
 
+  @annotation.nowarn
   private def digits[_: P] = P(CharsWhileIn("0-9"))
 
+  @annotation.nowarn
   private def keyValueParser[_: P, A](keyName: String, valueParser: => P[A]) = s"$keyName" ~ "=" ~ valueParser
 
-  private def keyDigitsParser[_: P](keyName: String) = keyValueParser[P[String], String](keyName, digits.!).map(_.toInt)
+  private def keyDigitsParser[p: P](keyName: String) = keyValueParser[p, String](keyName, digits.!).map(_.toInt)
 
   private def keyRtypeParser[_: P] = keyValueParser("rtype", rtypeParser)
 

src/main/scala/intellij/haskell/external/component/HaskellDocumentationProvider.scala

@@ -31,12 +31,11 @@ class HaskellDocumentationProvider extends AbstractDocumentationProvider {
   override def getQuickNavigateInfo(element: PsiElement, originalElement: PsiElement): String = {
     val project = Option(element).map(_.getProject)
     if (project.exists(p => !StackProjectManager.isInitializing(p))) {
-      (Option(element), Option(originalElement)) match {
-        case (Some(e), Some(oe)) =>
-          val psiFile = e.getContainingFile.getOriginalFile
+      (Option(element.getContainingFile), Option(originalElement)) match {
+        case (Some(file), Some(oe)) =>
+          val psiFile = file.getOriginalFile
           val moduleName = HaskellPsiUtil.findModuleName(psiFile)
-          val originalPsiFile = e.getContainingFile.getOriginalFile
-          val isSourceFile = HaskellProjectUtil.isSourceFile(originalPsiFile)
+          val isSourceFile = HaskellProjectUtil.isSourceFile(psiFile)
           val typeSignature = if (isSourceFile) {
             TypeInfoComponent.findTypeInfoForElement(oe).toOption.map(_.typeSignature).map(StringUtil.escapeString)
           } else {