File tree Expand file tree Collapse file tree 1 file changed +12
-2
lines changed Expand file tree Collapse file tree 1 file changed +12
-2
lines changed Original file line number Diff line number Diff line change @@ -249,6 +249,8 @@ struct JavaToSwift: ParsableCommand {
249
249
// Record this as a translated class.
250
250
let swiftUnqualifiedName = javaClassName. javaClassNameToCanonicalName
251
251
. defaultSwiftNameForJavaClass
252
+
253
+
252
254
let swiftName = " \( currentSwiftName) . \( swiftUnqualifiedName) "
253
255
translator. translatedClasses [ javaClassName] = ( swiftName, nil , true )
254
256
return nestedClass
@@ -390,10 +392,10 @@ extension String {
390
392
fileprivate var defaultSwiftNameForJavaClass : String {
391
393
if let dotLoc = lastIndex ( of: " . " ) {
392
394
let afterDot = index ( after: dotLoc)
393
- return String ( self [ afterDot... ] ) . javaClassNameToCanonicalName
395
+ return String ( self [ afterDot... ] ) . javaClassNameToCanonicalName. adjustedSwiftTypeName
394
396
}
395
397
396
- return javaClassNameToCanonicalName
398
+ return javaClassNameToCanonicalName. adjustedSwiftTypeName
397
399
}
398
400
}
399
401
@@ -425,4 +427,12 @@ extension String {
425
427
426
428
return false
427
429
}
430
+
431
+ /// Adjust type name for "bad" type names that don't work well in Swift.
432
+ fileprivate var adjustedSwiftTypeName : String {
433
+ switch self {
434
+ case " Type " : return " JavaType "
435
+ default : return self
436
+ }
437
+ }
428
438
}
You can’t perform that action at this time.
0 commit comments