compiler: cleanup 'public', property access syntax
This commit is contained in:
@@ -18,24 +18,24 @@ package org.jetbrains.kotlin.compiler.plugin
|
||||
|
||||
import java.util.regex.Pattern
|
||||
|
||||
public class CliOption(
|
||||
public val name: String,
|
||||
public val valueDescription: String,
|
||||
public val description: String,
|
||||
public val required: Boolean = true,
|
||||
public val allowMultipleOccurrences: Boolean = false
|
||||
class CliOption(
|
||||
val name: String,
|
||||
val valueDescription: String,
|
||||
val description: String,
|
||||
val required: Boolean = true,
|
||||
val allowMultipleOccurrences: Boolean = false
|
||||
)
|
||||
|
||||
public open class CliOptionProcessingException(message: String, cause: Throwable? = null): RuntimeException(message, cause)
|
||||
open class CliOptionProcessingException(message: String, cause: Throwable? = null): RuntimeException(message, cause)
|
||||
|
||||
public class PluginCliOptionProcessingException(
|
||||
class PluginCliOptionProcessingException(
|
||||
val pluginId: String,
|
||||
val options: Collection<CliOption>,
|
||||
message: String,
|
||||
cause: Throwable? = null
|
||||
): CliOptionProcessingException(message, cause)
|
||||
|
||||
public fun cliPluginUsageString(pluginId: String, options: Collection<CliOption>): String {
|
||||
fun cliPluginUsageString(pluginId: String, options: Collection<CliOption>): String {
|
||||
val LEFT_INDENT = 2
|
||||
val MAX_OPTION_WIDTH = 26
|
||||
|
||||
@@ -55,7 +55,7 @@ public fun cliPluginUsageString(pluginId: String, options: Collection<CliOption>
|
||||
return "Plugin \"$pluginId\" usage:\n" + renderedOptions.joinToString("\n", postfix = "\n")
|
||||
}
|
||||
|
||||
public data class CliOptionValue(
|
||||
data class CliOptionValue(
|
||||
val pluginId: String,
|
||||
val optionName: String,
|
||||
val value: String
|
||||
@@ -63,7 +63,7 @@ public data class CliOptionValue(
|
||||
override fun toString() = "$pluginId:$optionName=$value"
|
||||
}
|
||||
|
||||
public fun parsePluginOption(argumentValue: String): CliOptionValue? {
|
||||
fun parsePluginOption(argumentValue: String): CliOptionValue? {
|
||||
val pattern = Pattern.compile("""^plugin:([^:]*):([^=]*)=(.*)$""")
|
||||
val matcher = pattern.matcher(argumentValue)
|
||||
if (matcher.matches()) {
|
||||
@@ -73,6 +73,6 @@ public fun parsePluginOption(argumentValue: String): CliOptionValue? {
|
||||
return null
|
||||
}
|
||||
|
||||
public fun getPluginOptionString(pluginId: String, key: String, value: String): String {
|
||||
fun getPluginOptionString(pluginId: String, key: String, value: String): String {
|
||||
return "plugin:$pluginId:$key=$value"
|
||||
}
|
||||
+4
-5
@@ -18,10 +18,9 @@ package org.jetbrains.kotlin.compiler.plugin
|
||||
|
||||
import org.jetbrains.kotlin.config.CompilerConfiguration
|
||||
|
||||
public interface CommandLineProcessor {
|
||||
public val pluginId: String
|
||||
public val pluginOptions: Collection<CliOption>
|
||||
interface CommandLineProcessor {
|
||||
val pluginId: String
|
||||
val pluginOptions: Collection<CliOption>
|
||||
|
||||
@Throws(CliOptionProcessingException::class)
|
||||
public fun processOption(option: CliOption, value: String, configuration: CompilerConfiguration)
|
||||
@Throws(CliOptionProcessingException::class) fun processOption(option: CliOption, value: String, configuration: CompilerConfiguration)
|
||||
}
|
||||
@@ -20,10 +20,10 @@ import com.intellij.mock.MockProject
|
||||
import org.jetbrains.kotlin.config.CompilerConfigurationKey
|
||||
import org.jetbrains.kotlin.config.CompilerConfiguration
|
||||
|
||||
public interface ComponentRegistrar {
|
||||
interface ComponentRegistrar {
|
||||
companion object {
|
||||
public val PLUGIN_COMPONENT_REGISTRARS: CompilerConfigurationKey<MutableList<ComponentRegistrar>> = CompilerConfigurationKey.create("plugin component registrars")
|
||||
val PLUGIN_COMPONENT_REGISTRARS: CompilerConfigurationKey<MutableList<ComponentRegistrar>> = CompilerConfigurationKey.create("plugin component registrars")
|
||||
}
|
||||
|
||||
public fun registerProjectComponents(project: MockProject, configuration: CompilerConfiguration)
|
||||
fun registerProjectComponents(project: MockProject, configuration: CompilerConfiguration)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user