Implementing the New Project Wizard. Some housekeeping (#471)

zio · May 17, 2024 · ec7439f · ec7439f
1 parent 41d6f57
commit ec7439f
Show file tree

Hide file tree

Showing 21 changed files with 818 additions and 696 deletions.
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -342,9 +342,9 @@
 
         <testCreator language="Scala" implementationClass="zio.intellij.testsupport.ZTestCreator" order="first" />
 
-        <!-- Project template -->
-        <projectTemplatesFactory implementation="zio.intellij.project.ZioProjectTemplateFactory" order="last"/>
-
+        <!-- new project wizard -->
+        <moduleBuilder builderClass="zio.intellij.project.npw.ZioModuleBuilderAdapter" />
+        
         <!-- debugging -->
         <debuggerClassFilterProvider implementation="zio.intellij.debugger.ZioSteppingFilterProvider"/>
 

diff --git a/src/main/scala/zio/intellij/inspections/ZInspection.scala b/src/main/scala/zio/intellij/inspections/ZInspection.scala
@@ -7,7 +7,7 @@ import org.jetbrains.plugins.scala.codeInspection.collections.OperationOnCollect
 import org.jetbrains.plugins.scala.codeInspection.collections._
 import org.jetbrains.plugins.scala.lang.psi.ScalaPsiUtil
 import org.jetbrains.plugins.scala.lang.psi.api.expr.ScExpression
-import zio.intellij.utils.{ModuleSyntax, Version}
+import zio.intellij.utils.{ModuleSyntax, ZioVersion}
 
 import javax.swing.JComponent
 
@@ -18,7 +18,7 @@ abstract class ZInspection(simplifiers: SimplificationType*) extends OperationOn
 
   final override def possibleSimplificationTypes: Seq[SimplificationType] = simplifiers
 
-  protected def isAvailable(zioVersion: Version): Boolean = zioVersion >= Version.ZIO.`1.0.0`
+  protected def isAvailable(zioVersion: ZioVersion): Boolean = zioVersion >= ZioVersion.ZIO.`1.0.0`
 
   private def isInspectionAvailable(inspection: ZInspection, element: PsiElement): Boolean =
     Option(ScalaPsiUtil.getModule(element))

diff --git a/src/main/scala/zio/intellij/inspections/simplifications/SimplifyForeachInspection.scala b/src/main/scala/zio/intellij/inspections/simplifications/SimplifyForeachInspection.scala
@@ -5,7 +5,7 @@ import org.jetbrains.plugins.scala.lang.psi.api.expr.{ScExpression, ScFor}
 import zio.intellij.inspections._
 import zio.intellij.inspections.zioMethods.`.*>`
 import zio.intellij.utils.StringUtils._
-import zio.intellij.utils.Version
+import zio.intellij.utils.ZioVersion
 import zio.intellij.utils.types.ZioType
 
 class SimplifyForeachInspectionZIO1
@@ -17,8 +17,8 @@ class SimplifyForeachInspectionZIO1
       ForeachParChainSimplificationType("foreachPar_"),
       ForeachParNChainSimplificationType
     ) {
-  override protected def isAvailable(zioVersion: Version): Boolean =
-    zioVersion >= Version.ZIO.`1.0.0` && zioVersion < Version.ZIO.`2.0.0`
+  override protected def isAvailable(zioVersion: ZioVersion): Boolean =
+    zioVersion >= ZioVersion.ZIO.`1.0.0` && zioVersion < ZioVersion.ZIO.`2.0.0`
 }
 
 class SimplifyForeachInspectionZIO2
@@ -28,7 +28,7 @@ class SimplifyForeachInspectionZIO2
       ForeachChainSimplificationType("foreachDiscard"),
       ForeachParChainSimplificationType("foreachParDiscard")
     ) {
-  override protected def isAvailable(zioVersion: Version): Boolean = zioVersion >= Version.ZIO.`2.0.0`
+  override protected def isAvailable(zioVersion: ZioVersion): Boolean = zioVersion >= ZioVersion.ZIO.`2.0.0`
 }
 
 sealed abstract class BaseForeachSimplificationType(methodName: String) extends SimplificationType {

diff --git a/src/main/scala/zio/intellij/inspections/simplifications/SimplifyMapBothInspection.scala b/src/main/scala/zio/intellij/inspections/simplifications/SimplifyMapBothInspection.scala
@@ -6,11 +6,11 @@ import org.jetbrains.plugins.scala.lang.psi.impl.ScalaPsiElementFactory
 import zio.intellij.inspections._
 import zio.intellij.inspections.zioMethods._
 import zio.intellij.utils.StringUtils._
-import zio.intellij.utils.Version
-import zio.intellij.utils.Version.ZIO
+import zio.intellij.utils.ZioVersion
+import zio.intellij.utils.ZioVersion.ZIO
 
 class SimplifyMapBothInspection extends ZInspection(MapBothSimplificationType) {
-  override protected def isAvailable(zioVersion: Version): Boolean = zioVersion >= ZIO.`1.0.10`
+  override protected def isAvailable(zioVersion: ZioVersion): Boolean = zioVersion >= ZIO.`1.0.10`
 }
 
 object MapBothSimplificationType extends SimplificationType {

diff --git a/src/main/scala/zio/intellij/inspections/simplifications/SimplifyServiceWithInspection.scala b/src/main/scala/zio/intellij/inspections/simplifications/SimplifyServiceWithInspection.scala
@@ -20,7 +20,7 @@ class SimplifyServiceWithInspection
       ServiceWithSimplificationTypeZIO2,
       ServiceWithZIOSimplificationTypeZIO2
     ) {
-  override protected def isAvailable(zioVersion: Version): Boolean = zioVersion >= Version.ZIO.`1.0.6`
+  override protected def isAvailable(zioVersion: ZioVersion): Boolean = zioVersion >= ZioVersion.ZIO.`1.0.6`
 }
 
 abstract class ServiceWithSimplificationType extends SimplificationType {