Make main class name validation much more rigorous (Fixes #226)

DenWav · DenWav · commit 1f02159f50f4 · 2017-05-31T10:40:04.000-05:00
diff --git a/src/main/kotlin/com/demonwav/mcdev/creator/MinecraftModuleBuilder.kt b/src/main/kotlin/com/demonwav/mcdev/creator/MinecraftModuleBuilder.kt
@@ -55,7 +55,7 @@ class MinecraftModuleBuilder : JavaModuleBuilder() {
         creator.root = root
         creator.module = modifiableRootModel.module
 
-        val r = DumbAwareRunnable { creator.create() }
+        val r = DumbAwareRunnable(creator::create)
 
         if (project.isDisposed) {
             return
diff --git a/src/main/kotlin/com/demonwav/mcdev/creator/MinecraftModuleWizardStep.kt b/src/main/kotlin/com/demonwav/mcdev/creator/MinecraftModuleWizardStep.kt
@@ -12,6 +12,7 @@ package com.demonwav.mcdev.creator
 
 import com.demonwav.mcdev.exception.BadListSetupException
 import com.demonwav.mcdev.exception.EmptyInputSetupException
+import com.demonwav.mcdev.exception.InvalidMainClassNameException
 import com.demonwav.mcdev.exception.SetupException
 import com.intellij.ide.util.projectWizard.ModuleWizardStep
 import com.intellij.openapi.ui.MessageType
@@ -37,9 +38,26 @@ abstract class MinecraftModuleWizardStep : ModuleWizardStep() {
                 throw EmptyInputSetupException(pluginVersionField)
             }
 
-            if (mainClassField.text.trim { it <= ' ' }.isEmpty()) {
+            if (mainClassField.text.trim { it <= ' ' }.isEmpty()) { // empty
                 throw EmptyInputSetupException(mainClassField)
             }
+            if (!mainClassField.text.contains('.')) { // default package
+                throw InvalidMainClassNameException(mainClassField)
+            }
+            if (mainClassField.text.contains("\\s+".toRegex())) { // whitespace
+                throw InvalidMainClassNameException(mainClassField)
+            }
+            if (mainClassField.text.first().isJavaIdentifierStart() && // invalid character
+                mainClassField.text.asSequence().drop(1).all { it.isJavaIdentifierPart() }) {
+                throw InvalidMainClassNameException(mainClassField)
+            }
+            if (mainClassField.text.first() == '.') { // idk why this doesn't fail in the above check, but w/e
+                throw InvalidMainClassNameException(mainClassField)
+            }
+            if (mainClassField.text.split('.').any { keywords.contains(it) }) { // keyword identifier
+                throw InvalidMainClassNameException(mainClassField)
+            }
+
             if (!authorsField.text.matches(pattern)) {
                 throw BadListSetupException(authorsField)
             }
@@ -60,5 +78,11 @@ abstract class MinecraftModuleWizardStep : ModuleWizardStep() {
 
     companion object {
         val pattern = "(\\s*(\\w+)\\s*(,\\s*\\w+\\s*)*,?|\\[?\\s*(\\w+)\\s*(,\\s*\\w+\\s*)*])?".toRegex()
+        val keywords = setOf(
+            "abstract", "continue", "for", "new", "switch", "assert", "default", "goto", "package", "synchronized", "boolean", "do", "if",
+            "private", "this", "break", "double", "implements", "protected", "throw", "byte", "else", "import", "public", "throws", "case",
+            "enum", "instanceof", "return", "transient", "catch", "extends", "int", "short", "try", "char", "final", "interface", "static",
+            "void", "class", "finally", "long", "strictfp", "volatile", "const", "float", "native", "super", "while"
+        )
     }
 }
diff --git a/src/main/kotlin/com/demonwav/mcdev/exception/SetupException.kt b/src/main/kotlin/com/demonwav/mcdev/exception/SetupException.kt
@@ -32,6 +32,11 @@ class EmptyInputSetupException(j: JComponent) : SetupException(j) {
         get() = "<html>Please fill in all required fields</html>"
 }
 
+class InvalidMainClassNameException(j: JComponent) : SetupException(j) {
+    override val error: String
+        get() = "<html>Main Class Name must be a valid Java identifier and cannot be the default package</html>"
+}
+
 class OtherSetupException(val msg: String, j: JComponent) : SetupException(j) {
     override val error: String
         get() = "<html>$msg</html>"
