rename StyleNode.Text -> StyleNode.TextStyledNode

discord · Nov 3, 2020 · 99f6b20 · 99f6b20
1 parent 76a2830
commit 99f6b20
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 26 deletions.
diff --git a/simpleast-core/src/main/java/com/discord/simpleast/code/CodeNode.kt b/simpleast-core/src/main/java/com/discord/simpleast/code/CodeNode.kt
@@ -58,8 +58,8 @@ open class CodeNode<RC>(
       pre: String, name: String,
       codeStyleProviders: CodeStyleProviders<RC>
   ) : Node.Parent<RC>(
-      StyleNode.Text(pre, codeStyleProviders.keywordStyleProvider),
-      StyleNode.Text(name, codeStyleProviders.typesStyleProvider)
+      StyleNode.TextStyledNode(pre, codeStyleProviders.keywordStyleProvider),
+      StyleNode.TextStyledNode(name, codeStyleProviders.typesStyleProvider)
   )
 }
 
diff --git a/simpleast-core/src/main/java/com/discord/simpleast/code/CodeRules.kt b/simpleast-core/src/main/java/com/discord/simpleast/code/CodeRules.kt
@@ -74,7 +74,7 @@ object CodeRules {
         ): ParseSpec<R, S> {
           val content = matcher.group(group).orEmpty()
           val node = stylesProvider
-              ?.let { StyleNode.Text(content, it) }
+              ?.let { StyleNode.TextStyledNode(content, it) }
               ?: TextNode(content)
           return ParseSpec.createTerminal(node, state)
         }

diff --git a/simpleast-core/src/main/java/com/discord/simpleast/code/Kotlin.kt b/simpleast-core/src/main/java/com/discord/simpleast/code/Kotlin.kt
@@ -39,10 +39,10 @@ object Kotlin {
       pre: String, generic: String?, signature: String, params: String,
       codeStyleProviders: CodeStyleProviders<RC>
   ) : Node.Parent<RC>(
-      StyleNode.Text(pre, codeStyleProviders.keywordStyleProvider),
-      generic?.let { StyleNode.Text(it, codeStyleProviders.genericsStyleProvider) },
-      StyleNode.Text(signature, codeStyleProviders.identifierStyleProvider),
-      StyleNode.Text(params, codeStyleProviders.paramsStyleProvider),
+      StyleNode.TextStyledNode(pre, codeStyleProviders.keywordStyleProvider),
+      generic?.let { StyleNode.TextStyledNode(it, codeStyleProviders.genericsStyleProvider) },
+      StyleNode.TextStyledNode(signature, codeStyleProviders.identifierStyleProvider),
+      StyleNode.TextStyledNode(params, codeStyleProviders.paramsStyleProvider),
   ) {
     companion object {
 
@@ -74,8 +74,8 @@ object Kotlin {
       definition: String, name: String,
       codeStyleProviders: CodeStyleProviders<RC>
   ) : Node.Parent<RC>(
-      StyleNode.Text(definition, codeStyleProviders.keywordStyleProvider),
-      StyleNode.Text(name, codeStyleProviders.identifierStyleProvider),
+      StyleNode.TextStyledNode(definition, codeStyleProviders.keywordStyleProvider),
+      StyleNode.TextStyledNode(name, codeStyleProviders.identifierStyleProvider),
   ) {
     companion object {
       /**

diff --git a/simpleast-core/src/main/java/com/discord/simpleast/core/node/StyleNode.kt b/simpleast-core/src/main/java/com/discord/simpleast/core/node/StyleNode.kt
@@ -30,7 +30,7 @@ open class StyleNode<RC, T>(val styles: List<T>) : Node.Parent<RC>() {
    *
    * @see TextNode
    */
-  class Text<RC>(content: String, val stylesProvider: SpanProvider<RC>) : TextNode<RC>(content) {
+  class TextStyledNode<RC>(content: String, val stylesProvider: SpanProvider<RC>) : TextNode<RC>(content) {
     override fun render(builder: SpannableStringBuilder, renderContext: RC) {
       val startIndex = builder.length
       super.render(builder, renderContext)

diff --git a/simpleast-core/src/test/java/com/discord/simpleast/code/CodeRulesTest.kt b/simpleast-core/src/test/java/com/discord/simpleast/code/CodeRulesTest.kt
@@ -42,7 +42,7 @@ class CodeRulesTest {
       ```
     """.trimIndent(), TestState())
 
-    ast.assertNodeContents<StyleNode.Text<*>>(
+    ast.assertNodeContents<StyleNode.TextStyledNode<*>>(
         "// Inlined",
         "// Line comment",
         "/// Doc")
@@ -57,7 +57,7 @@ class CodeRulesTest {
       ```
     """.trimIndent(), TestState())
 
-    ast.assertNodeContents<StyleNode.Text<*>>(
+    ast.assertNodeContents<StyleNode.TextStyledNode<*>>(
         "# Inlined",
         "# Line comment")
   }
@@ -73,7 +73,7 @@ class CodeRulesTest {
       ```
     """.trimIndent(), TestState())
 
-    ast.assertNodeContents<StyleNode.Text<*>>(
+    ast.assertNodeContents<StyleNode.TextStyledNode<*>>(
         """"maybe"""",
         """"lyte"""",
         """"hello
@@ -91,7 +91,7 @@ class CodeRulesTest {
       ```
     """.trimIndent(), TestState())
 
-    ast.assertNodeContents<StyleNode.Text<*>>(
+    ast.assertNodeContents<StyleNode.TextStyledNode<*>>(
         """"maybe"""",
         """"lyte"""",
         """"hello
@@ -111,7 +111,7 @@ class CodeRulesTest {
       ```
     """.trimIndent(), TestState())
 
-    ast.assertNodeContents<StyleNode.Text<*>>(
+    ast.assertNodeContents<StyleNode.TextStyledNode<*>>(
         "0", "12", "123", "456"
     )
   }
@@ -126,7 +126,7 @@ class CodeRulesTest {
       ```
     """.trimIndent(), TestState())
 
-    ast.assertNodeContents<StyleNode.Text<*>>(
+    ast.assertNodeContents<StyleNode.TextStyledNode<*>>(
         "@Route",
         "def", " get",
         "pass"
@@ -144,7 +144,7 @@ class CodeRulesTest {
       ```
     """.trimIndent(), TestState())
 
-    ast.assertNodeContents<StyleNode.Text<*>>(
+    ast.assertNodeContents<StyleNode.TextStyledNode<*>>(
         "#[derive(HelperAttr)]\n",
         "struct", " Struct",
 //        "#[helper]"  // Not supported
@@ -176,7 +176,7 @@ class CodeRulesTest {
       ```
     """.trimIndent(), TestState())
 
-    ast.assertNodeContents<StyleNode.Text<*>>(
+    ast.assertNodeContents<StyleNode.TextStyledNode<*>>(
         "mod", " test",
         "use", "Arc",
         "pub", "struct", " Event",
@@ -206,7 +206,7 @@ class CodeRulesTest {
       ```
     """.trimIndent(), TestState())
 
-    ast.assertNodeContents<StyleNode.Text<*>>(
+    ast.assertNodeContents<StyleNode.TextStyledNode<*>>(
         "from", "import", "as",
         "def", " hello_world", "self",
         "try",

diff --git a/simpleast-core/src/test/java/com/discord/simpleast/code/KotlinRulesTest.kt b/simpleast-core/src/test/java/com/discord/simpleast/code/KotlinRulesTest.kt
@@ -44,7 +44,7 @@ class KotlinRulesTest {
       ```
     """.trimIndent(), TestState())
 
-    ast.assertNodeContents<StyleNode.Text<*>>(
+    ast.assertNodeContents<StyleNode.TextStyledNode<*>>(
         """
           /** Multiline
               Comment
@@ -63,7 +63,7 @@ class KotlinRulesTest {
       ```
     """.trimIndent(), TestState())
 
-    ast.assertNodeContents<StyleNode.Text<*>>(
+    ast.assertNodeContents<StyleNode.TextStyledNode<*>>(
         """"hello"""",
         """"world"""")
   }
@@ -81,7 +81,7 @@ class KotlinRulesTest {
       ```
     """.trimIndent(), TestState())
 
-    ast.assertNodeContents<StyleNode.Text<*>>(
+    ast.assertNodeContents<StyleNode.TextStyledNode<*>>(
         "\"\"",
         """
           ${'"'}
@@ -102,7 +102,7 @@ class KotlinRulesTest {
       ```
     """.trimIndent(), TestState())
 
-    ast.assertNodeContents<StyleNode.Text<*>>(
+    ast.assertNodeContents<StyleNode.TextStyledNode<*>>(
         "@Test",
         "@Nullable",
     )
@@ -137,7 +137,7 @@ class KotlinRulesTest {
       ```
     """.trimIndent(), TestState())
 
-    ast.assertNodeContents<StyleNode.Text<*>>(
+    ast.assertNodeContents<StyleNode.TextStyledNode<*>>(
         """
         /*
           private override fun <T> test(x:T) {
@@ -174,7 +174,7 @@ class KotlinRulesTest {
       }
       ```
     """.trimIndent(), TestState())
-    ast.assertNodeContents<StyleNode.Text<*>>(
+    ast.assertNodeContents<StyleNode.TextStyledNode<*>>(
         "package", "import",
         "while", "true", "123", "break",
         "if", "false",
@@ -191,7 +191,7 @@ class KotlinRulesTest {
       add(123,456)
       ```
     """.trimIndent(), TestState())
-    ast.assertNodeContents<StyleNode.Text<*>>(
+    ast.assertNodeContents<StyleNode.TextStyledNode<*>>(
             "0", "12", "123", "456"
    )
   }

diff --git a/simpleast-core/src/test/java/com/discord/simpleast/core/ParserTest.java b/simpleast-core/src/test/java/com/discord/simpleast/core/ParserTest.java