github/android-dev-ext
1
1
Fork 0
mirror of https://github.com/adelphes/android-dev-ext.git synced 2025-12-23 01:48:18 +00:00
Code Issues 41 Packages Projects Releases Wiki Activity

include enclosing types in identifier search

Browse Source
This commit is contained in:
Dave Holoway
2020-06-16 15:05:17 +01:00
parent eeb6d7c3d0
commit 8b71037a58
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
langserver/java/body-parser3.js
View File

@@ -2003,11 +2003,18 @@ function findIdentifier(ident, mdecls, scope, imports, typemap) {
if (local || param) {
matches.variables = [local || param];
} else {
// is it a field, method or enum value in the current type (or any of the superclasses)
// is it a field, method or enum value in the current type (or any of the outer types or superclasses)
const scoped_type = scope instanceof SourceType ? scope : scope.owner;
const types = getTypeInheritanceList(scoped_type);
const outer_types = [];
for (let m, t = scoped_type._rawShortSignature;; ) {
m = t.match(/(.+)[$][^$]+$/);
if (!m) break;
const enctype = typemap.get(t = m[1]);
enctype && outer_types.push(enctype);
}
const inherited_types = getTypeInheritanceList(scoped_type);
const method_sigs = new Set();
types.forEach(type => {
[...inherited_types, ...outer_types].forEach(type => {
if (!matches.variables[0]) {
const field = type.fields.find(f => f.name === ident);
if (field) {