User: joe Date: 22 Nov 26 08:20 Revision: 530a657746c30333ba5f4221954514c33661e377 Summary: Cleanup TeamCity URL: http://ci.mcdev.io:80/viewModification.html?tab=vcsModificationFiles&modId=10818&personal=false Index: src/main/kotlin/platform/minecraft/unpick/UnpickAnnotator.kt =================================================================== --- src/main/kotlin/platform/minecraft/unpick/UnpickAnnotator.kt (revision 5cd1c63dd403dccd9fc3328dbfbbb46da47ca951) +++ src/main/kotlin/platform/minecraft/unpick/UnpickAnnotator.kt (revision 530a657746c30333ba5f4221954514c33661e377) @@ -54,9 +54,6 @@ import com.intellij.psi.util.elementType import org.jetbrains.annotations.Nls -/** - * Reports the errors that the reference unpick reader would reject a file for, and adds semantic highlighting. - */ class UnpickAnnotator : Annotator { override fun annotate(element: PsiElement, holder: AnnotationHolder) { Index: src/main/kotlin/platform/minecraft/unpick/UnpickFile.kt =================================================================== --- src/main/kotlin/platform/minecraft/unpick/UnpickFile.kt (revision 5cd1c63dd403dccd9fc3328dbfbbb46da47ca951) +++ src/main/kotlin/platform/minecraft/unpick/UnpickFile.kt (revision 530a657746c30333ba5f4221954514c33661e377) @@ -33,9 +33,6 @@ val header: UnpickHeader? get() = firstChild as? UnpickHeader - /** - * The version of the unpick format declared in the header, or `null` if the header is missing or malformed. - */ val version: Int? get() = header?.version Index: src/main/kotlin/platform/minecraft/unpick/UnpickGroups.kt =================================================================== --- src/main/kotlin/platform/minecraft/unpick/UnpickGroups.kt (revision 5cd1c63dd403dccd9fc3328dbfbbb46da47ca951) +++ src/main/kotlin/platform/minecraft/unpick/UnpickGroups.kt (revision 530a657746c30333ba5f4221954514c33661e377) @@ -28,9 +28,6 @@ import com.intellij.psi.search.GlobalSearchScope import com.intellij.util.indexing.FileBasedIndex -/** - * Lookup of group definitions across all unpick files visible from a given element. - */ object UnpickGroups { /** Index: src/main/kotlin/platform/minecraft/unpick/UnpickLiterals.kt =================================================================== --- src/main/kotlin/platform/minecraft/unpick/UnpickLiterals.kt (revision 5cd1c63dd403dccd9fc3328dbfbbb46da47ca951) +++ src/main/kotlin/platform/minecraft/unpick/UnpickLiterals.kt (revision 530a657746c30333ba5f4221954514c33661e377) @@ -52,9 +52,6 @@ } } - /** - * Parses an integer literal such as a parameter index, returning `null` if it is invalid. - */ fun parseInt(text: String): Int? = (parseInt(text, false) as? Result.Value)?.value as? Int fun dataTypeOf(tokenType: IElementType): DataType? { @@ -69,14 +66,14 @@ } } - private data class Radix(val digits: String, val radix: Int) + private data class NumberWithRadix(val digits: String, val radix: Int) - private fun splitRadix(text: String): Radix { + private fun splitRadix(text: String): NumberWithRadix { return when { - text.startsWith("0x") || text.startsWith("0X") -> Radix(text.substring(2), 16) - text.startsWith("0b") || text.startsWith("0B") -> Radix(text.substring(2), 2) - text.startsWith("0") && text.length > 1 -> Radix(text.substring(1), 8) - else -> Radix(text, 10) + text.startsWith("0x") || text.startsWith("0X") -> NumberWithRadix(text.substring(2), 16) + text.startsWith("0b") || text.startsWith("0B") -> NumberWithRadix(text.substring(2), 2) + text.startsWith("0") && text.length > 1 -> NumberWithRadix(text.substring(1), 8) + else -> NumberWithRadix(text, 10) } } Index: src/main/kotlin/platform/minecraft/unpick/UnpickRenameGroupProcessor.kt =================================================================== --- src/main/kotlin/platform/minecraft/unpick/UnpickRenameGroupProcessor.kt (revision 5cd1c63dd403dccd9fc3328dbfbbb46da47ca951) +++ src/main/kotlin/platform/minecraft/unpick/UnpickRenameGroupProcessor.kt (revision 530a657746c30333ba5f4221954514c33661e377) @@ -25,7 +25,7 @@ import com.intellij.refactoring.rename.RenamePsiElementProcessor /** - * A group may be defined in several places, renaming one definition renames all of them. + * A group may be defined in several places, renames all of them if one of them is renamed. */ class UnpickRenameGroupProcessor : RenamePsiElementProcessor() { override fun canProcessElement(element: PsiElement) = element is UnpickGroupDefinition && element.name != null Index: src/main/kotlin/platform/minecraft/unpick/eval/UnpickExpressionEvaluator.kt =================================================================== --- src/main/kotlin/platform/minecraft/unpick/eval/UnpickExpressionEvaluator.kt (revision 5cd1c63dd403dccd9fc3328dbfbbb46da47ca951) +++ src/main/kotlin/platform/minecraft/unpick/eval/UnpickExpressionEvaluator.kt (revision 530a657746c30333ba5f4221954514c33661e377) @@ -53,14 +53,11 @@ import com.intellij.psi.util.TypeConversionUtil import com.intellij.psi.util.elementType -/** - * Evaluates group constants according to the semantics of the Java language, as required by the unpick spec. - */ object UnpickExpressionEvaluator { /** - * A value produced by a group constant. For a wildcard constant, [wildcardField] is the field the wildcard was - * expanded to. + * A value produced by a group constant. If the expression contained a wildcard, [wildcardField] is the field the + * wildcard was expanded to. */ class EvaluatedConstant(val constant: UnpickGroupConstant, val value: UnpickValue, val wildcardField: PsiField?) @@ -127,10 +124,7 @@ ) } - /** - * Finds the fields matching a wildcard field expression, as defined by the unpick spec. - */ - fun findWildcardFields(expression: UnpickFieldExpression, groupType: DataType?): List { + private fun findWildcardFields(expression: UnpickFieldExpression, groupType: DataType?): List { val psiClass = expression.className.resolveClass() ?: return emptyList() val explicitType = expression.explicitDataType?.dataType val isStatic = !expression.isInstance @@ -149,9 +143,7 @@ } /** - * Returns the value of a constant field, or `null` if the field isn't a constant or its type isn't a [DataType]. - * A constant field is final and initialized to a compile-time constant (JLS 15.29), `null`, a class literal or - * another constant field. + * Returns the value of a constant field, as defined by the unpick spec. * * If the field is compiled and has no source, `null` and `Class` constants can't be distinguished from * non-constant fields, so an unknown value is returned for them. Index: src/main/kotlin/platform/minecraft/unpick/eval/UnpickValue.kt =================================================================== --- src/main/kotlin/platform/minecraft/unpick/eval/UnpickValue.kt (revision 5cd1c63dd403dccd9fc3328dbfbbb46da47ca951) +++ src/main/kotlin/platform/minecraft/unpick/eval/UnpickValue.kt (revision 530a657746c30333ba5f4221954514c33661e377) @@ -24,6 +24,7 @@ import com.demonwav.mcdev.util.ClassNameResolutionFailedException import com.demonwav.mcdev.util.descriptor import com.demonwav.mcdev.util.fullQualifiedName +import com.intellij.openapi.util.text.StringUtil import com.intellij.psi.PsiArrayType import com.intellij.psi.PsiClassType import com.intellij.psi.PsiPrimitiveType @@ -40,14 +41,10 @@ */ data class UnpickValue(val type: DataType, val value: Any?, val isKnown: Boolean = true) { - /** - * Whether this value can be converted to [target] by [convertTo]. - */ fun canConvertTo(target: DataType) = target == type || type.isPrimitive && target.isPrimitive /** - * Converts this value to [target], as a Java cast would. Throws an [IllegalArgumentException] if the value cannot - * be converted, which can be checked with [canConvertTo]. + * Converts this value to [target], as a Java cast would. */ fun convertTo(target: DataType): UnpickValue { require(canConvertTo(target)) { "Cannot convert $type to $target" } @@ -71,18 +68,12 @@ * determined. */ fun toJavaString(): String? { - if (!isKnown) { - return null + return when { + !isKnown -> null + value is PsiType -> classToString(value) + else -> value.toString() } - return when (value) { - null -> "null" - is String -> value - is Char -> value.toString() - is Number -> value.toString() - is PsiType -> classToString(value) - else -> null - } + } - } /** * A human-readable representation of the value, for use in messages. @@ -90,8 +81,8 @@ fun toDisplayString(): String { return when (value) { null -> "null" - is String -> "\"" + value.replace("\\", "\\\\").replace("\"", "\\\"") + "\"" - is Char -> "'$value'" + is String -> "\"" + StringUtil.escapeStringCharacters(value) + "\"" + is Char -> "'" + StringUtil.escapeCharCharacters(value.toString()) + "'" is Long -> "${value}L" is Float -> "${value}f" is PsiType -> value.presentableText + ".class" @@ -103,8 +94,7 @@ fun unknown(type: DataType) = UnpickValue(type, null, isKnown = false) /** - * Returns the result of calling `toString()` on the `Class` object for [type], or `null` if it can't be - * determined. + * Mimics [Class.toString] */ private fun classToString(type: PsiType): String? { return try { Index: src/main/kotlin/platform/minecraft/unpick/index/UnpickGroupIndex.kt =================================================================== --- src/main/kotlin/platform/minecraft/unpick/index/UnpickGroupIndex.kt (revision 5cd1c63dd403dccd9fc3328dbfbbb46da47ca951) +++ src/main/kotlin/platform/minecraft/unpick/index/UnpickGroupIndex.kt (revision 530a657746c30333ba5f4221954514c33661e377) @@ -31,9 +31,6 @@ import com.intellij.util.io.EnumeratorStringDescriptor import com.intellij.util.io.KeyDescriptor -/** - * Indexes the names of the groups defined in each unpick file. The default group is indexed under the empty string. - */ class UnpickGroupIndex : ScalarIndexExtension() { override fun getName() = Util.NAME Index: src/main/kotlin/platform/minecraft/unpick/inspections/DuplicateUnpickConstantInspection.kt =================================================================== --- src/main/kotlin/platform/minecraft/unpick/inspections/DuplicateUnpickConstantInspection.kt (revision 5cd1c63dd403dccd9fc3328dbfbbb46da47ca951) +++ src/main/kotlin/platform/minecraft/unpick/inspections/DuplicateUnpickConstantInspection.kt (revision 530a657746c30333ba5f4221954514c33661e377) @@ -28,6 +28,7 @@ import com.demonwav.mcdev.platform.minecraft.unpick.gen.psi.UnpickFieldExpression import com.demonwav.mcdev.platform.minecraft.unpick.gen.psi.UnpickGroupDefinition import com.demonwav.mcdev.platform.minecraft.unpick.gen.psi.UnpickVisitor +import com.demonwav.mcdev.platform.minecraft.unpick.psi.UnpickElementFactory import com.demonwav.mcdev.util.equivalentTo import com.intellij.codeInspection.LocalInspectionTool import com.intellij.codeInspection.ProblemsHolder @@ -100,10 +101,12 @@ */ private fun EvaluatedConstant.expandedText(): String { val field = wildcardField ?: return constant.text - val wildcard = PsiTreeUtil.findChildrenOfType(constant, UnpickFieldExpression::class.java) + val copy = constant.copy() + val wildcard = PsiTreeUtil.findChildrenOfType(copy, UnpickFieldExpression::class.java) .firstNotNullOfOrNull { it.wildcardElement } ?: return constant.text - return wildcard.textRange.shiftLeft(constant.textRange.startOffset).replace(constant.text, field.name) + wildcard.replace(UnpickElementFactory.createFieldName(constant.project, field.name)) + return copy.text } private fun scopeKey(definition: UnpickGroupDefinition): Set { Index: src/main/kotlin/platform/minecraft/unpick/psi/UnpickElementFactory.kt =================================================================== --- src/main/kotlin/platform/minecraft/unpick/psi/UnpickElementFactory.kt (revision 5cd1c63dd403dccd9fc3328dbfbbb46da47ca951) +++ src/main/kotlin/platform/minecraft/unpick/psi/UnpickElementFactory.kt (revision 530a657746c30333ba5f4221954514c33661e377) @@ -23,7 +23,9 @@ import com.demonwav.mcdev.platform.minecraft.unpick.UnpickFile import com.demonwav.mcdev.platform.minecraft.unpick.UnpickFileType import com.demonwav.mcdev.platform.minecraft.unpick.gen.psi.UnpickClassName +import com.demonwav.mcdev.platform.minecraft.unpick.gen.psi.UnpickFieldName import com.demonwav.mcdev.platform.minecraft.unpick.gen.psi.UnpickTargetAnnotation +import com.demonwav.mcdev.platform.minecraft.unpick.gen.psi.UnpickTargetField import com.demonwav.mcdev.platform.minecraft.unpick.gen.psi.UnpickTypes import com.intellij.openapi.project.Project import com.intellij.psi.PsiElement @@ -51,4 +53,12 @@ )!! return annotation.className!! } + + fun createFieldName(project: Project, name: String): UnpickFieldName { + val targetField = PsiTreeUtil.findChildOfType( + createFile(project, "unpick v4\ntarget_field a.A $name I G"), + UnpickTargetField::class.java, + )!! + return targetField.fieldName!! -} + } +} Index: src/main/kotlin/platform/minecraft/unpick/psi/mixins/UnpickClassNameMixin.kt =================================================================== --- src/main/kotlin/platform/minecraft/unpick/psi/mixins/UnpickClassNameMixin.kt (revision 5cd1c63dd403dccd9fc3328dbfbbb46da47ca951) +++ src/main/kotlin/platform/minecraft/unpick/psi/mixins/UnpickClassNameMixin.kt (revision 530a657746c30333ba5f4221954514c33661e377) @@ -24,9 +24,6 @@ import com.intellij.psi.PsiClass interface UnpickClassNameMixin : UnpickElement { - /** - * The binary name of the class, without any whitespace. - */ val qualifiedName: String fun resolveClass(): PsiClass? Index: src/main/kotlin/platform/minecraft/unpick/psi/mixins/UnpickDataTypeMixin.kt =================================================================== --- src/main/kotlin/platform/minecraft/unpick/psi/mixins/UnpickDataTypeMixin.kt (revision 5cd1c63dd403dccd9fc3328dbfbbb46da47ca951) +++ src/main/kotlin/platform/minecraft/unpick/psi/mixins/UnpickDataTypeMixin.kt (revision 530a657746c30333ba5f4221954514c33661e377) @@ -24,8 +24,5 @@ import com.demonwav.mcdev.platform.minecraft.unpick.psi.UnpickElement interface UnpickDataTypeMixin : UnpickElement { - /** - * The data type named by this element, or `null` if it doesn't name a data type. - */ val dataType: DataType? } Index: src/main/kotlin/platform/minecraft/unpick/psi/mixins/UnpickFieldExpressionMixin.kt =================================================================== --- src/main/kotlin/platform/minecraft/unpick/psi/mixins/UnpickFieldExpressionMixin.kt (revision 5cd1c63dd403dccd9fc3328dbfbbb46da47ca951) +++ src/main/kotlin/platform/minecraft/unpick/psi/mixins/UnpickFieldExpressionMixin.kt (revision 530a657746c30333ba5f4221954514c33661e377) @@ -29,7 +29,7 @@ val wildcardElement: PsiElement? /** - * Whether this field expression has the `:instance` suffix and so refers to a non-static field. + * Whether this field expression has the `:instance` suffix. */ val isInstance: Boolean } Index: src/main/kotlin/platform/minecraft/unpick/psi/mixins/UnpickGroupDefinitionMixin.kt =================================================================== --- src/main/kotlin/platform/minecraft/unpick/psi/mixins/UnpickGroupDefinitionMixin.kt (revision 5cd1c63dd403dccd9fc3328dbfbbb46da47ca951) +++ src/main/kotlin/platform/minecraft/unpick/psi/mixins/UnpickGroupDefinitionMixin.kt (revision 530a657746c30333ba5f4221954514c33661e377) @@ -38,8 +38,5 @@ val format: GroupFormat? - /** - * The contents of the `#:` doc comments directly preceding this group definition, or `null` if there are none. - */ val docComment: String? } Index: src/main/kotlin/platform/minecraft/unpick/psi/mixins/UnpickHeaderMixin.kt =================================================================== --- src/main/kotlin/platform/minecraft/unpick/psi/mixins/UnpickHeaderMixin.kt (revision 5cd1c63dd403dccd9fc3328dbfbbb46da47ca951) +++ src/main/kotlin/platform/minecraft/unpick/psi/mixins/UnpickHeaderMixin.kt (revision 530a657746c30333ba5f4221954514c33661e377) @@ -24,9 +24,6 @@ import com.demonwav.mcdev.platform.minecraft.unpick.psi.UnpickElement interface UnpickHeaderMixin : UnpickElement { - /** - * The declared version number, which may not be a supported version, or `null` if it is missing or malformed. - */ val version: Int? val isSupportedVersion: Boolean Index: src/main/kotlin/platform/minecraft/unpick/psi/mixins/UnpickLiteralExpressionMixin.kt =================================================================== --- src/main/kotlin/platform/minecraft/unpick/psi/mixins/UnpickLiteralExpressionMixin.kt (revision 5cd1c63dd403dccd9fc3328dbfbbb46da47ca951) +++ src/main/kotlin/platform/minecraft/unpick/psi/mixins/UnpickLiteralExpressionMixin.kt (revision 530a657746c30333ba5f4221954514c33661e377) @@ -30,9 +30,6 @@ */ val isNegated: Boolean - /** - * The type of this literal, or `null` if it is malformed. - */ val dataType: DataType? val parseResult: UnpickLiterals.Result Index: src/test/kotlin/platform/minecraft/unpick/UnpickExpressionEvaluatorTest.kt =================================================================== --- src/test/kotlin/platform/minecraft/unpick/UnpickExpressionEvaluatorTest.kt (revision 5cd1c63dd403dccd9fc3328dbfbbb46da47ca951) +++ src/test/kotlin/platform/minecraft/unpick/UnpickExpressionEvaluatorTest.kt (revision 530a657746c30333ba5f4221954514c33661e377) @@ -23,6 +23,7 @@ import com.demonwav.mcdev.framework.BaseMinecraftTest import com.demonwav.mcdev.framework.EdtInterceptor import com.demonwav.mcdev.platform.minecraft.unpick.eval.UnpickExpressionEvaluator +import com.demonwav.mcdev.platform.minecraft.unpick.eval.UnpickValue import com.demonwav.mcdev.platform.minecraft.unpick.gen.psi.UnpickGroupConstant import com.intellij.psi.PsiType import com.intellij.psi.PsiTypes @@ -182,4 +183,12 @@ Assertions.assertEquals(listOf(4), evaluate("int", "com.example.Wild.*:instance")) Assertions.assertEquals(listOf(11, 12, 15), evaluate("int", "com.example.Wild.* + 10")) } + + @Test + @DisplayName("Display Strings") + fun displayStrings() { + Assertions.assertEquals("\"a\\\"b\\n\\u0001\"", UnpickValue(DataType.STRING, "a\"b\n\u0001").toDisplayString()) + Assertions.assertEquals("'\\''", UnpickValue(DataType.CHAR, '\'').toDisplayString()) + Assertions.assertEquals("'\\t'", UnpickValue(DataType.CHAR, '\t').toDisplayString()) -} + } +}