Fixed issues with @file:CompilerOpts in combination with @file:Include (fixes #173)

Author: holgerbrandl

src/main/kotlin/kscript/app/Script.kt

@@ -1,7 +1,6 @@
 package kscript.app
 
 import java.io.File
-import java.lang.IllegalArgumentException
 
 /* Immutable script class */
 data class Script(val lines: List<String>, val extension: String = "kts") : Iterable<String> {
@@ -71,7 +70,7 @@ data class Script(val lines: List<String>, val extension: String = "kts") : Iter
 }
 
 
-private val KSCRIPT_DIRECTIVE_ANNO: List<Regex> = listOf("DependsOn", "KotlinOpts", "Include", "EntryPoint", "MavenRepository", "DependsOnMaven")
+private val KSCRIPT_DIRECTIVE_ANNO: List<Regex> = listOf("DependsOn", "KotlinOpts", "Include", "EntryPoint", "MavenRepository", "DependsOnMaven", "CompilerOpts")
     .map { "^@file:$it[(]".toRegex() }
 
 private fun isKscriptAnnotation(line: String) =

test/resources/compiler_opts_with_includes.sh

@@ -0,0 +1,18 @@
+## Prevent regressions of https://github.com/holgerbrandl/kscript/issues/173
+
+echo "fun foo() = 42" > compiler_opts_with_includes_dep.kts
+
+cat <<"EOF" >> compiler_opts_with_includes_master.kt
+@file:CompilerOpts("-jvm-target 1.8")
+@file:Include("compiler_opts_with_includes_dep.kts")
+@file:DependsOnMaven("log4j:log4j:1.2.14")
+
+import java.io.File
+
+fun main(args: Array<String>) {
+    println("hello"+foo())
+}
+EOF
+
+kscript compiler_opts_with_includes_master.kt
+

test/test_suite.sh

@@ -253,6 +253,9 @@ assert 'echo "println(123)" > 123foo.kts; kscript 123foo.kts' "123"
 ## prevent regression of #185
 assert "source ${KSCRIPT_HOME}/test/resources/home_dir_include.sh" "42"
 
+## prevent regression of #173
+assert "source ${KSCRIPT_HOME}/test/resources/compiler_opts_with_includes.sh" "hello42"
+
 
 kscript_nocall() { kotlin -classpath ${KSCRIPT_HOME}/build/libs/kscript.jar kscript.app.KscriptKt "$@";}
 export -f kscript_nocall