[ lang ] Update laji code structure

ice1000 · Apr 20, 2018 · c5d03ec · c5d03ec
1 parent 2bed9db
commit c5d03ec
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 14 deletions.
diff --git a/common/src/org/ice1000/devkt/lang/languages.kt b/common/src/org/ice1000/devkt/lang/languages.kt
@@ -23,31 +23,34 @@ import javax.swing.Icon
  * @since v1.2
  * @see Language
  */
-abstract class DevKtLanguage<TextAttributes> internal constructor(
-		val language: Language
-) : Annotator<TextAttributes>, SyntaxHighlighter<TextAttributes> {
+interface DevKtLanguage<TextAttributes> : Annotator<TextAttributes>, SyntaxHighlighter<TextAttributes> {
+	val language: Language
 
 	/**
 	 * Check if a file is of this language
 	 * @param fileName String the file name
 	 * @return Boolean is of this language or not
 	 */
-	open fun satisfies(fileName: String) = false
+	@JvmDefault
+	fun satisfies(fileName: String) = false
 
 	/**
 	 * Line comment start, used when pressing <kbd>Ctrl</kbd> + <kbd>/</kbd>
 	 */
-	open val lineCommentStart: String? get() = null
+	@JvmDefault
+	val lineCommentStart: String? get() = null
 
 	/**
 	 * Block comment surrounding, used when pressing
 	 * <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>/</kbd>
 	 */
-	open val blockComment: Pair<String, String>? get() = null
+	@JvmDefault
+	val blockComment: Pair<String, String>? get() = null
 
-	open val icon: Icon get() = DevKtIcons.ANY
+	@JvmDefault
+	val icon: Icon get() = DevKtIcons.ANY
 
-	abstract fun createLexer(project: Project): Lexer
+	fun createLexer(project: Project): Lexer
 
 	/**
 	 * Called when typing, before the typed character is inserted.
@@ -59,7 +62,8 @@ abstract class DevKtLanguage<TextAttributes> internal constructor(
 	 * @see org.ice1000.devkt.ui.DevKtDocumentHandler.insertDirectly
 	 * @see org.ice1000.devkt.ui.DevKtDocumentHandler.insert
 	 */
-	open fun handleTyping(
+	@JvmDefault
+	fun handleTyping(
 			offset: Int,
 			text: String?,
 			element: PsiElement?,
@@ -76,8 +80,8 @@ abstract class DevKtLanguage<TextAttributes> internal constructor(
 sealed class BuiltinDevKtLanguage<TextAttributes>(
 		annotator: Annotator<TextAttributes>,
 		syntaxHighlighter: SyntaxHighlighter<TextAttributes>,
-		language: Language
-) : DevKtLanguage<TextAttributes>(language),
+		override val language: Language
+) : DevKtLanguage<TextAttributes>,
 		Annotator<TextAttributes> by annotator,
 		SyntaxHighlighter<TextAttributes> by syntaxHighlighter {
 	override fun satisfies(fileName: String) = false
@@ -140,11 +144,13 @@ class Kotlin<TextAttributes>(
 class PlainText<TextAttributes>(
 		annotator: Annotator<TextAttributes>,
 		syntaxHighlighter: SyntaxHighlighter<TextAttributes>
-) : DevKtLanguage<TextAttributes>(PlainTextLanguage.INSTANCE),
+) : DevKtLanguage<TextAttributes>,
 		Annotator<TextAttributes> by annotator,
 		SyntaxHighlighter<TextAttributes> by syntaxHighlighter {
+	override val language: PlainTextLanguage = PlainTextLanguage.INSTANCE
 	override fun satisfies(fileName: String) =
 			fileName.endsWith(".txt") && !fileName.endsWith(".lua.txt") || '.' !in fileName
+
 	private val lexer = EmptyLexer()
 	override fun createLexer(project: Project) = lexer
 }
diff --git a/common/src/org/ice1000/devkt/openapi/languages.kt b/common/src/org/ice1000/devkt/openapi/languages.kt
@@ -17,9 +17,9 @@ import javax.swing.Icon
  * @since v1.2
  */
 abstract class ExtendedDevKtLanguage<TextAttributes>(
-		language: Language,
+		override val language: Language,
 		val parserDefinition: ParserDefinition
-) : DevKtLanguage<TextAttributes>(language) {
+) : DevKtLanguage<TextAttributes> {
 	/**
 	 * Creates a lexer for syntax highlight
 	 *