more robust package_dir, to increase chances that it works with IntelliJ IDEA;
authorwenzelm
Thu, 17 Feb 2022 12:22:47 +0100
changeset 75082 ea4fa50dbb74
parent 75079 8a48a9be91ce
child 75083 35a5c4b16024
more robust package_dir, to increase chances that it works with IntelliJ IDEA;
src/Pure/Tools/scala_project.scala
--- a/src/Pure/Tools/scala_project.scala	Tue Feb 15 16:42:15 2022 +0000
+++ b/src/Pure/Tools/scala_project.scala	Thu Feb 17 12:22:47 2022 +0100
@@ -29,15 +29,12 @@
 
     def package_dir(source_file: Path): Path =
     {
-      val is_java = source_file.is_java
       val dir =
         package_name(source_file) match {
-          case Some(name) =>
-            if (is_java) Path.explode(space_explode('.', name).mkString("/"))
-            else Path.basic(name)
+          case Some(name) => Path.explode(space_explode('.', name).mkString("/"))
           case None => error("Failed to guess package from " + source_file)
         }
-      (if (is_java) java_src_dir else scala_src_dir) + dir
+      (if (source_file.is_java) java_src_dir else scala_src_dir) + dir
     }
   }