[#64] Fix input filter in StepIndex + unit tests

Author: vbmacher

cucumber-scala/src/main/scala/com/github/vbmacher/intellij/cucumber/scala/ScCucumberStepIndex.java

@@ -3,15 +3,17 @@
 import com.intellij.lang.LighterAST;
 import com.intellij.lang.LighterASTNode;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.psi.impl.source.JavaFileElementType;
 import com.intellij.psi.impl.source.tree.RecursiveLighterASTNodeWalkingVisitor;
 import com.intellij.util.indexing.*;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.plugins.cucumber.CucumberStepIndex;
 import org.jetbrains.plugins.scala.ScalaFileType;
 import org.jetbrains.plugins.scala.lang.parser.ScalaElementType;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 public class ScCucumberStepIndex extends CucumberStepIndex {
     private final static String[] PACKAGES = new String[ScCucumberUtil.CUCUMBER_PACKAGES().length()];
@@ -25,7 +27,7 @@ public class ScCucumberStepIndex extends CucumberStepIndex {
     private final FileBasedIndex.InputFilter inputFilter = new DefaultFileTypeSpecificInputFilter(ScalaFileType.INSTANCE) {
         @Override
         public boolean acceptInput(@NotNull VirtualFile file) {
-            return super.acceptInput(file) && JavaFileElementType.isInSourceContent(file);
+            return super.acceptInput(file);
         }
     };
 

cucumber-scala/src/test/resources/example-stepdefs-lib/example-stepdefs-lib-1.0.0-sources.jar

@@ -0,0 +1,4 @@
+Feature: Something
+
+  Scenario: Adding
+    When I add 5 and 6

cucumber-scala/src/test/resources/example-stepdefs-lib/example-stepdefs-lib-1.0.0.jar

@@ -0,0 +1,18 @@
+package com.github.vbmacher.intellij.cucumber.scala
+
+import java.io.File
+import java.net.URL
+
+import com.intellij.openapi.module.Module
+import com.intellij.openapi.roots.ModifiableRootModel
+import com.intellij.testFramework.PsiTestUtil
+
+case class LocalDependency(libraryName: String, jarPath: URL, srcPath: URL) extends Dependency {
+
+  def addToModule(module: Module, model: ModifiableRootModel): Unit = {
+    PsiTestUtil.newLibrary(libraryName)
+        .classesRoot(new File(jarPath.toURI).getPath)
+        .sourceRoot(new File(srcPath.toURI).getPath)
+        .addTo(model)
+  }
+}

cucumber-scala/src/test/resources/testdata/stepsInLibrary/testcase.feature

@@ -13,7 +13,7 @@ abstract class ScCucumberSpecBase extends BasePlatformTestCase with AnyFunSpecLi
   protected lazy val LOG = Logger.getRootLogger
 
   val DESCRIPTOR = new LibraryLightProjectDescriptor(
-    RemoteDependency("io.cucumber:cucumber-scala_2.12:5.7.0")
+    //RemoteDependency("io.cucumber:cucumber-scala_2.12:6.1.2")
   )
 
   @Before

cucumber-scala/src/test/scala/com/github/vbmacher/intellij/cucumber/scala/LocalDependency.scala

@@ -0,0 +1,22 @@
+package com.github.vbmacher.intellij.cucumber.scala.resolve
+
+import com.github.vbmacher.intellij.cucumber.scala.{LibraryLightProjectDescriptor, LocalDependency}
+import org.junit.Test
+
+class StepResolveLibrarySpec extends StepResolveSpecBase {
+
+  override val DESCRIPTOR = new LibraryLightProjectDescriptor(
+    LocalDependency(
+      "example-stepdefs-lib",
+      classOf[StepResolveLibrarySpec].getResource("/example-stepdefs-lib/example-stepdefs-lib-1.0.0.jar"),
+      classOf[StepResolveLibrarySpec].getResource("/example-stepdefs-lib/example-stepdefs-lib-1.0.0-sources.jar")
+    )
+  )
+
+  private val checkResolveDirect = singleResolve("stepsInLibrary/testcase.feature") _
+
+  @Test
+  def testResolveSimple(): Unit = {
+    checkResolveDirect("I add 5 and 6")
+  }
+}

cucumber-scala/src/test/scala/com/github/vbmacher/intellij/cucumber/scala/ScCucumberSpecBase.scala

@@ -0,0 +1,35 @@
+plugins {
+  id 'scala'
+  id 'maven-publish'
+}
+
+
+group 'com.github.vbmacher.cucumber'
+version '1.0.0'
+
+dependencies {
+    implementation libs.scala
+    implementation(libs.cucumberScala) {
+        exclude group: 'org.scala-lang', module: 'scala-library'
+    }
+}
+
+java {
+    withJavadocJar()
+    withSourcesJar()
+}
+
+repositories {
+    mavenLocal()
+    mavenCentral()
+}
+
+
+publishing {
+    publications {
+        maven(MavenPublication) {
+            from components.java
+        }
+    }
+}
+

cucumber-scala/src/test/scala/com/github/vbmacher/intellij/cucumber/scala/resolve/StepResolveLibrarySpec.scala

@@ -0,0 +1,19 @@
+package cucumbersteps
+
+import io.cucumber.scala.{EN, ScalaDsl}
+
+class StepDefinitions extends ScalaDsl with EN {
+
+  When("""^I add (\d+) and (\d+)$"""){ (arg1: Double, arg2: Double) =>
+    println(s"Adding $arg1 and $arg2")
+  }
+
+  When("I sub (\\d+)" + " and " + "(\\d+)") {
+    (arg1: Double, arg2: Double) =>
+      println(s"Sub $arg1 and $arg2")
+  }
+
+  When("I div " + (5 + 5) + " by " + (10 - 8)) {
+    println(s"Div 10 bt 2")
+  }
+}

example-stepdefs-lib/build.gradle

@@ -2,3 +2,5 @@ rootProject.name = 'intellij-cucumber-scala'
 
 include 'cucumber-scala'
 include 'example'
+include 'example-stepdefs-lib'
+