fix(lang-monarch): EnterSupport is not created when language config…

…uration does not offer `onEnterRules`
Rosemoe · Dec 9, 2024 · 7e903a0 · 7e903a0
1 parent 6fa1444
commit 7e903a0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/language-monarch/src/main/java/io/github/rosemoe/sora/langs/monarch/MonarchNewlineHandler.kt b/language-monarch/src/main/java/io/github/rosemoe/sora/langs/monarch/MonarchNewlineHandler.kt
@@ -71,13 +71,7 @@ class MonarchNewlineHandler(
             val brackets = languageConfiguration.brackets
 
             val indentationsRules = languageConfiguration.indentationRules
-            if (enterRules != null) {
-                enterSupport =
-                    OnEnterSupport(
-                        brackets,
-                        enterRules
-                    )
-            }
+            enterSupport = OnEnterSupport(brackets, enterRules)
 
             if (indentationsRules != null) {
                 indentRulesSupport = IndentRulesSupport(

diff --git a/...onarch/src/main/java/io/github/rosemoe/sora/langs/monarch/languageconfiguration/loader.kt b/...onarch/src/main/java/io/github/rosemoe/sora/langs/monarch/languageconfiguration/loader.kt
@@ -57,7 +57,7 @@ class LanguageConfigurationAdapter : JsonAdapter<LanguageConfiguration>() {
 
         var indentationRules: IndentationRule? = null
 
-        var onEnterRules: List<OnEnterRule>? = null
+        var onEnterRules: List<OnEnterRule> = listOf()
 
         var autoCloseBefore: String? = null
 

diff --git a/...io/github/rosemoe/sora/langs/monarch/languageconfiguration/model/LanguageConfiguration.kt b/...io/github/rosemoe/sora/langs/monarch/languageconfiguration/model/LanguageConfiguration.kt
@@ -53,7 +53,7 @@ data class LanguageConfiguration(
     /**
      * The language's rules to be evaluated when pressing Enter.
      */
-    val onEnterRules: List<OnEnterRule>? = null,
+    val onEnterRules: List<OnEnterRule> = listOf(),
     /**
      * The language's auto closing pairs. The 'close' character is automatically inserted with the
      * 'open' character is typed. If not set, the configured brackets will be used.