diff --git a/build.sbt b/build.sbt index f13e72a12..3937ea625 100644 --- a/build.sbt +++ b/build.sbt @@ -1,6 +1,6 @@ lazy val commonSettings = Seq( version := "1.0.0-beta85", - scalaVersion := "2.13.3" + scalaVersion := "2.13.6" ) val scalaTest = "org.scalatest" %% "scalatest" % "3.2.0" % Test @@ -8,7 +8,7 @@ val sprayJson = "io.spray" %% "spray-json" % "1.3.6" val snakeYaml = "org.yaml" % "snakeyaml" % "1.26" val scaffeine = "com.github.blemale" %% "scaffeine" % "4.0.2" val directories = "io.github.soc" % "directories" % "12" -val fastparse = "com.lihaoyi" %% "fastparse" % "2.2.2" +val fastparse = "com.lihaoyi" %% "fastparse" % "2.3.1" intellijPluginName in ThisBuild := "IntelliJ-Haskell" diff --git a/project/build.properties b/project/build.properties index c06db1bb2..67d27a1df 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.4.5 +sbt.version=1.5.3 diff --git a/project/plugins.sbt b/project/plugins.sbt index d2a9c2f26..382b4e0a4 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("org.jetbrains" % "sbt-idea-plugin" % "3.8.3") +addSbtPlugin("org.jetbrains" % "sbt-idea-plugin" % "3.12.5") resolvers += Resolver.url("jetbrains-bintray", url("https://dl.bintray.com/jetbrains/sbt-plugins/"))(Resolver.ivyStylePatterns) diff --git a/src/main/scala/intellij/haskell/refactor/HaskellNamesValidator.scala b/src/main/scala/intellij/haskell/refactor/HaskellNamesValidator.scala index 7f8565a53..4dfba8c18 100644 --- a/src/main/scala/intellij/haskell/refactor/HaskellNamesValidator.scala +++ b/src/main/scala/intellij/haskell/refactor/HaskellNamesValidator.scala @@ -24,7 +24,7 @@ class HaskellNamesValidator extends NamesValidator { override def isKeyword(name: String, project: Project): Boolean = { val lexer = new HaskellLexer - lexer.start(name.toCharArray) + lexer.start(name) HaskellParserDefinition.ReservedIdS.contains(lexer.getTokenType) || HaskellParserDefinition.ReservedOperators.contains(lexer.getTokenType) || HaskellParserDefinition.SymbolsResOp.contains(lexer.getTokenType)