User: joe Date: 22 Nov 26 07:38 Revision: 5cd1c63dd403dccd9fc3328dbfbbb46da47ca951 Summary: Field descriptor -> type descriptor TeamCity URL: http://ci.mcdev.io:80/viewModification.html?tab=vcsModificationFiles&modId=10817&personal=false Index: src/main/kotlin/platform/minecraft/unpick/UnpickAnnotator.kt =================================================================== --- src/main/kotlin/platform/minecraft/unpick/UnpickAnnotator.kt (revision 9868154fcedfab64c3a53f247e18073499fecec8) +++ src/main/kotlin/platform/minecraft/unpick/UnpickAnnotator.kt (revision 5cd1c63dd403dccd9fc3328dbfbbb46da47ca951) @@ -42,7 +42,7 @@ import com.demonwav.mcdev.platform.minecraft.unpick.gen.psi.UnpickTargetMethod import com.demonwav.mcdev.platform.minecraft.unpick.gen.psi.UnpickTypes import com.demonwav.mcdev.platform.minecraft.unpick.gen.psi.UnpickUnknownAttribute -import com.demonwav.mcdev.util.isValidFieldDescriptor +import com.demonwav.mcdev.util.isValidTypeDescriptor import com.demonwav.mcdev.util.isValidMethodDescriptor import com.intellij.lang.annotation.AnnotationHolder import com.intellij.lang.annotation.Annotator @@ -121,7 +121,7 @@ UnpickTypes.METHOD_DESCRIPTOR -> if (!isValidMethodDescriptor(element.text)) { holder.error(MCDevBundle("minecraft.unpick.descriptor.invalid_method"), element) } - UnpickTypes.FIELD_DESCRIPTOR -> if (!isValidFieldDescriptor(element.text)) { + UnpickTypes.FIELD_DESCRIPTOR -> if (!isValidTypeDescriptor(element.text)) { holder.error(MCDevBundle("minecraft.unpick.descriptor.invalid_field"), element) } } Index: src/main/kotlin/platform/minecraft/unpick/inspections/UnpickTargetMismatchInspection.kt =================================================================== --- src/main/kotlin/platform/minecraft/unpick/inspections/UnpickTargetMismatchInspection.kt (revision 9868154fcedfab64c3a53f247e18073499fecec8) +++ src/main/kotlin/platform/minecraft/unpick/inspections/UnpickTargetMismatchInspection.kt (revision 5cd1c63dd403dccd9fc3328dbfbbb46da47ca951) @@ -29,7 +29,7 @@ import com.demonwav.mcdev.platform.minecraft.unpick.gen.psi.UnpickTargetMethod import com.demonwav.mcdev.platform.minecraft.unpick.gen.psi.UnpickVisitor import com.demonwav.mcdev.util.descriptor -import com.demonwav.mcdev.util.isValidFieldDescriptor +import com.demonwav.mcdev.util.isValidTypeDescriptor import com.demonwav.mcdev.util.isValidMethodDescriptor import com.intellij.codeInspection.LocalInspectionTool import com.intellij.codeInspection.ProblemsHolder @@ -92,7 +92,7 @@ override fun visitTargetField(element: UnpickTargetField) { val descriptorElement = element.fieldDescriptor ?: return val descriptor = descriptorElement.text - if (!isValidFieldDescriptor(descriptor)) { + if (!isValidTypeDescriptor(descriptor)) { return } val type = Type.getType(descriptor) Index: src/main/kotlin/util/bytecode-utils.kt =================================================================== --- src/main/kotlin/util/bytecode-utils.kt (revision 9868154fcedfab64c3a53f247e18073499fecec8) +++ src/main/kotlin/util/bytecode-utils.kt (revision 5cd1c63dd403dccd9fc3328dbfbbb46da47ca951) @@ -101,19 +101,17 @@ } } -private const val FIELD_DESCRIPTOR = "\\[*(?:[BCDFIJSZ]|L[^.;\\[()]+;)" -private val FIELD_DESCRIPTOR_REGEX = Regex(FIELD_DESCRIPTOR) -private val METHOD_DESCRIPTOR_REGEX = Regex("\\((?:$FIELD_DESCRIPTOR)*\\)(?:V|$FIELD_DESCRIPTOR)") +private const val TYPE_DESCRIPTOR = "\\[*(?:[BCDFIJSZ]|L[^.;\\[()]+;)" +private val TYPE_DESCRIPTOR_REGEX = Regex(TYPE_DESCRIPTOR) +private val METHOD_DESCRIPTOR_REGEX = Regex("\\((?:$TYPE_DESCRIPTOR)*\\)(?:V|$TYPE_DESCRIPTOR)") /** - * Whether [descriptor] is a structurally valid JVM field descriptor (JVMS 4.3.2), which can be parsed with ASM's - * [org.objectweb.asm.Type]. + * Whether [descriptor] is a structurally valid JVM type descriptor (JVMS 4.3.2). `V` is not accepted by this method. */ -fun isValidFieldDescriptor(descriptor: String) = FIELD_DESCRIPTOR_REGEX.matches(descriptor) +fun isValidTypeDescriptor(descriptor: String) = TYPE_DESCRIPTOR_REGEX.matches(descriptor) /** - * Whether [descriptor] is a structurally valid JVM method descriptor (JVMS 4.3.3), which can be parsed with ASM's - * [org.objectweb.asm.Type]. + * Whether [descriptor] is a structurally valid JVM method descriptor (JVMS 4.3.3) */ fun isValidMethodDescriptor(descriptor: String) = METHOD_DESCRIPTOR_REGEX.matches(descriptor)