refactor: properly name lexers

Author: lppedd

build.gradle.kts

@@ -105,14 +105,14 @@ kotlin {
 tasks {
   val baseDir = "src/main/kotlin/com/github/lppedd/cc"
   val generateLangLexer by registering(GenerateLexerTask::class) {
-    sourceFile = layout.projectDirectory.file("$baseDir/language/lexer/conventionalCommit.flex")
+    sourceFile = layout.projectDirectory.file("$baseDir/language/lexer/languageConventionalCommit.flex")
     targetOutputDir = layout.projectDirectory.dir("src/main/gen/lang")
     purgeOldFiles = true
   }
 
-  val generateStrictLexer by registering(GenerateLexerTask::class) {
-    sourceFile = layout.projectDirectory.file("$baseDir/parser/strictConventionalCommit.flex")
-    targetOutputDir = layout.projectDirectory.dir("src/main/gen/strict")
+  val generateSpecLexer by registering(GenerateLexerTask::class) {
+    sourceFile = layout.projectDirectory.file("$baseDir/parser/specConventionalCommit.flex")
+    targetOutputDir = layout.projectDirectory.dir("src/main/gen/spec")
     purgeOldFiles = true
   }
 
@@ -128,7 +128,7 @@ tasks {
   sourceSets {
     main {
       java {
-        srcDirs(generateLangLexer, generateStrictLexer)
+        srcDirs(generateLangLexer, generateSpecLexer)
       }
     }
   }

src/main/kotlin/com/github/lppedd/cc/language/lexer/ConventionalCommitLexer.kt

@@ -5,7 +5,7 @@ import com.intellij.lexer.FlexAdapter
 /**
  * @author Edoardo Luppi
  */
-public class ConventionalCommitLexer : FlexAdapter(ConventionalCommitFlexLexer(null)) {
+public class ConventionalCommitLexer : FlexAdapter(LanguageConventionalCommitFlexLexer(null)) {
   override fun getFlex(): EofCapableFlexLexer =
     super.getFlex() as EofCapableFlexLexer
 

…c/language/lexer/conventionalCommit.flex …ge/lexer/languageConventionalCommit.flexsrc/main/kotlin/com/github/lppedd/cc/language/lexer/conventionalCommit.flex renamed to src/main/kotlin/com/github/lppedd/cc/language/lexer/languageConventionalCommit.flex src/main/kotlin/com/github/lppedd/cc/language/lexer/conventionalCommit.flex renamed to src/main/kotlin/com/github/lppedd/cc/language/lexer/languageConventionalCommit.flex

@@ -6,7 +6,7 @@ import com.intellij.psi.tree.IElementType;
 
 %%
 
-%class ConventionalCommitFlexLexer
+%class LanguageConventionalCommitFlexLexer
 %implements EofCapableFlexLexer
 %function advance
 %type IElementType

src/main/kotlin/com/github/lppedd/cc/parser/ConventionalCommitParser.kt

@@ -126,12 +126,12 @@ internal fun parseConventionalCommit(message: String, lenient: Boolean = false):
 }
 
 private fun createReader(message: String): CCTokenReader {
-  val lexer = StrictConventionalCommitFlexLexer(null)
-  lexer.reset(message, 0, message.length, StrictConventionalCommitFlexLexer.YYINITIAL)
+  val lexer = SpecConventionalCommitFlexLexer(null)
+  lexer.reset(message, 0, message.length, SpecConventionalCommitFlexLexer.YYINITIAL)
   return CCTokenReader(lexer)
 }
 
-private class CCTokenReader(private val lexer: StrictConventionalCommitFlexLexer) {
+private class CCTokenReader(private val lexer: SpecConventionalCommitFlexLexer) {
   var current: CCToken? = lexer.advance()
     private set
 

…/cc/parser/strictConventionalCommit.flex …dd/cc/parser/specConventionalCommit.flexsrc/main/kotlin/com/github/lppedd/cc/parser/strictConventionalCommit.flex renamed to src/main/kotlin/com/github/lppedd/cc/parser/specConventionalCommit.flex src/main/kotlin/com/github/lppedd/cc/parser/strictConventionalCommit.flex renamed to src/main/kotlin/com/github/lppedd/cc/parser/specConventionalCommit.flex

@@ -1,14 +1,14 @@
 package com.github.lppedd.cc.parser;
 
-// Note that while the name includes "strict", the strictness is only related
-// to how tokens are looked for: a message is conventional commits compliant
-// only if it has at least a type and a subject.
-// However, valid characters for tokens are not as restrictive as what the
-// specification mandates.
+// Note that while the name includes "spec", the lexer does not exactly adhere
+// to what the Conventional Commits spec mandates. This lexer *is* stricter
+// than the IDE language one, but it still expects cooperation from whatever
+// parser is going to consume tokens to actually respect (or not respect)
+// the specification.
 
 %%
 
-%class StrictConventionalCommitFlexLexer
+%class SpecConventionalCommitFlexLexer
 %type CCToken
 %function advance
 %public