github/android-dev-ext
1
1
Fork 0
mirror of https://github.com/adelphes/android-dev-ext.git synced 2025-12-22 17:39:19 +00:00
Code Issues 41 Packages Projects Releases Wiki Activity

ensure Object is always last in the list of inherited types

Browse Source
This commit is contained in:
Dave Holoway
2020-06-25 10:56:02 +01:00
parent 69e77eae8a
commit b0a2475696
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
langserver/java/expression-resolver.js
View File

@@ -365,7 +365,13 @@ function getTypeInheritanceList(type) {
/** @type {Set<JavaType>} */ /** @type {Set<JavaType>} */
done: new Set(), done: new Set(),
}; };
let object = null;
for (let type; type = types.list.shift(); ) { for (let type; type = types.list.shift(); ) {
// always add Object last
if (type.rawTypeSignature === 'Ljava/lang/Object;') {
object = type;
continue;
}
if (types.done.has(type)) { if (types.done.has(type)) {
continue; continue;
} }
@@ -373,6 +379,9 @@ function getTypeInheritanceList(type) {
if (type instanceof CEIType) if (type instanceof CEIType)
types.list.push(...type.supers); types.list.push(...type.supers);
} }
if (object) {
types.done.add(object);
}
return Array.from(types.done); return Array.from(types.done);
} }