Update cucumber-jvm-scala and plugins

Author: vbmacher

build.gradle

@@ -1,17 +1,17 @@
 ext.versions = [
         scala      : '2.12',
         scalaFull  : '2.12.11',
-        gherkin    : '202.5428.22',
-        idea       : '202.5428.22-EAP-SNAPSHOT',
-        scalaPlugin: '2020.2.8'
+        gherkin    : '202.5958.19',
+        idea       : '202.5958.24-EAP-SNAPSHOT',
+        scalaPlugin: '2020.2.12'
 ]
 
 ext.libs = [
         jUnit          : 'junit:junit:4.13',
         scala          : "org.scala-lang:scala-library:${versions.scalaFull}",
-        cucumberScala  : "io.cucumber:cucumber-scala_${versions.scala}:5.7.0",
-        cucumberJUnit  : 'io.cucumber:cucumber-junit:5.7.0',
-        scalatest      : "org.scalatest:scalatest_${versions.scala}:3.1.2",
+        cucumberScala  : "io.cucumber:cucumber-scala_${versions.scala}:6.1.2",
+        cucumberJUnit  : 'io.cucumber:cucumber-junit:6.1.2',
+        scalatest      : "org.scalatest:scalatest_${versions.scala}:3.2.0",
         slf4j          : "org.slf4j:slf4j-log4j12:1.7.30"
 ]
 

cucumber-scala/build.gradle

@@ -36,8 +36,8 @@ runIde {
 }
 
 patchPluginXml {
-    sinceBuild "202.5428"
-    untilBuild "202.5428.*"
+    sinceBuild "202.5958"
+    untilBuild "202.5958.*"
 }
 
 buildSearchableOptions.enabled = false

cucumber-scala/src/main/scala/com/github/vbmacher/intellij/cucumber/scala/steps/CucumberStep.scala

@@ -5,7 +5,8 @@ import java.util
 import CucumberStep.DT
 import io.cucumber.core.gherkin
 import io.cucumber.core.gherkin.{DataTableArgument, Step, StepType}
-import io.cucumber.core.internal.gherkin.GherkinDialectProvider
+import io.cucumber.gherkin.GherkinDialectProvider
+import io.cucumber.plugin.event.Location
 import org.jetbrains.plugins.cucumber.psi.{GherkinStep, GherkinTable}
 
 import scala.collection.JavaConverters._
@@ -27,26 +28,28 @@ class CucumberStep(step: GherkinStep) extends Step {
     if (table.nonEmpty) new DT(table.get) else null
   }
 
-  override val getKeyWord: String = step.getKeyword.getText
-
   override def getType: StepType = {
-    val keyword = getKeyWord.trim
+    val keyword = getKeyword.trim
     if (StepType.isAstrix(keyword)) StepType.OTHER
     else {
       keywordStepType.getOrElse(
         keyword,
-        throw new IllegalStateException("Keyword " + getKeyWord + " was neither given, when, then, and, but nor *")
+        throw new IllegalStateException(s"Keyword $getKeyword was neither given, when, then, and, but nor *")
       )
     }
   }
 
-  override def getPreviousGivenWhenThenKeyWord: String = null
-
   override def getText: String = step.getSubstitutedName
 
   override def getId: String = step.getName
 
   override def getLine: Int = 0
+
+  override val getPreviousGivenWhenThenKeyword: String = null
+
+  override val getKeyword: String = step.getKeyword.getText
+
+  override val getLocation: Location = null
 }
 object CucumberStep {