github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-01-10 18:40:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Correct class naming following Kotlin formal style

Browse Source
This commit is contained in:
Karlatemp 2020-09-12 19:40:34 +08:00
parent 9a1a6dddfd
commit 11688b1dec
No known key found for this signature in database
GPG Key ID: 21FBDDF664FF06F8
5 changed files with 23 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/mirai-console-pure/src/main/kotlin/net/mamoe/mirai/console/pure/ConsolePureSettings.kt
View File

@ -23,9 +23,9 @@ package net.mamoe.mirai.console.pure
AnnotationTarget.CONSTRUCTOR
)
@MustBeDocumented
annotation class ConsolePureExperimentalAPI
annotation class ConsolePureExperimentalApi
@ConsolePureExperimentalAPI
@ConsolePureExperimentalApi
public object ConsolePureSettings {
@JvmField
var setupAnsi: Boolean = System.getProperty("os.name")

2
frontend/mirai-console-pure/src/main/kotlin/net/mamoe/mirai/console/pure/ConsoleThread.kt
View File

@ -27,7 +27,7 @@ import org.jline.reader.UserInterruptException
val consoleLogger by lazy { DefaultLogger("console") }
@OptIn(ConsoleInternalApi::class, ConsolePureExperimentalAPI::class)
@OptIn(ConsoleInternalApi::class, ConsolePureExperimentalApi::class)
internal fun startupConsoleThread() {
if (ConsolePureSettings.noConsole) return

2
frontend/mirai-console-pure/src/main/kotlin/net/mamoe/mirai/console/pure/MiraiConsoleImplementationPure.kt
View File

@ -17,7 +17,7 @@
"INVISIBLE_ABSTRACT_MEMBER_FROM_SUPER_WARNING",
"EXPOSED_SUPER_CLASS"
)
@file:OptIn(ConsoleInternalApi::class, ConsoleFrontEndImplementation::class, ConsolePureExperimentalAPI::class)
@file:OptIn(ConsoleInternalApi::class, ConsoleFrontEndImplementation::class, ConsolePureExperimentalApi::class)
package net.mamoe.mirai.console.pure

6
frontend/mirai-console-pure/src/main/kotlin/net/mamoe/mirai/console/pure/MiraiConsolePureLoader.kt
View File

@ -15,7 +15,7 @@
"INVISIBLE_GETTER",
"INVISIBLE_ABSTRACT_MEMBER_FROM_SUPER",
)
@file:OptIn(ConsoleInternalApi::class, ConsolePureExperimentalAPI::class)
@file:OptIn(ConsoleInternalApi::class, ConsolePureExperimentalApi::class)
package net.mamoe.mirai.console.pure
@ -53,7 +53,7 @@ object MiraiConsolePureLoader {
}
}
@ConsolePureExperimentalAPI
@ConsolePureExperimentalApi
fun printHelpMessage() {
val help = listOf(
"" to "Mirai-Console[Pure FrontEnd] v" + kotlin.runCatching {
@ -96,7 +96,7 @@ object MiraiConsolePureLoader {
}
}
@ConsolePureExperimentalAPI
@ConsolePureExperimentalApi
fun parse(args: Array<String>, exitProcess: Boolean = false) {
val iterator = args.iterator()
while (iterator.hasNext()) {

45
frontend/mirai-console-pure/src/main/kotlin/net/mamoe/mirai/console/pure/noconsole/NoConsole.kt
View File

@ -10,11 +10,11 @@
/*
* @author Karlatemp <karlatemp@vip.qq.com> <https://github.com/Karlatemp>
*/
@file:OptIn(ConsolePureExperimentalAPI::class)
@file:OptIn(ConsolePureExperimentalApi::class)
package net.mamoe.mirai.console.pure.noconsole
import net.mamoe.mirai.console.pure.ConsolePureExperimentalAPI
import net.mamoe.mirai.console.pure.ConsolePureExperimentalApi
import net.mamoe.mirai.console.pure.ConsolePureSettings
import org.jline.keymap.KeyMap
import org.jline.reader.*
@ -38,8 +38,7 @@ internal object NoConsoleNonBlockingReader : NonBlockingReader() {
return LN_INT
}
override fun close() {
}
override fun close() {}
override fun readBuffered(b: CharArray?): Int {
return 0
@ -47,13 +46,9 @@ internal object NoConsoleNonBlockingReader : NonBlockingReader() {
}
internal object AllNextLineInputStream : InputStream() {
override fun read(): Int {
return LN_INT
}
override fun read(): Int = LN_INT
override fun available(): Int {
return 1
}
override fun available(): Int = 1
override fun read(b: ByteArray, off: Int, len: Int): Int {
for (i in off until (off + len)) {
@ -62,28 +57,19 @@ internal object AllNextLineInputStream : InputStream() {
return len
}
override fun close() {
}
override fun close() {}
}
internal object AllIgnoredOutputStream : OutputStream() {
override fun close() {
}
override fun write(b: ByteArray, off: Int, len: Int) {
}
override fun write(b: ByteArray) {
}
override fun write(b: Int) {
}
override fun flush() {
}
override fun close() {}
override fun write(b: ByteArray, off: Int, len: Int) {}
override fun write(b: ByteArray) {}
override fun write(b: Int) {}
override fun flush() {}
}
internal val SystemOutputPrintStream by lazy {
@OptIn(ConsolePureExperimentalApi::class)
if (ConsolePureSettings.setupAnsi) {
org.fusesource.jansi.AnsiConsole.systemInstall()
}
@ -95,12 +81,13 @@ internal object AllEmptyLineReader : LineReader {
override fun printAbove(str: String?) {
if (str == null) return
@OptIn(ConsolePureExperimentalApi::class)
if (ConsolePureSettings.noAnsi) {
SystemOutputPrintStream.println(ANSI_REGEX.replace(str, ""))
} else SystemOutputPrintStream.println(str)
}
@OptIn(ConsolePureExperimentalAPI::class)
@OptIn(ConsolePureExperimentalApi::class)
override fun readLine(): String =
if (ConsolePureSettings.noConsoleSafeReading) ConsolePureSettings.noConsoleReadingReplacement
else error("Unsupported Reading line when console front-end closed.")
@ -111,13 +98,13 @@ internal object AllEmptyLineReader : LineReader {
override fun readLine(prompt: String?): String = readLine()
override fun readLine(prompt: String?, mask: Char?): String = readLine()
override fun readLine(prompt: String?, mask: Char?, buffer: String?): String = readLine()
override fun readLine(prompt: String?, rightPrompt: String?, mask: Char?, buffer: String?): String = ""
override fun readLine(prompt: String?, rightPrompt: String?, mask: Char?, buffer: String?): String = readLine()
override fun readLine(
prompt: String?,
rightPrompt: String?,
maskingCallback: MaskingCallback?,
buffer: String?
): String = ""
): String = readLine()
override fun printAbove(str: AttributedString?) {
str?.let { printAbove(it.toAnsi()) }