upgraded to IDEA 2022.1 EAP

timaliberdov · Feb 1, 2022 · 1d83825 · 1d83825
1 parent 382ec39
commit 1d83825
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,3 +15,4 @@
 *~
 target/
 out/
+.bsp
diff --git a/build.sbt b/build.sbt
@@ -1,13 +1,13 @@
 import org.jetbrains.sbtidea.Keys._
 
 ThisBuild / intellijPluginName := "intellij-hocon"
-ThisBuild / intellijBuild := "212.3724.25"
+ThisBuild / intellijBuild := "221.3427.89"
 
 val junitInterfaceVersion = "0.11"
 
 lazy val hocon = project.in(file(".")).enablePlugins(SbtIdeaPlugin).settings(
-  scalaVersion := "2.13.6",
-  version := "2021.2.99-SNAPSHOT",
+  scalaVersion := "2.13.8",
+  version := "2022.1.99-SNAPSHOT",
   Compile / scalaSource := baseDirectory.value / "src",
   Test / scalaSource := baseDirectory.value / "test",
   Compile / resourceDirectory := baseDirectory.value / "resources",

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.5.1
+sbt.version=1.6.1
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,2 +1,2 @@
-addSbtPlugin("org.jetbrains" % "sbt-idea-plugin" % "3.12.4")
-addSbtPlugin("org.jetbrains" % "sbt-ide-settings" % "1.1.0")
+addSbtPlugin("org.jetbrains" % "sbt-idea-plugin" % "3.13.7")
+addSbtPlugin("org.jetbrains.scala" % "sbt-ide-settings" % "1.1.1")
diff --git a/resources/META-INF/plugin.xml b/resources/META-INF/plugin.xml
@@ -3,9 +3,9 @@
     <id>org.jetbrains.plugins.hocon</id>
     <name>HOCON</name>
     <description>Standalone HOCON plugin for IntelliJ IDEA</description>
-    <version>2021.2.99-SNAPSHOT</version>
+    <version>2022.1.99-SNAPSHOT</version>
     <vendor>Roman Janusz, AVSystem, JetBrains</vendor>
-    <idea-version since-build="211.0" until-build="220.0"/>
+    <idea-version since-build="221.0" until-build="230.0"/>
     <depends>com.intellij.modules.platform</depends>
     <depends>com.intellij.modules.lang</depends>
     <depends optional="true" config-file="hocon-java.xml">com.intellij.modules.java</depends>

diff --git a/src/org/jetbrains/plugins/hocon/navigation/gotoHandlers.scala b/src/org/jetbrains/plugins/hocon/navigation/gotoHandlers.scala
@@ -45,6 +45,6 @@ class HoconGotoNextAction extends HoconGotoPrevNextAction(reverse = false)
 final class HoconGotoPrevNextPromoter extends ActionPromoter {
   // prioritize HoconGoto{Prev,Next}Action over GotoImplementationAction & GotoSuperAction in HOCON files
   // ideally these two actions should be completely disabled in HOCON files but I don't know how
-  def promote(actions: JList[_ <: AnAction], context: DataContext): JList[AnAction] =
+  override def promote(actions: JList[_ <: AnAction], context: DataContext): JList[AnAction] =
     actions.iterator.asScala.collectOnly[HoconGotoPrevNextAction].toJList
 }
diff --git a/test/org/jetbrains/plugins/hocon/HoconTestUtils.scala b/test/org/jetbrains/plugins/hocon/HoconTestUtils.scala
@@ -1,15 +1,14 @@
 package org.jetbrains.plugins.hocon
 
 import java.io.File
-
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.Computable
 import com.intellij.openapi.vfs.{LocalFileSystem, VirtualFile}
 import com.intellij.psi.{PsiFile, PsiManager}
 import org.jetbrains.plugins.hocon.psi.HoconPsiFile
 
-import scala.annotation.tailrec
+import scala.annotation.{nowarn, tailrec}
 
 trait HoconTestUtils {
   def testdataPath: String = HoconTestUtils.TestdataPath
@@ -43,6 +42,7 @@ trait HoconTestUtils {
     ApplicationManager.getApplication match {
       case application if application.isWriteAccessAllowed => body
       case application =>
+        @nowarn("msg=deprecated")
         val computable: Computable[T] = () => body
         application.runWriteAction(computable)
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,3 +15,4 @@ @@
     *~
     target/
     out/
+    .bsp