From 6d0fa038014b3a670792be948e4e57d179b0b305 Mon Sep 17 00:00:00 2001
From: Edwin Jakobs <edwin@rndr.studio>
Date: Mon, 27 Jan 2020 23:48:38 +0100
Subject: [PATCH] Fix newline trim in ShaderPreprocessor.kt

---
 orx-shader-phrases/src/main/kotlin/ShaderPreprocessor.kt | 4 ++--
 orx-shader-phrases/src/main/kotlin/phrases/Dummy.kt      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/orx-shader-phrases/src/main/kotlin/ShaderPreprocessor.kt b/orx-shader-phrases/src/main/kotlin/ShaderPreprocessor.kt
index ab1380be..447067ff 100644
--- a/orx-shader-phrases/src/main/kotlin/ShaderPreprocessor.kt
+++ b/orx-shader-phrases/src/main/kotlin/ShaderPreprocessor.kt
@@ -9,14 +9,14 @@ fun preprocessShader(shader: String): String {
             val tokens = it.split(" ")
             val full = tokens[1]
             val fullTokens = full.split(".")
-            val fieldName = fullTokens.last().replace(";","")
+            val fieldName = fullTokens.last().replace(";","").trim()
             val packageClassTokens = fullTokens.dropLast(1)
             val packageClass = packageClassTokens.joinToString(".")
 
             val c = Class.forName(packageClass)
             if (c.annotations.any { it.annotationClass == ShaderPhrases::class }) {
                 if (fieldName == "*") {
-                    c.declaredFields.filter { println(it.type); it.type.name =="java.lang.String" }.map {
+                    c.declaredFields.filter { it.type.name =="java.lang.String" }.map {
                         it.get(null)
                     }.joinToString("\n")
                 } else {
diff --git a/orx-shader-phrases/src/main/kotlin/phrases/Dummy.kt b/orx-shader-phrases/src/main/kotlin/phrases/Dummy.kt
index 25bb86af..41f694ac 100644
--- a/orx-shader-phrases/src/main/kotlin/phrases/Dummy.kt
+++ b/orx-shader-phrases/src/main/kotlin/phrases/Dummy.kt
@@ -4,6 +4,7 @@
 package org.openrndr.extra.shaderphrases.phrases
 import org.openrndr.extra.shaderphrases.annotations.ShaderPhrase
 import org.openrndr.extra.shaderphrases.annotations.ShaderPhrases
+import org.openrndr.extra.shaderphrases.preprocessShader
 
 @ShaderPhrase(["dummy"])
 const val phraseDummy = """
@@ -18,7 +19,6 @@ fun main() {
 
     if (c.annotations.any { it.annotationClass == ShaderPhrases::class }) {
         println(c.getDeclaredField("phraseDummy").get(null))
-
-
     }
+    println(preprocessShader("import org.openrndr.extra.shaderphrases.phrases.Dummy.*"))
 }
\ No newline at end of file