From 193d82a7a857b1e1a3bb65ddaf7c12e4f7d0fb02 Mon Sep 17 00:00:00 2001 From: Akash Yadav Date: Tue, 17 Jan 2023 07:57:37 +0530 Subject: [PATCH] fix: remove unused 'scheme.langs' property from color schemes --- .idea/compiler.xml | 5 +++++ .../main/assets/editor/schemes/default-dark/scheme.prop | 3 --- editor/src/main/assets/editor/schemes/default/scheme.prop | 3 --- .../com/itsaky/androidide/editor/schemes/IDEColorScheme.kt | 3 --- .../androidide/editor/schemes/IDEColorSchemeProvider.kt | 7 ------- .../editor/schemes/internal/parser/SchemeParser.kt | 3 +-- .../editor/schemes/internal/parser/SchemeParserTest.kt | 2 +- 7 files changed, 7 insertions(+), 19 deletions(-) diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 2023913fd..da013e981 100755 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -105,6 +105,11 @@ + + + + + diff --git a/editor/src/main/assets/editor/schemes/default-dark/scheme.prop b/editor/src/main/assets/editor/schemes/default-dark/scheme.prop index 871e7abc2..4333a4cf2 100644 --- a/editor/src/main/assets/editor/schemes/default-dark/scheme.prop +++ b/editor/src/main/assets/editor/schemes/default-dark/scheme.prop @@ -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 \ No newline at end of file diff --git a/editor/src/main/assets/editor/schemes/default/scheme.prop b/editor/src/main/assets/editor/schemes/default/scheme.prop index f4844f4ad..eb38c4a0f 100644 --- a/editor/src/main/assets/editor/schemes/default/scheme.prop +++ b/editor/src/main/assets/editor/schemes/default/scheme.prop @@ -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 \ No newline at end of file diff --git a/editor/src/main/java/com/itsaky/androidide/editor/schemes/IDEColorScheme.kt b/editor/src/main/java/com/itsaky/androidide/editor/schemes/IDEColorScheme.kt index d88d1679b..b944cbbf5 100644 --- a/editor/src/main/java/com/itsaky/androidide/editor/schemes/IDEColorScheme.kt +++ b/editor/src/main/java/com/itsaky/androidide/editor/schemes/IDEColorScheme.kt @@ -35,9 +35,6 @@ class IDEColorScheme(internal val file: File, val key: String) : DynamicColorSch var version: Int = 0 internal set - var langs: Array = emptyArray() - internal set - var isDarkScheme: Boolean = false internal set diff --git a/editor/src/main/java/com/itsaky/androidide/editor/schemes/IDEColorSchemeProvider.kt b/editor/src/main/java/com/itsaky/androidide/editor/schemes/IDEColorSchemeProvider.kt index 42a555e1a..2cb2c2cce 100644 --- a/editor/src/main/java/com/itsaky/androidide/editor/schemes/IDEColorSchemeProvider.kt +++ b/editor/src/main/java/com/itsaky/androidide/editor/schemes/IDEColorSchemeProvider.kt @@ -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 } diff --git a/editor/src/main/java/com/itsaky/androidide/editor/schemes/internal/parser/SchemeParser.kt b/editor/src/main/java/com/itsaky/androidide/editor/schemes/internal/parser/SchemeParser.kt index eab6dd9c4..f6d84e660 100644 --- a/editor/src/main/java/com/itsaky/androidide/editor/schemes/internal/parser/SchemeParser.kt +++ b/editor/src/main/java/com/itsaky/androidide/editor/schemes/internal/parser/SchemeParser.kt @@ -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): 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 } diff --git a/editor/src/test/java/com/itsaky/androidide/editor/schemes/internal/parser/SchemeParserTest.kt b/editor/src/test/java/com/itsaky/androidide/editor/schemes/internal/parser/SchemeParserTest.kt index 443f454a1..bf50b1bf0 100644 --- a/editor/src/test/java/com/itsaky/androidide/editor/schemes/internal/parser/SchemeParserTest.kt +++ b/editor/src/test/java/com/itsaky/androidide/editor/schemes/internal/parser/SchemeParserTest.kt @@ -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 }