src/main/kotlin/creator/field-validation.kt diff

← → edited src/main/kotlin/creator/field-validation.kt

Ignore whitespaces Open in IDE

⁠ joseph burton: Minecraft new project wizard (#1933 )

* Forge creator almost working

* Store authors and website for next time the user uses the creator

* Don't allow for dialog submission before a latent step is finished

* Fabric mod creator

* Add modid.mixins.json to Forge project creator

* Start with Architectury creator

* Fix long-running tasks that need to run after one another

* Apply website in Forge creator

* Set the correct gradle version in the Forge project creator

* Architectury should be finished but it's not working, not sure why

* Add support for custom build systems via extension points

* Sponge project creator, first maven implementation

* Remove unsupported platforms from the readme

* Add missing platforms to readme

* Replace some silly code with less silly code

* Add Spigot and Paper creators

* Add Velocity creator

* Add BungeeCord and Waterfall creator

* Delete unused code

* ktlint format

* Apply the correct JDK version depending on the platform and version

* Fix license years after merge

* Improvements and fixes to JDK selector UI

* Fix architectury template

* Fix issues with Sponge creator

* Fix IncorrectOperationException in AbstractLatentStep

* Add option to create a git repo (which also creates a gitignore)

* UI improvements

* Add a message encouraging users to report outdated templates

* Add note to project wizard outdated form warning not to request new platforms

* Paper before Spigot

* Remove dependency on TemplateMakerFabric

* Reorganize creators into multiple files and repackage some things

* Improve documentation

* Improve ergonomics for build system properties, main class name, repository, issue tracker

* Limit Sponge API version to 8 and above in dropdown box

* Prevent class name from messing up when the project name contains dots

Copy Copy

/*
* Minecraft Dev for IntelliJ
*
* https://minecraftdev.org
*
* Copyright (c) 2023 minecraft-dev
*
* MIT License
*/

package com.demonwav.mcdev.creator

import com.demonwav.mcdev.creator.exception.BadListSetupException
import com.demonwav.mcdev.creator.exception.EmptyInputSetupException
import com.demonwav.mcdev.creator.exception.InvalidClassNameException
import com.demonwav.mcdev.util.isJavaKeyword
import javax.swing.JTextField

@Target(AnnotationTarget.FIELD)
@Retention(AnnotationRetention.RUNTIME)
annotation class ValidatedField(vararg val value: ValidatedFieldType)

enum class ValidatedFieldType {
NON_BLANK {
override fun validate(field: JTextField) {
if (field.text.isBlank()) {
throw EmptyInputSetupException(field)
}
}
},
CLASS_NAME {
override fun validate(field: JTextField) {
if (!isValidClassName(field.text)) {
throw InvalidClassNameException(field)
}
}
},
LIST {
override fun validate(field: JTextField) {
if (!field.text.matches(listPattern)) {
throw BadListSetupException(field)
}
}
};

abstract fun validate(field: JTextField)
}

fun isValidClassName(className: String): Boolean {
// default package
if (!className.contains('.')) {
return false
}
val fieldNameSplit = className.split('.')
// crazy dots
if (fieldNameSplit.any { it.isBlank() } || className.first() == '.' || className.last() == '.') {
return false
}
// invalid character
if (
fieldNameSplit.any { part ->
!part.first().isJavaIdentifierStart() ||
!part.asSequence().drop(1).all { it.isJavaIdentifierPart() }
}
) {
return false
}
// keyword identifier
if (fieldNameSplit.any { it.isJavaKeyword() }) {
return false
}

return true
}

private val listPattern = Regex("""(\s*(\w+)\s*(,\s*\w+\s*)*,?|\[?\s*(\w+)\s*(,\s*\w+\s*)*])?""")

/*
* Minecraft Dev for IntelliJ
*
* https://minecraftdev.org
*
* Copyright (c) 2023 minecraft-dev
*
* MIT License
*/

package com.demonwav.mcdev.creator

import com.demonwav.mcdev.util.isJavaKeyword

fun isValidClassName(className: String): Boolean {
// default package
if (!className.contains('.')) {
return false
}
val fieldNameSplit = className.split('.')
// crazy dots
if (fieldNameSplit.any { it.isBlank() } || className.first() == '.' || className.last() == '.') {
return false
}
// invalid character
if (
fieldNameSplit.any { part ->
!part.first().isJavaIdentifierStart() ||
!part.asSequence().drop(1).all { it.isJavaIdentifierPart() }
}
) {
return false
}
// keyword identifier
if (fieldNameSplit.any { it.isJavaKeyword() }) {
return false
}

return true
}

/* * Minecraft Dev for IntelliJ * * https://minecraftdev.org * * Copyright (c) 2023 minecraft-dev * * MIT License */ package com.demonwav.mcdev.creator import com.demonwav.mcdev.creator.exception.BadListSetupException import com.demonwav.mcdev.creator.exception.EmptyInputSetupException import com.demonwav.mcdev.creator.exception.InvalidClassNameException import com.demonwav.mcdev.util.isJavaKeyword import javax.swing.JTextField @Target(AnnotationTarget.FIELD) @Retention(AnnotationRetention.RUNTIME) annotation class ValidatedField(vararg val value: ValidatedFieldType) enum class ValidatedFieldType { NON_BLANK { override fun validate(field: JTextField) { if (field.text.isBlank()) { throw EmptyInputSetupException(field) } } }, CLASS_NAME { override fun validate(field: JTextField) { if (!isValidClassName(field.text)) { throw InvalidClassNameException(field) } } }, LIST { override fun validate(field: JTextField) { if (!field.text.matches(listPattern)) { throw BadListSetupException(field) } } }; abstract fun validate(field: JTextField) } fun isValidClassName(className: String): Boolean { // default package if (!className.contains('.')) { return false } val fieldNameSplit = className.split('.') // crazy dots if (fieldNameSplit.any { it.isBlank() } || className.first() == '.' || className.last() == '.') { return false } // invalid character if ( fieldNameSplit.any { part -> !part.first().isJavaIdentifierStart() || !part.asSequence().drop(1).all { it.isJavaIdentifierPart() } } ) { return false } // keyword identifier if (fieldNameSplit.any { it.isJavaKeyword() }) { return false } return true } private val listPattern = Regex("""(\s*(\w+)\s*(,\s*\w+\s*)*,?|\[?\s*(\w+)\s*(,\s*\w+\s*)*])?""") /* * Minecraft Dev for IntelliJ * * https://minecraftdev.org * * Copyright (c) 2023 minecraft-dev * * MIT License */ package com.demonwav.mcdev.creator import com.demonwav.mcdev.util.isJavaKeyword fun isValidClassName(className: String): Boolean { // default package if (!className.contains('.')) { return false } val fieldNameSplit = className.split('.') // crazy dots if (fieldNameSplit.any { it.isBlank() } || className.first() == '.' || className.last() == '.') { return false } // invalid character if ( fieldNameSplit.any { part -> !part.first().isJavaIdentifierStart() || !part.asSequence().drop(1).all { it.isJavaIdentifierPart() } } ) { return false } // keyword identifier if (fieldNameSplit.any { it.isJavaKeyword() }) { return false } return true }

Add build comment

Mute test

Server communication failure

Run Custom Build

TODO

Responsibility

Edit tags

Loading...

Are you sure?