depend on jitpack version of kotlinpoet and fix generation

Author: cypressious

build.gradle

@@ -23,12 +23,14 @@ repositories {
     jcenter()
     maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' }
     maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
+    maven { url 'https://jitpack.io' }
 }
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
-    implementation 'com.squareup:kotlinpoet:1.0.0-RC1'
+//    implementation 'com.squareup:kotlinpoet:1.0.0-RC1'
+    implementation 'com.github.emrul:kotlinpoet:42556e2e67'
     implementation 'org.eclipse.mylyn.github:org.eclipse.egit.github.core:2.1.5'
     implementation 'com.google.code.gson:gson:2.8.2'
     implementation 'com.beust:jcommander:1.72'

src/main/kotlin/de/rakhman/webextensions/Generator.kt

@@ -33,6 +33,7 @@ class Generator(val dir: File) {
                     .addFunction(
                         FunSpec
                             .builder("addListener")
+                            .addModifiers(KModifier.EXTERNAL)
                             .addParameter(
                                 ParameterSpec.builder(
                                     "listener",
@@ -44,6 +45,7 @@ class Generator(val dir: File) {
                     .addFunction(
                         FunSpec
                             .builder("removeListener")
+                            .addModifiers(KModifier.EXTERNAL)
                             .addParameter(
                                 ParameterSpec.builder(
                                     "listener",
@@ -55,6 +57,7 @@ class Generator(val dir: File) {
                     .addFunction(
                         FunSpec
                             .builder("hasListener")
+                            .addModifiers(KModifier.EXTERNAL)
                             .addParameter(
                                 ParameterSpec.builder(
                                     "listener",
@@ -181,7 +184,7 @@ class Generator(val dir: File) {
                 PropertySpec
                     .varBuilder(it.key, parameterType(it.key, it.value))
                     .apply { it.value.description?.let { addKdoc(it.cleanupDescription()) } }
-                    .initializer(it.key)
+                    .initializer(it.key.escapeIfKeyword())
                     .build()
             })
             .primaryConstructor(FunSpec.constructorBuilder()
@@ -277,7 +280,7 @@ class Generator(val dir: File) {
     }
 
     private fun generateFunction(f: Function, parameters: List<Parameter>): FunSpec {
-        val builder = FunSpec.builder(f.name)
+        val builder = FunSpec.builder(f.name).addModifiers(KModifier.EXTERNAL)
 
         f.description?.let { builder.addKdoc(it + "\n") }
 

src/main/kotlin/de/rakhman/webextensions/Utils.kt

@@ -0,0 +1,37 @@
+package de.rakhman.webextensions
+
+internal fun String.escapeIfKeyword() = if (isKeyword) "`${this}`" else this
+
+internal val String.isKeyword get() = KEYWORDS.contains(this)
+
+// https://github.com/JetBrains/kotlin/blob/master/core/descriptors/src/org/jetbrains/kotlin/renderer/KeywordStringsGenerated.java
+private val KEYWORDS = setOf(
+        "package",
+        "as",
+        "typealias",
+        "class",
+        "this",
+        "super",
+        "val",
+        "var",
+        "fun",
+        "for",
+        "null",
+        "true",
+        "false",
+        "is",
+        "in",
+        "throw",
+        "return",
+        "break",
+        "continue",
+        "object",
+        "if",
+        "try",
+        "else",
+        "while",
+        "do",
+        "when",
+        "interface",
+        "typeof"
+)