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

fix resolving imported enclosed types

Browse Source
This commit is contained in:
Dave Holoway
2020-06-17 00:09:49 +01:00
parent fe28924e0c
commit 1c8eb75b4f
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
langserver/java/type-resolver.js
View File

@@ -311,10 +311,9 @@ function resolveTypeOrPackage(ident, type_variables, scope, imports, typemap) {
} }
if (!types[0]) { if (!types[0]) {
// is it a top-level type from the imports // is it a type from the imports
const top_level_type = '/' + ident;
for (let i of imports) { for (let i of imports) {
const fqn = i.fullyQualifiedNames.find(fqn => fqn.endsWith(top_level_type)); const fqn = i.fullyQualifiedNames.find(fqn => fqn.endsWith(ident) && /[$/]/.test(fqn[fqn.length-ident.length-1]));
if (fqn) { if (fqn) {
types.push(i.types.get(fqn)); types.push(i.types.get(fqn));
} }