Skip to content
This repository was archived by the owner on Jun 14, 2025. It is now read-only.

Commit 610929e

Browse files
authored
Update IdeLanguage.kt
1 parent 4e861ef commit 610929e

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

common/src/main/java/org/cosmicide/editor/language/IdeLanguage.kt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,31 +15,34 @@ import io.github.rosemoe.sora.widget.SymbolPairMatch
1515
import org.cosmicide.common.Prefs
1616
import org.cosmicide.editor.language.IdeFormatter
1717
import org.eclipse.tm4e.core.grammar.IGrammar
18+
import org.eclipse.tm4e.languageconfiguration.model.LanguageConfiguration
1819

1920
/**
2021
* A language implementation for the IDE.
2122
*
2223
* @param grammar The grammar for the language.
24+
* @param langConfiguration The language configuration.
2325
* @param grammarRegistry The grammar registry.
2426
* @param themeRegistry The theme registry.
2527
* @param createIdentifiers Whether to create identifiers or not.
2628
*/
2729
open class IdeLanguage(
2830
private val grammar: IGrammar?,
31+
private val langConfiguration: LanguageConfiguration?,
2932
private val grammarRegistry: GrammarRegistry,
3033
private val themeRegistry: ThemeRegistry,
3134
private val createIdentifiers: Boolean = false
3235
) : TextMateLanguage(
3336
grammar,
34-
grammarRegistry.findLanguageConfiguration(grammar?.scopeName),
37+
langConfiguration,
3538
grammarRegistry,
3639
themeRegistry,
3740
createIdentifiers
3841
) {
3942

4043
private val _symbolPairs: SymbolPairMatch by lazy {
4144
val symbolPair = SymbolPairMatch()
42-
languageConfiguration.autoClosingPairs!!.forEach { autoClosingPair ->
45+
langConfiguration?.autoClosingPairs?.forEach { autoClosingPair ->
4346
symbolPair.putPair(
4447
autoClosingPair.open,
4548
SymbolPairMatch.SymbolPair(

0 commit comments

Comments
 (0)