User: joe Date: 22 Nov 26 12:35 Revision: 4386bb995c4ad6c9a9fe6ce5906a6f32fab8af7a Summary: Adjust UnpickLexer to use UnpickLanguage.SUPPORTED_VERSIONS directly TeamCity URL: http://ci.mcdev.io:80/viewModification.html?tab=vcsModificationFiles&modId=10819&personal=false Index: src/main/grammars/UnpickLexer.flex =================================================================== --- src/main/grammars/UnpickLexer.flex (revision 530a657746c30333ba5f4221954514c33661e377) +++ src/main/grammars/UnpickLexer.flex (revision 4386bb995c4ad6c9a9fe6ce5906a6f32fab8af7a) @@ -20,6 +20,7 @@ package com.demonwav.mcdev.platform.minecraft.unpick.gen; +import com.demonwav.mcdev.platform.minecraft.unpick.UnpickLanguage; import com.intellij.lexer.*; import com.intellij.psi.tree.IElementType; import static com.demonwav.mcdev.platform.minecraft.unpick.gen.psi.UnpickTypes.*; @@ -199,8 +200,15 @@ if (!seenVersion) { seenVersion = true; String version = yytext().toString(); - supportedVersion = version.equals("v3") || version.equals("v4"); + supportedVersion = false; + if (version.startsWith("v")) { + try { + int versionNumber = Integer.parseInt(version.substring(1)); + supportedVersion = UnpickLanguage.INSTANCE.getSUPPORTED_VERSIONS().contains(versionNumber); + } catch (NumberFormatException ignored) { - } + } + } + } return IDENTIFIER; } {NEWLINE} { Index: src/main/kotlin/platform/minecraft/unpick/UnpickLanguage.kt =================================================================== --- src/main/kotlin/platform/minecraft/unpick/UnpickLanguage.kt (revision 530a657746c30333ba5f4221954514c33661e377) +++ src/main/kotlin/platform/minecraft/unpick/UnpickLanguage.kt (revision 4386bb995c4ad6c9a9fe6ce5906a6f32fab8af7a) @@ -24,9 +24,6 @@ import java.io.Serial object UnpickLanguage : Language("Unpick") { - /** - * The versions of the unpick format that are supported. The lexer must be kept in sync with this. - */ val SUPPORTED_VERSIONS = 3..4 @Serial