code refactor

Author: wakaztahir

codeeditor/src/commonMain/kotlin/com/wakaztahir/codeeditor/prettify/lang/Lang.kt

@@ -13,7 +13,6 @@
 // limitations under the License.
 package com.wakaztahir.codeeditor.prettify.lang
 
-import com.wakaztahir.codeeditor.prettify.lang.Lang
 import com.wakaztahir.codeeditor.prettify.parser.StylePattern
 
 /**

codeeditor/src/commonMain/kotlin/com/wakaztahir/codeeditor/prettify/lang/LangMatlab.kt

@@ -51,7 +51,7 @@ class LangMatlab : Lang() {
         const val PR_TRANSPOSE = "transpose"
         const val PR_LINE_CONTINUATION = "linecont"
         val fileExtensions: List<String>
-            get() = listOf(*arrayOf("matlab"))
+            get() = listOf("matlab")
     }
 
     override val fallthroughStylePatterns = ArrayList<StylePattern>()
@@ -243,7 +243,7 @@ class LangMatlab : Lang() {
     class LangMatlabOperator : Lang() {
         companion object {
             val fileExtensions: List<String>
-                get() = listOf(*arrayOf("matlab-operators"))
+                get() = listOf("matlab-operators")
         }
 
         override val fallthroughStylePatterns = ArrayList<StylePattern>()

codeeditor/src/commonMain/kotlin/com/wakaztahir/codeeditor/prettify/parser/CombinePrefixPattern.kt

@@ -183,7 +183,7 @@ class CombinePrefixPattern {
 
         // [[1, 10], [3, 4], [8, 12], [14, 14], [16, 16], [17, 17]]
         // -> [[1, 12], [14, 14], [16, 17]]
-        ranges.sortWith(Comparator { a, b -> if (a[0] != b[0]) (a[0] - b[0]) else (b[1] - a[1]) })
+        ranges.sortWith({ a, b -> if (a[0] != b[0]) (a[0] - b[0]) else (b[1] - a[1]) })
 //        Collections.sort(ranges, Comparator { a, b -> if (a[0] !== b[0]) (a[0] - b[0]) else (b[1] - a[1]) })
         val consolidatedRanges: MutableList<List<Int>> = ArrayList()
         //        List<Integer> lastRange = listOf(new Integer[]{0, 0});
@@ -242,7 +242,7 @@ class CombinePrefixPattern {
             var i: Int = 0
             var groupIndex: Int = 0
             while (i < n) {
-                val p: String? = parts.get(i)
+                val p: String = parts.get(i)
                 if ((p == "(")) {
                     // groups are 1-indexed, so max group index is count of '('
                     ++groupIndex
@@ -275,7 +275,7 @@ class CombinePrefixPattern {
             var i: Int = 0
             var groupIndex: Int = 0
             while (i < n) {
-                val p: String? = parts.get(i)
+                val p: String = parts.get(i)
                 if ((p == "(")) {
                     ++groupIndex
                     if (capturedGroups.get(groupIndex) == null) {

codeeditor/src/commonMain/kotlin/com/wakaztahir/codeeditor/prettify/parser/Prettify.kt

@@ -827,7 +827,7 @@ class Prettify {
                 + "as,as?,fun,in,!in,object,typealias,val,var,when,by,constructor,delegate,dynamic,field,"
                 + "file,get,init,set,value,where,actual,annotation,companion,crossinline,data,enum,expect,"
                 + "external,field,infix,inline,inner,internal,it,lateinit,noinline,open,operator,out,override,"
-                + "reified,sealed,suspend,tailrec,vararg");
+                + "reified,sealed,suspend,tailrec,vararg")
         const val RUST_KEYWORDS = (FLOW_CONTROL_KEYWORDS + "," + "as,assert,const,copy,drop,"
                 + "enum,extern,fail,false,fn,impl,let,log,loop,match,mod,move,mut,priv,"
                 + "pub,pure,ref,self,static,struct,true,trait,type,unsafe,use")
@@ -858,7 +858,7 @@ class Prettify {
                 + "function,in,local,set,then,until")
         const val ALL_KEYWORDS = (CPP_KEYWORDS + "," + KOTLIN_KEYWORDS + "," + CSHARP_KEYWORDS
                 + "," + JSCRIPT_KEYWORDS + "," + PERL_KEYWORDS + "," + PYTHON_KEYWORDS + "," + RUBY_KEYWORDS
-                + "," + SH_KEYWORDS);
+                + "," + SH_KEYWORDS)
         val C_TYPES =
             Regex("^(DIR|FILE|vector|(de|priority_)?queue|list|stack|(const_)?iterator|(multi)?(set|map)|bitset|u?(int|float)\\d*)\\b")
         // token style names.  correspond to css classes

codeeditor/src/commonMain/kotlin/com/wakaztahir/codeeditor/theme/CodeTheme.kt

@@ -1,6 +1,5 @@
 package com.wakaztahir.codeeditor.theme
 
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.SpanStyle
 import com.wakaztahir.codeeditor.parser.ParseResult
 import com.wakaztahir.codeeditor.prettify.parser.Prettify

codeeditor/src/commonMain/kotlin/com/wakaztahir/codeeditor/utils/Annotation.kt

@@ -1,7 +1,6 @@
 package com.wakaztahir.codeeditor.utils
 
 import androidx.compose.ui.text.AnnotatedString
-import androidx.compose.ui.text.buildAnnotatedString
 import com.wakaztahir.codeeditor.model.CodeLang
 import com.wakaztahir.codeeditor.parser.ParseResult
 import com.wakaztahir.codeeditor.prettify.PrettifyParser