From 2150d0d5c8873b0f82a0ff094bed7ed283ea36a5 Mon Sep 17 00:00:00 2001
From: Javi Luque <javiluke93@gmail.com>
Date: Sun, 15 Dec 2019 12:06:21 +0100
Subject: [PATCH 1/2] Update reservedWords from here:
https://github.com/JetBrains/kotlin/blob/master/core/descriptors/src/org/jetbrains/kotlin/renderer/KeywordStringsGenerated.java
---
.../languages/AbstractKotlinCodegen.java | 79 ++++++-------------
1 file changed, 22 insertions(+), 57 deletions(-)
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java
index 606e0564c44..1c4cd92a689 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java
@@ -91,70 +91,35 @@ public abstract class AbstractKotlinCodegen extends DefaultCodegen implements Co
// this includes hard reserved words defined by https://github.com/JetBrains/kotlin/blob/master/core/descriptors/src/org/jetbrains/kotlin/renderer/KeywordStringsGenerated.java
// as well as keywords from https://kotlinlang.org/docs/reference/keyword-reference.html
- reservedWords = new HashSet<String>(Arrays.asList(
- "abstract",
- "annotation",
+ reservedWords = new HashSet<String>(Arrays.asList(
+ "package",
"as",
- "break",
- "case",
- "catch",
+ "typealias",
"class",
- "companion",
- "const",
- "constructor",
- "continue",
- "crossinline",
- "data",
- "delegate",
- "do",
- "else",
- "enum",
- "external",
- "false",
- "final",
- "finally",
- "for",
+ "this",
+ "super",
+ "val",
+ "var",
"fun",
- "if",
- "in",
- "infix",
- "init",
- "inline",
- "inner",
- "interface",
- "internal",
- "is",
- "it",
- "lateinit",
- "lazy",
- "noinline",
+ "for",
"null",
- "object",
- "open",
- "operator",
- "out",
- "override",
- "package",
- "private",
- "protected",
- "public",
- "reified",
- "return",
- "sealed",
- "super",
- "suspend",
- "tailrec",
- "this",
- "throw",
"true",
+ "false",
+ "is",
+ "in",
+ "throw",
+ "return",
+ "break",
+ "continue",
+ "object",
+ "if",
"try",
- "typealias",
- "typeof",
- "val",
- "var",
- "vararg",
+ "else",
+ "while",
+ "do",
"when",
- "while"
+ "interface",
+ "typeof"
));
defaultIncludes = new HashSet<String>(Arrays.asList(
--
GitLab
From 3738e4f8aed88a5b6e713366b968bb910e61fef8 Mon Sep 17 00:00:00 2001
From: Javi Luque <javiluke93@gmail.com>
Date: Sun, 22 Dec 2019 19:37:38 +0100
Subject: [PATCH 2/2] Order keywords.
---
.../languages/AbstractKotlinCodegen.java | 44 +++++++++----------
1 file changed, 22 insertions(+), 22 deletions(-)
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java
index 1c4cd92a689..6a525adabe4 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java
@@ -91,35 +91,35 @@ public abstract class AbstractKotlinCodegen extends DefaultCodegen implements Co
// this includes hard reserved words defined by https://github.com/JetBrains/kotlin/blob/master/core/descriptors/src/org/jetbrains/kotlin/renderer/KeywordStringsGenerated.java
// as well as keywords from https://kotlinlang.org/docs/reference/keyword-reference.html
- reservedWords = new HashSet<String>(Arrays.asList(
- "package",
+ reservedWords = new HashSet<String>(Arrays.asList(
"as",
- "typealias",
+ "break",
"class",
- "this",
- "super",
- "val",
- "var",
- "fun",
- "for",
- "null",
- "true",
+ "continue",
+ "do",
+ "else",
"false",
- "is",
+ "for",
+ "fun",
+ "if",
"in",
- "throw",
- "return",
- "break",
- "continue",
+ "interface",
+ "is",
+ "null",
"object",
- "if",
+ "package",
+ "return",
+ "super",
+ "this",
+ "throw",
+ "true",
"try",
- "else",
- "while",
- "do",
+ "typealias",
+ "typeof",
+ "val",
+ "var",
"when",
- "interface",
- "typeof"
+ "while"
));
defaultIncludes = new HashSet<String>(Arrays.asList(
--
GitLab