diff options
16 files changed, 542 insertions, 87 deletions
diff --git a/annotations/src/main/java/moe/nea/mcautotranslations/annotations/GatheredTranslation.java b/annotations/src/main/java/moe/nea/mcautotranslations/annotations/GatheredTranslation.java index 18054fd..869ac05 100644 --- a/annotations/src/main/java/moe/nea/mcautotranslations/annotations/GatheredTranslation.java +++ b/annotations/src/main/java/moe/nea/mcautotranslations/annotations/GatheredTranslation.java @@ -10,7 +10,7 @@ import java.lang.annotation.Target; @Target(ElementType.TYPE) @Repeatable(GatheredTranslations.class) public @interface GatheredTranslation { - String key(); + String translationKey(); - String value(); + String translationValue(); } diff --git a/build.gradle.kts b/build.gradle.kts index 04628d9..43be34b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -35,5 +35,8 @@ subprojects { buildConfigField<String>("KOTLIN_PLUGIN_GROUP", project(":kotlin-plugin").group.toString()) buildConfigField<String>("KOTLIN_PLUGIN_ARTIFACT", project(":kotlin-plugin").name) buildConfigField<String>("KOTLIN_PLUGIN_VERSION", project(":kotlin-plugin").version.toString()) + buildConfigField<String>("ANNOTATIONS_GROUP", project(":annotations").group.toString()) + buildConfigField<String>("ANNOTATIONS_ARTIFACT", project(":annotations").name) + buildConfigField<String>("ANNOTATIONS_VERSION", project(":annotations").version.toString()) } }
\ No newline at end of file diff --git a/example/build.gradle.kts b/example/build.gradle.kts new file mode 100644 index 0000000..2959882 --- /dev/null +++ b/example/build.gradle.kts @@ -0,0 +1,17 @@ +import moe.nea.mcautotranslations.gradle.CollectTranslations + +plugins { + kotlin("jvm") version "2.0.20" + id("moe.nea.mc-auto-translations") +} + +repositories { + mavenCentral() +} + +tasks.register("collectTranslations", CollectTranslations::class) { + this.baseTranslations.from(file("en_us.json")) + this.classes.from(sourceSets.main.map { it.kotlin.classesDirectory }) + this.outputFile.set(layout.buildDirectory.file("compiled_en_us.json")) +} + diff --git a/example/en_us.json b/example/en_us.json new file mode 100644 index 0000000..b18864b --- /dev/null +++ b/example/en_us.json @@ -0,0 +1,5 @@ +{ + "old1": "b", + "old2": "c%sd", + "test5": "Test 5" +}
\ No newline at end of file diff --git a/example/gradle/wrapper/gradle-wrapper.jar b/example/gradle/wrapper/gradle-wrapper.jar Binary files differnew file mode 100644 index 0000000..e644113 --- /dev/null +++ b/example/gradle/wrapper/gradle-wrapper.jar diff --git a/example/gradle/wrapper/gradle-wrapper.properties b/example/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..a441313 --- /dev/null +++ b/example/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/example/gradlew b/example/gradlew new file mode 100755 index 0000000..b740cf1 --- /dev/null +++ b/example/gradlew @@ -0,0 +1,249 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/example/gradlew.bat b/example/gradlew.bat new file mode 100644 index 0000000..25da30d --- /dev/null +++ b/example/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/example/settings.gradle.kts b/example/settings.gradle.kts new file mode 100644 index 0000000..36eee5c --- /dev/null +++ b/example/settings.gradle.kts @@ -0,0 +1,5 @@ +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0" +} + +includeBuild("..") diff --git a/example/src/main/kotlin/test.kt b/example/src/main/kotlin/test.kt new file mode 100644 index 0000000..a7b7255 --- /dev/null +++ b/example/src/main/kotlin/test.kt @@ -0,0 +1,12 @@ +package moe.nea.translatetest + +// TODO: change this name +data class Text(val key: String, val args: List<Any>) + +fun trResolved(key: String, vararg args: Any) = Text(key, args.toList()) +fun tr(key: String, default: String): Text = error("Did not run compiler plugin") +fun main() { + println(tr("test1", "Hiiiiiii")) + println(tr("test2", "Hello ${Math.random()}")) + println(tr("test3", "Goodbye ${Math.random()} ${Math.E}")) +} diff --git a/gradle-plugin/src/main/kotlin/moe/nea/mcautotranslations/gradle/ArrayElementVisitor.kt b/gradle-plugin/src/main/kotlin/moe/nea/mcautotranslations/gradle/ArrayElementVisitor.kt new file mode 100644 index 0000000..422c5ae --- /dev/null +++ b/gradle-plugin/src/main/kotlin/moe/nea/mcautotranslations/gradle/ArrayElementVisitor.kt @@ -0,0 +1,32 @@ +package moe.nea.mcautotranslations.gradle + +import moe.nea.mcautotranslations.annotations.GatheredTranslation +import moe.nea.mcautotranslations.gradle.visitors.KVVisitor +import org.objectweb.asm.AnnotationVisitor +import org.objectweb.asm.Opcodes +import org.objectweb.asm.Type + +internal class ArrayElementVisitor(val map: MutableMap<String, String>) : AnnotationVisitor(Opcodes.ASM9) { + override fun visitArray(name: String?): AnnotationVisitor { + error("Unknown annotation element $name") + } + + override fun visitAnnotation(name: String?, descriptor: String?): AnnotationVisitor { + require(descriptor == Type.getType(GatheredTranslation::class.java).descriptor) { + "Invalid array element $name ($descriptor)" + } + return KVVisitor(map) + } + + override fun visit(name: String?, value: Any?) { + error("Unknown annotation element $name") + } + + override fun visitEnum(name: String?, descriptor: String?, value: String?) { + error("Unknown annotation element $name") + } + + override fun visitEnd() { + // no empty check + } +}
\ No newline at end of file diff --git a/gradle-plugin/src/main/kotlin/moe/nea/mcautotranslations/gradle/MCAutoTranslationsGradlePlugin.kt b/gradle-plugin/src/main/kotlin/moe/nea/mcautotranslations/gradle/MCAutoTranslationsGradlePlugin.kt index d954e64..0e8004a 100644 --- a/gradle-plugin/src/main/kotlin/moe/nea/mcautotranslations/gradle/MCAutoTranslationsGradlePlugin.kt +++ b/gradle-plugin/src/main/kotlin/moe/nea/mcautotranslations/gradle/MCAutoTranslationsGradlePlugin.kt @@ -10,12 +10,16 @@ import org.jetbrains.kotlin.gradle.plugin.SubpluginOption class MCAutoTranslationsGradlePlugin : KotlinCompilerPluginSupportPlugin { override fun apply(target: Project) { + println("Applying plugin to project") target.extensions.create("mcAutoTranslations", MCAutoTranslationsExtension::class.java) } override fun applyToCompilation(kotlinCompilation: KotlinCompilation<*>): Provider<List<SubpluginOption>> { val project = kotlinCompilation.target.project val extension = project.extensions.getByType(MCAutoTranslationsExtension::class.java) + kotlinCompilation.dependencies { + compileOnly(BuildConfig.ANNOTATIONS_GROUP + ":" + BuildConfig.ANNOTATIONS_ARTIFACT + ":" + BuildConfig.ANNOTATIONS_VERSION) + } return project.provider { listOf() // TODO: add plugin options from extension in here } diff --git a/gradle-plugin/src/main/kotlin/moe/nea/mcautotranslations/gradle/MergeTranslations.kt b/gradle-plugin/src/main/kotlin/moe/nea/mcautotranslations/gradle/MergeTranslations.kt index 44cea35..6b521ec 100644 --- a/gradle-plugin/src/main/kotlin/moe/nea/mcautotranslations/gradle/MergeTranslations.kt +++ b/gradle-plugin/src/main/kotlin/moe/nea/mcautotranslations/gradle/MergeTranslations.kt @@ -2,23 +2,21 @@ package moe.nea.mcautotranslations.gradle import com.google.gson.Gson import com.google.gson.reflect.TypeToken -import moe.nea.mcautotranslations.annotations.GatheredTranslation +import moe.nea.mcautotranslations.gradle.visitors.AnnotationCollector import org.gradle.api.DefaultTask import org.gradle.api.file.ConfigurableFileCollection import org.gradle.api.file.RegularFileProperty import org.gradle.api.tasks.InputFiles +import org.gradle.api.tasks.Internal import org.gradle.api.tasks.OutputFile import org.gradle.api.tasks.PathSensitive import org.gradle.api.tasks.PathSensitivity import org.gradle.api.tasks.TaskAction import org.gradle.work.Incremental import org.gradle.work.InputChanges -import org.objectweb.asm.AnnotationVisitor import org.objectweb.asm.ClassReader -import org.objectweb.asm.ClassVisitor -import org.objectweb.asm.Opcodes -import org.objectweb.asm.Type import java.io.File +import java.util.TreeMap abstract class CollectTranslations : DefaultTask() { @get:InputFiles @@ -30,31 +28,40 @@ abstract class CollectTranslations : DefaultTask() { @get:PathSensitive(PathSensitivity.RELATIVE) abstract val classes: ConfigurableFileCollection + @get:Internal + abstract val cacheFile: RegularFileProperty + @get:OutputFile abstract val outputFile: RegularFileProperty + init { + cacheFile.convention(project.layout.buildDirectory.file("mergeTranslations/incremental/${this.name}.json")) + outputFile.convention(project.layout.buildDirectory.file("mergeTranslations/build/${this.name}/en_us.json")) + } + class Translations { - var baseTranslation: HashMap<String, HashMap<String, String>> = HashMap() - var inlineTranslations: HashMap<String, HashMap<String, String>> = HashMap() + var baseTranslation: TreeMap<String, TreeMap<String, String>> = TreeMap() + var inlineTranslations: TreeMap<String, TreeMap<String, String>> = TreeMap() } companion object { val gson = Gson() - val mapType: TypeToken<HashMap<String, String>> = object : TypeToken<HashMap<String, String>>() {} + val mapType: TypeToken<TreeMap<String, String>> = object : TypeToken<TreeMap<String, String>>() {} } @TaskAction fun execute(inputs: InputChanges) { val baseTranslationsDirty = inputs.getFileChanges(baseTranslations).any() - val outFile = outputFile.get().asFile - val outputExists = outFile.exists() - val canBeIncremental = outputExists && !baseTranslationsDirty + val cacheFile = cacheFile.get().asFile + cacheFile.parentFile.mkdirs() + val cacheExists = cacheFile.exists() + val canBeIncremental = cacheExists && !baseTranslationsDirty val baseTranslations: Translations = if (canBeIncremental) { - gson.fromJson(outFile.readText(), Translations::class.java) + gson.fromJson(cacheFile.readText(), Translations::class.java) } else { val t = Translations() baseTranslations.associateTo(t.baseTranslation) { - it.toString() to gson.fromJson(outFile.readText(), mapType) + it.toString() to gson.fromJson(it.readText(), mapType) } t } @@ -73,86 +80,26 @@ abstract class CollectTranslations : DefaultTask() { .forEach { val className = getClassName(it.relativePath) if (it.file.exists()) { - parseClassAnnotations(it.file) + baseTranslations.inlineTranslations[className] = parseClassAnnotations(it.file) } else { baseTranslations.inlineTranslations.remove(className) } } - outFile.writeText(gson.toJson(baseTranslations)) + cacheFile.writeText(gson.toJson(baseTranslations)) + outputFile.get().asFile.writeText(gson.toJson(toKVMap(baseTranslations))) } - - private class KVVisitor(val map: MutableMap<String, String>) : AnnotationVisitor(Opcodes.ASM9) { - var value: String? = null - var key: String? = null - override fun visit(name: String, value: Any) { - when (name) { - "key" -> this.key = value as String - "value" -> this.value = value as String - else -> error("Unknown annotation element $name") + private fun toKVMap(translations: Translations): TreeMap<String, String> { + return (translations.baseTranslation.values.asSequence() + + translations.inlineTranslations.values.asSequence()) + .fold(TreeMap()) { acc, x -> + acc.putAll(x) // TODO: warn on duplicate properties (possibly with error enum configuration) + acc } - } - - override fun visitAnnotation(name: String?, descriptor: String?): AnnotationVisitor { - error("Unknown annotation element $name") - } - - override fun visitArray(name: String?): AnnotationVisitor { - error("Unknown annotation element $name") - } - - override fun visitEnum(name: String?, descriptor: String?, value: String?) { - error("Unknown annotation element $name") - } - - override fun visitEnd() { - map[key ?: error("Missing key")] = value ?: error("Missing value") - } } - private class RepeatableVisitor(val map: MutableMap<String, String>) : AnnotationVisitor(Opcodes.ASM9) { - override fun visitArray(name: String?): AnnotationVisitor { - require(name == "value") { "Unknown annotation element $name" } - foundArray = true - return KVVisitor(map) - } - - var foundArray = false - - override fun visitEnd() { - require(foundArray) { "Missing array" } - } - - override fun visitAnnotation(name: String?, descriptor: String?): AnnotationVisitor { - error("Unknown annotation element $name") - } - - override fun visit(name: String?, value: Any?) { - error("Unknown annotation element $name") - } - - override fun visitEnum(name: String?, descriptor: String?, value: String?) { - error("Unknown annotation element $name") - } - } - - private class AnnotationCollector(val map: MutableMap<String, String>) : ClassVisitor(Opcodes.ASM9) { - override fun visitAnnotation(descriptor: String, visible: Boolean): AnnotationVisitor? { - // TODO: inject our own annotations into the classpath - if (Type.getType(GatheredTranslation::class.java).descriptor.equals(descriptor)) { - return KVVisitor(map) - } - if (Type.getType(GatheredTranslation.Repeatable::class.java).descriptor.equals(descriptor)) { - return RepeatableVisitor(map) - } - // TODO: remove print log - println("Ignoring descriptor $descriptor") - return null - } - } - - private fun parseClassAnnotations(file: File): HashMap<String, String> { - val map = HashMap<String, String>() + private fun parseClassAnnotations(file: File): TreeMap<String, String> { + val map = TreeMap<String, String>() kotlin.runCatching { ClassReader(file.readBytes()) .accept(AnnotationCollector(map), @@ -177,5 +124,4 @@ abstract class CollectTranslations : DefaultTask() { if (extension != "class") return false return true } - }
\ No newline at end of file diff --git a/gradle-plugin/src/main/kotlin/moe/nea/mcautotranslations/gradle/visitors/AnnotationCollector.kt b/gradle-plugin/src/main/kotlin/moe/nea/mcautotranslations/gradle/visitors/AnnotationCollector.kt new file mode 100644 index 0000000..38835d5 --- /dev/null +++ b/gradle-plugin/src/main/kotlin/moe/nea/mcautotranslations/gradle/visitors/AnnotationCollector.kt @@ -0,0 +1,20 @@ +package moe.nea.mcautotranslations.gradle.visitors + +import moe.nea.mcautotranslations.annotations.GatheredTranslation +import moe.nea.mcautotranslations.annotations.GatheredTranslations +import org.objectweb.asm.AnnotationVisitor +import org.objectweb.asm.ClassVisitor +import org.objectweb.asm.Opcodes +import org.objectweb.asm.Type + +internal class AnnotationCollector(val map: MutableMap<String, String>) : ClassVisitor(Opcodes.ASM9) { + override fun visitAnnotation(descriptor: String, visible: Boolean): AnnotationVisitor? { + if (Type.getType(GatheredTranslation::class.java).descriptor.equals(descriptor)) { + return KVVisitor(map) + } + if (Type.getType(GatheredTranslations::class.java).descriptor.equals(descriptor)) { + return RepeatableVisitor(map) + } + return null + } +}
\ No newline at end of file diff --git a/gradle-plugin/src/main/kotlin/moe/nea/mcautotranslations/gradle/visitors/KVVisitor.kt b/gradle-plugin/src/main/kotlin/moe/nea/mcautotranslations/gradle/visitors/KVVisitor.kt new file mode 100644 index 0000000..d498881 --- /dev/null +++ b/gradle-plugin/src/main/kotlin/moe/nea/mcautotranslations/gradle/visitors/KVVisitor.kt @@ -0,0 +1,32 @@ +package moe.nea.mcautotranslations.gradle.visitors + +import org.objectweb.asm.AnnotationVisitor +import org.objectweb.asm.Opcodes + +internal class KVVisitor(val map: MutableMap<String, String>) : AnnotationVisitor(Opcodes.ASM9) { + var value: String? = null + var key: String? = null + override fun visit(name: String, value: Any) { + when (name) { + "translationKey" -> this.key = value as String + "translationValue" -> this.value = value as String + else -> error("Unknown annotation element $name") + } + } + + override fun visitAnnotation(name: String?, descriptor: String?): AnnotationVisitor { + error("Unknown annotation element $name") + } + + override fun visitArray(name: String?): AnnotationVisitor { + error("Unknown annotation element $name") + } + + override fun visitEnum(name: String?, descriptor: String?, value: String?) { + error("Unknown annotation element $name") + } + + override fun visitEnd() { + map[key ?: error("Missing key")] = value ?: error("Missing value") + } +}
\ No newline at end of file diff --git a/gradle-plugin/src/main/kotlin/moe/nea/mcautotranslations/gradle/visitors/RepeatableVisitor.kt b/gradle-plugin/src/main/kotlin/moe/nea/mcautotranslations/gradle/visitors/RepeatableVisitor.kt new file mode 100644 index 0000000..519d68e --- /dev/null +++ b/gradle-plugin/src/main/kotlin/moe/nea/mcautotranslations/gradle/visitors/RepeatableVisitor.kt @@ -0,0 +1,31 @@ +package moe.nea.mcautotranslations.gradle.visitors + +import moe.nea.mcautotranslations.gradle.ArrayElementVisitor +import org.objectweb.asm.AnnotationVisitor +import org.objectweb.asm.Opcodes + +internal class RepeatableVisitor(val map: MutableMap<String, String>) : AnnotationVisitor(Opcodes.ASM9) { + override fun visitArray(name: String?): AnnotationVisitor { + require(name == "value") { "Unknown annotation element $name" } + foundArray = true + return ArrayElementVisitor(map) + } + + var foundArray = false + + override fun visitEnd() { + require(foundArray) { "Missing array" } + } + + override fun visitAnnotation(name: String?, descriptor: String?): AnnotationVisitor { + error("Unknown annotation element $name") + } + + override fun visit(name: String?, value: Any?) { + error("Unknown annotation element $name") + } + + override fun visitEnum(name: String?, descriptor: String?, value: String?) { + error("Unknown annotation element $name") + } +}
\ No newline at end of file |