Fix ObfEx lexer generation

DenWav · DenWav · commit 2bbc8f8d6807 · 2025-03-14T20:15:57.000-05:00
diff --git a/obfuscation-explorer/src/main/grammars/CSrgLexer.flex b/obfuscation-explorer/src/main/grammars/CSrgLexer.flex
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package io.mcdev.obfex.formats.csrg.gen;
+package io.mcdev.obfex.formats.csrg.gen.lexer;
 
 import com.intellij.lexer.*;
 import com.intellij.psi.tree.IElementType;
diff --git a/obfuscation-explorer/src/main/grammars/EnigmaLexer.flex b/obfuscation-explorer/src/main/grammars/EnigmaLexer.flex
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package io.mcdev.obfex.formats.enigma.gen;
+package io.mcdev.obfex.formats.enigma.gen.lexer;
 
 import com.intellij.lexer.*;
 import com.intellij.psi.tree.IElementType;
diff --git a/obfuscation-explorer/src/main/grammars/JamLexer.flex b/obfuscation-explorer/src/main/grammars/JamLexer.flex
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package io.mcdev.obfex.formats.jam.gen;
+package io.mcdev.obfex.formats.jam.gen.lexer;
 
 import com.intellij.lexer.*;
 import com.intellij.psi.tree.IElementType;
diff --git a/obfuscation-explorer/src/main/grammars/ProGuardLexer.flex b/obfuscation-explorer/src/main/grammars/ProGuardLexer.flex
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package io.mcdev.obfex.formats.proguard.gen;
+package io.mcdev.obfex.formats.proguard.gen.lexer;
 
 import com.intellij.lexer.*;
 import com.intellij.psi.tree.IElementType;
diff --git a/obfuscation-explorer/src/main/grammars/SrgLexer.flex b/obfuscation-explorer/src/main/grammars/SrgLexer.flex
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package io.mcdev.obfex.formats.srg.gen;
+package io.mcdev.obfex.formats.srg.gen.lexer;
 
 import com.intellij.lexer.*;
 import com.intellij.psi.tree.IElementType;
diff --git a/obfuscation-explorer/src/main/grammars/TSrg2Lexer.flex b/obfuscation-explorer/src/main/grammars/TSrg2Lexer.flex
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package io.mcdev.obfex.formats.tsrg2.gen;
+package io.mcdev.obfex.formats.tsrg2.gen.lexer;
 
 import com.intellij.lexer.*;
 import com.intellij.psi.tree.IElementType;
diff --git a/obfuscation-explorer/src/main/grammars/TSrgLexer.flex b/obfuscation-explorer/src/main/grammars/TSrgLexer.flex
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package io.mcdev.obfex.formats.tsrg.gen;
+package io.mcdev.obfex.formats.tsrg.gen.lexer;
 
 import com.intellij.lexer.*;
 import com.intellij.psi.tree.IElementType;
diff --git a/obfuscation-explorer/src/main/grammars/TinyV1Lexer.flex b/obfuscation-explorer/src/main/grammars/TinyV1Lexer.flex
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package io.mcdev.obfex.formats.tinyv1.gen;
+package io.mcdev.obfex.formats.tinyv1.gen.lexer;
 
 import com.intellij.lexer.*;
 import com.intellij.psi.tree.IElementType;
diff --git a/obfuscation-explorer/src/main/grammars/TinyV2Lexer.flex b/obfuscation-explorer/src/main/grammars/TinyV2Lexer.flex
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package io.mcdev.obfex.formats.tinyv2.gen;
+package io.mcdev.obfex.formats.tinyv2.gen.lexer;
 
 import com.intellij.lexer.*;
 import com.intellij.psi.tree.IElementType;
diff --git a/obfuscation-explorer/src/main/kotlin/formats/csrg/lang/psi/CSrgLexerAdapter.kt b/obfuscation-explorer/src/main/kotlin/formats/csrg/lang/psi/CSrgLexerAdapter.kt
@@ -21,6 +21,6 @@
 package io.mcdev.obfex.formats.csrg.lang.psi
 
 import com.intellij.lexer.FlexAdapter
-import io.mcdev.obfex.formats.csrg.gen.CSrgLexer
+import io.mcdev.obfex.formats.csrg.gen.lexer.CSrgLexer
 
 class CSrgLexerAdapter : FlexAdapter(CSrgLexer())
diff --git a/obfuscation-explorer/src/main/kotlin/formats/enigma/lang/psi/EnigmaLexerAdapter.kt b/obfuscation-explorer/src/main/kotlin/formats/enigma/lang/psi/EnigmaLexerAdapter.kt
@@ -21,6 +21,6 @@
 package io.mcdev.obfex.formats.enigma.lang.psi
 
 import com.intellij.lexer.FlexAdapter
-import io.mcdev.obfex.formats.enigma.gen.EnigmaLexer
+import io.mcdev.obfex.formats.enigma.gen.lexer.EnigmaLexer
 
 class EnigmaLexerAdapter : FlexAdapter(EnigmaLexer())
diff --git a/obfuscation-explorer/src/main/kotlin/formats/jam/lang/psi/JamLexerAdapter.kt b/obfuscation-explorer/src/main/kotlin/formats/jam/lang/psi/JamLexerAdapter.kt
@@ -21,6 +21,6 @@
 package io.mcdev.obfex.formats.jam.lang.psi
 
 import com.intellij.lexer.FlexAdapter
-import io.mcdev.obfex.formats.jam.gen.JamLexer
+import io.mcdev.obfex.formats.jam.gen.lexer.JamLexer
 
 class JamLexerAdapter : FlexAdapter(JamLexer())
diff --git a/obfuscation-explorer/src/main/kotlin/formats/proguard/lang/psi/ProGuardLexerAdapter.kt b/obfuscation-explorer/src/main/kotlin/formats/proguard/lang/psi/ProGuardLexerAdapter.kt
@@ -21,6 +21,6 @@
 package io.mcdev.obfex.formats.proguard.lang.psi
 
 import com.intellij.lexer.FlexAdapter
-import io.mcdev.obfex.formats.proguard.gen.ProGuardLexer
+import io.mcdev.obfex.formats.proguard.gen.lexer.ProGuardLexer
 
 class ProGuardLexerAdapter : FlexAdapter(ProGuardLexer())
diff --git a/obfuscation-explorer/src/main/kotlin/formats/srg/lang/psi/SrgLexerAdapter.kt b/obfuscation-explorer/src/main/kotlin/formats/srg/lang/psi/SrgLexerAdapter.kt
@@ -21,6 +21,6 @@
 package io.mcdev.obfex.formats.srg.lang.psi
 
 import com.intellij.lexer.FlexAdapter
-import io.mcdev.obfex.formats.srg.gen.SrgLexer
+import io.mcdev.obfex.formats.srg.gen.lexer.SrgLexer
 
 class SrgLexerAdapter : FlexAdapter(SrgLexer())
diff --git a/obfuscation-explorer/src/main/kotlin/formats/tinyv1/lang/psi/TinyV1LexerAdapter.kt b/obfuscation-explorer/src/main/kotlin/formats/tinyv1/lang/psi/TinyV1LexerAdapter.kt
@@ -21,6 +21,6 @@
 package io.mcdev.obfex.formats.tinyv1.lang.psi
 
 import com.intellij.lexer.FlexAdapter
-import io.mcdev.obfex.formats.tinyv1.gen.TinyV1Lexer
+import io.mcdev.obfex.formats.tinyv1.gen.lexer.TinyV1Lexer
 
 class TinyV1LexerAdapter : FlexAdapter(TinyV1Lexer())
diff --git a/obfuscation-explorer/src/main/kotlin/formats/tinyv2/lang/psi/TinyV2LexerAdapter.kt b/obfuscation-explorer/src/main/kotlin/formats/tinyv2/lang/psi/TinyV2LexerAdapter.kt
@@ -21,6 +21,6 @@
 package io.mcdev.obfex.formats.tinyv2.lang.psi
 
 import com.intellij.lexer.FlexAdapter
-import io.mcdev.obfex.formats.tinyv2.gen.TinyV2Lexer
+import io.mcdev.obfex.formats.tinyv2.gen.lexer.TinyV2Lexer
 
 class TinyV2LexerAdapter : FlexAdapter(TinyV2Lexer())
diff --git a/obfuscation-explorer/src/main/kotlin/formats/tsrg/lang/psi/TSrgLexerAdapter.kt b/obfuscation-explorer/src/main/kotlin/formats/tsrg/lang/psi/TSrgLexerAdapter.kt
@@ -21,6 +21,6 @@
 package io.mcdev.obfex.formats.tsrg.lang.psi
 
 import com.intellij.lexer.FlexAdapter
-import io.mcdev.obfex.formats.tsrg.gen.TSrgLexer
+import io.mcdev.obfex.formats.tsrg.gen.lexer.TSrgLexer
 
 class TSrgLexerAdapter : FlexAdapter(TSrgLexer())
diff --git a/obfuscation-explorer/src/main/kotlin/formats/tsrg2/lang/psi/TSrg2LexerAdapter.kt b/obfuscation-explorer/src/main/kotlin/formats/tsrg2/lang/psi/TSrg2LexerAdapter.kt
@@ -21,6 +21,6 @@
 package io.mcdev.obfex.formats.tsrg2.lang.psi
 
 import com.intellij.lexer.FlexAdapter
-import io.mcdev.obfex.formats.tsrg2.gen.TSrg2Lexer
+import io.mcdev.obfex.formats.tsrg2.gen.lexer.TSrg2Lexer
 
 class TSrg2LexerAdapter : FlexAdapter(TSrg2Lexer())
diff --git a/obfuscation-explorer/src/test/kotlin/formats/srg/SrgLexerTest.kt b/obfuscation-explorer/src/test/kotlin/formats/srg/SrgLexerTest.kt
@@ -23,7 +23,7 @@ package io.mcdev.obfex.formats.srg
 import com.intellij.lexer.FlexAdapter
 import com.intellij.testFramework.LexerTestCase
 import io.mcdev.obfex.filterCrlf
-import io.mcdev.obfex.formats.srg.gen.SrgLexer
+import io.mcdev.obfex.formats.srg.gen.lexer.SrgLexer
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.Test
@@ -45,4 +45,3 @@ class SrgLexerTest {
             Assertions.assertEquals(expected.filterCrlf(), actual.filterCrlf())
         }
     }
-    
