Skip to content

Commit 841907a

Browse files
committed
AS3ExternsGenerator, TSExternsGenerator: when copying fields from excluded classes, skip overriden fields
1 parent a55be72 commit 841907a

2 files changed

Lines changed: 20 additions & 0 deletions

File tree

‎scripts/AS3ExternsGenerator.hx‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -300,6 +300,16 @@ class AS3ExternsGenerator {
300300
if (shouldSkipField(classField, includeFieldsFrom)) {
301301
continue;
302302
}
303+
var isOverride = false;
304+
for (current in includeFieldsFrom.overrides) {
305+
if (current.get().name == classField.name) {
306+
isOverride = true;
307+
break;
308+
}
309+
}
310+
if (isOverride) {
311+
continue;
312+
}
303313
if (Lambda.exists(classType.fields.get(), item -> item.name == classField.name)) {
304314
continue;
305315
}

‎scripts/TSExternsGenerator.hx‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,16 @@ class TSExternsGenerator {
285285
if (shouldSkipField(classField, includeFieldsFrom)) {
286286
continue;
287287
}
288+
var isOverride = false;
289+
for (current in includeFieldsFrom.overrides) {
290+
if (current.get().name == classField.name) {
291+
isOverride = true;
292+
break;
293+
}
294+
}
295+
if (isOverride) {
296+
continue;
297+
}
288298
if (Lambda.exists(classType.fields.get(), item -> item.name == classField.name)) {
289299
continue;
290300
}

0 commit comments

Comments
 (0)