Remove musc stuff

Author: NickAcPT

skriptinsight-core/src/main/kotlin/io/github/skriptinsight/SkriptFileExtensions.kt

@@ -0,0 +1,33 @@
+package io.github.skriptinsight
+
+import io.github.skriptinsight.file.SkriptFile
+import io.github.skriptinsight.file.node.SkriptNode
+import io.github.skriptinsight.file.node.indentation.computeIndentationLevelsForNode
+
+fun SkriptFile.printStructuralTree(): String {
+    return buildString {
+        val fileRootNodes = rootNodes
+        val indentationLevels =
+            computeIndentationLevelsForNode(nodes.values)
+
+        fileRootNodes.forEach { it.printNodeChildren(this, indentationLevels) }
+    }
+}
+
+private fun SkriptNode.printNodeChildren(sb: StringBuilder, indentationLevels: List<Int>) {
+    sb.apply {
+        val parentSpace = parent?.normalizedIndentCount?.plus(1) ?: 0
+        append(" ".repeat(parentSpace))
+
+        val dashAmount = (normalizedIndentCount - parentSpace).coerceAtLeast(0)
+        if (dashAmount != 0)
+            append('|')
+        append("-".repeat(dashAmount))
+
+        append(content)
+        append(comment)
+        append(System.lineSeparator())
+
+        children?.forEach { it.printNodeChildren(this, indentationLevels) }
+    }
+}

skriptinsight-core/src/main/kotlin/io/github/skriptinsight/SyntaxFacts.kt

@@ -31,7 +31,7 @@ object SyntaxFacts {
 
     @Language("Regexp")
     val varRegex =
-        ("((the )?var(iable)? )?\\{([^{}]|%\\{|\\}%)+\\}")
+        ("(?<varprefix>(?<theprefix>the )?var(?<iableprefix>iable)? )?\\{((?:[^{}]|%\\{|}%)+)}")
 
     @Language("Regexp")
     val lineRegex = "^((?:[^#]|##)*)(\\s*#(?!#).*)$"
@@ -48,7 +48,7 @@ object SyntaxFacts {
         ("<\\s*(?:(.+?)\\s*:\\s*)?(.+?)\\s*(?:=\\s*($wildcard))?\\s*>")
 
     @Language("Regexp")
-    val linkRegex = ("[-a-zA-Z0-9@:%._\\+~#=]{2,256}\\.[a-z]{2,6}\\b([-a-zA-Z0-9@:%_\\+.~#?&//=]*)")
+    val linkRegex = ("[-a-zA-Z0-9@:%._+~#=]{2,256}\\.[a-z]{2,6}\\b([-a-zA-Z0-9@:%_+.~#?&/=]*)")
 
 
 }

skriptinsight-core/src/main/kotlin/io/github/skriptinsight/editing/MatchContext.kt

@@ -3,4 +3,11 @@ package io.github.skriptinsight.editing
 import java.util.regex.MatchResult
 import java.util.regex.Matcher
 
-data class MatchContext(val matcher: Matcher, val matchResult: MatchResult, internal val indentCount: Int, internal val lineNumber: Int)
+data class MatchContext(
+    val matcher: Matcher,
+    val matchResult: MatchResult,
+    internal val indentCount: Int,
+    internal val lineNumber: Int
+) {
+
+}

skriptinsight-tokens/src/main/kotlin/io/github/skriptinsight/SkriptFileExtensions.kt

@@ -5,34 +5,6 @@ import io.github.skriptinsight.file.node.SkriptNode
 import io.github.skriptinsight.file.node.indentation.computeIndentationLevelsForNode
 import io.github.skriptinsight.tokens.TokenizedModel
 
-fun SkriptFile.printStructuralTree(): String {
-    return buildString {
-        val fileRootNodes = rootNodes
-        val indentationLevels =
-            computeIndentationLevelsForNode(nodes.values)
-
-        fileRootNodes.forEach { it.printNodeChildren(this, indentationLevels) }
-    }
-}
-
-private fun SkriptNode.printNodeChildren(sb: StringBuilder, indentationLevels: List<Int>) {
-    sb.apply {
-        val parentSpace = parent?.normalizedIndentCount?.plus(1) ?: 0
-        append(" ".repeat(parentSpace))
-
-        val dashAmount = (normalizedIndentCount - parentSpace).coerceAtLeast(0)
-        if (dashAmount != 0)
-            append('|')
-        append("-".repeat(dashAmount))
-
-        append(content)
-        append(comment)
-        append(System.lineSeparator())
-
-        children?.forEach { it.printNodeChildren(this, indentationLevels) }
-    }
-}
-
 var SkriptFile.tokenizedModel: TokenizedModel
     get() {
         return this[this::tokenizedModel] ?: TokenizedModel(this).also { tokenizedModel = it }

skriptinsight-tokens/src/main/kotlin/io/github/skriptinsight/tokens/impl/FunctionCallToken.kt

@@ -1,52 +1,13 @@
 package io.github.skriptinsight.tokens.work.impl
 
-import io.github.skriptinsight.SyntaxFacts.functionCallRegex
-import io.github.skriptinsight.SyntaxFacts.stringMatcher
-import io.github.skriptinsight.SyntaxFacts.whitespaceRegex
-import io.github.skriptinsight.editing.extensions.getGroupRange
-import io.github.skriptinsight.editing.location.Range
 import io.github.skriptinsight.file.SkriptFile
-import io.github.skriptinsight.editing.MatchContext
 import io.github.skriptinsight.tokens.SkriptNodeToken
 import io.github.skriptinsight.tokens.SkriptToken
-import io.github.skriptinsight.tokens.impl.FunctionCallToken
-import io.github.skriptinsight.tokens.impl.StringToken
-import io.github.skriptinsight.tokens.impl.WhitespaceToken
 import io.github.skriptinsight.tokens.work.TokenizedModelProcess
 import io.github.skriptinsight.tokens.work.TokenizedModelProcessData
-import org.intellij.lang.annotations.Language
-import java.util.regex.Pattern
 
 object NodeTokenizeProcess : TokenizedModelProcess<SkriptNodeToken>() {
 
-    private val tokenDefinitions: MutableList<Pair<Pattern, TokenCompute>> = mutableListOf()
-
-    private fun <R : SkriptToken> token(
-        pattern: Pattern,
-        creator: TokenCompute
-    ) {
-        tokenDefinitions.add(pattern to creator)
-    }
-
-    private fun <R : SkriptToken> token(
-        @Language("RegExp") pattern: String,
-        creator: (SkriptFile, Range, String, MatchContext) -> SkriptToken
-    ) {
-        token<R>(Pattern.compile(pattern), creator)
-    }
-
-    init {
-        token<StringToken>(functionCallRegex) { skriptFile, range, rawContent, matchResult ->
-            FunctionCallToken(matchResult)
-        }
-        token<StringToken>(stringMatcher) { skriptFile, range, rawContent, matchResult ->
-            StringToken(matchResult.matchResult.group(1))
-        }
-        token<WhitespaceToken>(whitespaceRegex) { skriptFile, range, rawContent, _ ->
-            WhitespaceToken()
-        }
-    }
-
     override fun doWork(
         file: SkriptFile,
         lineNumber: Int,
@@ -58,28 +19,6 @@ object NodeTokenizeProcess : TokenizedModelProcess<SkriptNodeToken>() {
         val node = file[lineNumber] ?: return outToken
         val content = node.rawContent
 
-        tokenDefinitions.forEach { (pattern, tokenComputeInstance) ->
-
-            val matcher = pattern.matcher(content)
-
-            while (matcher.find()) {
-                val indentCount = node.indentCount
-                val matchRange = matcher.getGroupRange(matcher.groupCount(), indentCount, lineNumber)
-                //If this node isn't within a previously matched token, add it
-                if (tokens.none { t -> t.range.contains(matchRange) }) {
-                    val matchResult = matcher.toMatchResult()
-                    val rawMatchContent = matcher.group()
-                    tokens.add(
-                        tokenComputeInstance.invoke(
-                            file,
-                            matchRange,
-                            rawMatchContent,
-                            MatchContext(matcher, matchResult, indentCount, lineNumber)
-                        ).also { it.setupToken(matchRange, rawMatchContent, file) }
-                    )
-                }
-            }
-        }
 
         return outToken
     }