fix: remove unused 'scheme.langs' property from color schemes

This commit is contained in:
Akash Yadav
2023-01-17 07:57:37 +05:30
parent 83b8ffb531
commit 193d82a7a8
7 changed files with 7 additions and 19 deletions
+5
View File
@@ -105,6 +105,11 @@
<module name="AndroidIDE.subprojects.java-compiler.test" target="8" />
<module name="AndroidIDE.subprojects.jdk-compiler.main" target="8" />
<module name="AndroidIDE.subprojects.jdk-compiler.test" target="8" />
<module name="AndroidIDE.subprojects.jsonrpc" target="11" />
<module name="AndroidIDE.subprojects.jsonrpc.main" target="11" />
<module name="AndroidIDE.subprojects.jsonrpc.test" target="11" />
<module name="AndroidIDE.subprojects.xml-formatter.main" target="11" />
<module name="AndroidIDE.subprojects.xml-formatter.test" target="11" />
<module name="AndroidIDE.treesitter.test" target="1.7" />
</bytecodeTargetLevel>
</component>
@@ -7,8 +7,5 @@ scheme.version=2
# Whether the scheme is dark or light
scheme.isDark=true
# Languages that scheme supports
scheme.langs=java,xml
# The JSON color scheme definition file
scheme.file=default-dark.json
@@ -7,8 +7,5 @@ scheme.version=5
# Whether the scheme is dark or light
scheme.isDark=false
# Languages that scheme supports
scheme.langs=java,xml
# The JSON color scheme definition file
scheme.file=default.json
@@ -35,9 +35,6 @@ class IDEColorScheme(internal val file: File, val key: String) : DynamicColorSch
var version: Int = 0
internal set
var langs: Array<String> = emptyArray()
internal set
var isDarkScheme: Boolean = false
internal set
@@ -41,7 +41,6 @@ object IDEColorSchemeProvider {
private const val SCHEME_NAME = "scheme.name"
private const val SCHEME_VERSION = "scheme.version"
private const val SCHEME_IS_DARK = "scheme.isDark"
private const val SCHEME_LANGS = "scheme.langs"
private const val SCHEME_FILE = "scheme.file"
val currentScheme: IDEColorScheme? by lazy {
@@ -78,7 +77,6 @@ object IDEColorSchemeProvider {
val name = props.getProperty(SCHEME_NAME, "Unknown")
val version = props.getProperty(SCHEME_VERSION, "0").toInt()
val isDark = props.getProperty(SCHEME_IS_DARK, "false").toBoolean()
val langs = props.getProperty(SCHEME_LANGS, "").split(',').map { it.trim() }
val file =
props.getProperty(SCHEME_FILE)
?: run {
@@ -95,16 +93,11 @@ object IDEColorSchemeProvider {
if (file.isBlank()) {
continue
}
if (langs.isEmpty()) {
log.error("Scheme '${schemeDir.name}' does not specify any languages")
continue
}
val scheme = IDEColorScheme(File(schemeDir, file), schemeDir.name)
scheme.name = name
scheme.version = version
scheme.isDarkScheme = isDark
scheme.langs = langs.toTypedArray()
schemes[schemeDir.name] = scheme
}
@@ -101,12 +101,11 @@ class SchemeParser(private val resolveFileRef: (String) -> File) {
const val KEY_LANGUAGES = "languages"
}
fun parse(file: File, name: String, isDark: Boolean, langs: Array<String>): IDEColorScheme {
fun parse(file: File, name: String, isDark: Boolean): IDEColorScheme {
require(file.exists() && file.isFile) { "File does not exist or is not a file" }
val scheme = IDEColorScheme(file, name)
scheme.name = name
scheme.isDarkScheme = isDark
scheme.langs = langs
load(scheme)
return scheme
}
@@ -205,7 +205,7 @@ class SchemeParserTest {
private fun parseSyntaxJson(name: String = "syntax.json"): IDEColorScheme {
val basePath = "./src/test/resources"
val parser = SchemeParser { File("$basePath/$it") }
val scheme = parser.parse(File("$basePath/$name"), "AndroidIDE Test Scheme", false, arrayOf("java", "@log"))
val scheme = parser.parse(File("$basePath/$name"), "AndroidIDE Test Scheme", false)
assertThat(scheme).isNotNull()
return scheme
}