Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove support for Clojure #89

Merged
merged 1 commit into from
Jan 10, 2024
Merged

Remove support for Clojure #89

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions selfie-lib/src/commonMain/kotlin/com/diffplug/selfie/guts/Literals.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@ enum class Language {
JAVA_PRE15,
KOTLIN,
GROOVY,
SCALA,
CLOJURE;
SCALA;

companion object {
fun fromFilename(filename: String): Language {
Expand All @@ -37,8 +36,6 @@ enum class Language {
"gy" -> GROOVY
"scala",
"sc" -> SCALA
"clj",
"cljs" -> CLOJURE
else -> throw IllegalArgumentException("Unknown language for file $filename")
}
}
Expand Down Expand Up @@ -88,10 +85,8 @@ internal object LiteralInt : LiteralFormat<Int>() {

internal object LiteralLong : LiteralFormat<Long>() {
override fun encode(value: Long, language: Language): String {
val buffer = encodeUnderscores(StringBuilder(), value.toLong(), language)
if (language != Language.CLOJURE) {
buffer.append('L')
}
val buffer = encodeUnderscores(StringBuilder(), value, language)
buffer.append('L')
return buffer.toString()
}
override fun parse(str: String, language: Language): Long {
Expand All @@ -107,12 +102,18 @@ private const val TRIPLE_QUOTE = "\"\"\""

internal object LiteralString : LiteralFormat<String>() {
override fun encode(value: String, language: Language): String =
if (value.indexOf('\n') == -1) singleLineJavaToSource(value)
if (value.indexOf('\n') == -1)
when (language) {
Language.JAVA_PRE15,
Language.JAVA -> singleLineJavaToSource(value)
Language.GROOVY,
Language.SCALA,
Language.KOTLIN -> singleLineJavaToSource(value)
}
else
when (language) {
Language.GROOVY,
Language.SCALA,
Language.CLOJURE,
Language.JAVA_PRE15 -> singleLineJavaToSource(value)
Language.JAVA -> multiLineJavaToSource(value)
Language.KOTLIN -> multiLineJavaToSource(value)
Expand Down