Skip to content

Updates to tackle Kotlin compatibility issues (#84) #85

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Updates to tackle Kotlin compatibility issues (#84) #85

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 19 additions & 2 deletions dts-generator/src/main/java/com/telerik/dts/DtsApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,8 @@ public String generateDtsContent(List<JavaClass> javaClasses) {
currentFileClassname.contains(".debugger.") ||
currentFileClassname.endsWith("package-info") ||
currentFileClassname.endsWith("module-info") ||
currentFileClassname.endsWith("Kt")) {
currentFileClassname.endsWith("Kt") ||
currentFileClassname.contains("$$serializer")) {
continue;
}

Expand Down Expand Up @@ -244,7 +245,9 @@ public String generateDtsContent(List<JavaClass> javaClasses) {
}

private String replaceIgnoredNamespaces(String content) {
String regexFormat = "(?<Replace>%s(?:(?:\\.[a-zA-Z\\d]*)|<[a-zA-Z\\d\\.<>]*>)*)(?<Suffix>[^a-zA-Z\\d]+)";
// Updated regex to properly capture generics with commas, spaces, and nested angle brackets
// Also matches end of string or line as valid suffix
String regexFormat = "(?<Replace>%s(?:(?:\\.[a-zA-Z\\d]*)|<[a-zA-Z\\d\\.<>, ]*>)*)(?<Suffix>[^a-zA-Z\\d]+|$)";
// these namespaces are not known in some android api levels, so we cannot use them in android-support for instance, so we are replacing them with any
for (String ignoredNamespace : this.getIgnoredNamespaces()) {
String regexString = String.format(regexFormat, ignoredNamespace.replace(".", "\\."));
Expand Down Expand Up @@ -960,6 +963,20 @@ private String getMethodParamSignature(JavaClass clazz, TypeDefinition typeDefin

if (localVariable != null) {
String name = localVariable.getName();

// Sanitize Kotlin synthetic parameter names like <set-?>
if (name.startsWith("<") && name.endsWith(">")) {
// For setter methods, derive parameter name from method name
String methodName = m.getName();
if (methodName.startsWith("set") && methodName.length() > 3) {
// setInitialDelay -> initialDelay
name = Character.toLowerCase(methodName.charAt(3)) + methodName.substring(4);
} else {
// Fallback to "value" for other synthetic names
name = "value";
}
}

if (reservedJsKeywords.contains(name)) {
System.out.println(String.format("Appending _ to reserved JS keyword %s", name));
sb.append(name + "_");
Expand Down