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

clean up import resolving code

Browse Source
This commit is contained in:
Dave Holoway
2020-06-29 15:45:46 +01:00
parent bdb5986c4b
commit 61397dab95
3 changed files with 9 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
langserver/java/body-parser.js
View File

@@ -250,7 +250,7 @@ function parse(docs, cached_units, typemap) {
function parseUnit(tokens, unit, typemap) {
let package_name = '';
// init resolved imports with java.lang.*
let resolved_imports = resolveImports(typemap, [], [], null).resolved.slice();
let resolved_imports = resolveImports(typemap, null).slice();
// retrieve the implicit imports
while (tokens.current) {
let modifiers = [], annotations = [];
@@ -284,9 +284,9 @@ function parseUnit(tokens, unit, typemap) {
if (!package_name) {
unit.package_ = pkg;
package_name = pkg.name;
const imprt = resolveImports(typemap, [], [], pkg.name, []);
if (imprt.resolved.length) {
resolved_imports.unshift(...imprt.resolved);
const imprts = resolveImports(typemap, pkg.name, []);
if (imprts.length) {
resolved_imports.unshift(...imprts);
}
}
continue;