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

add support for array qualifiers in type identifiers

Browse Source
This commit is contained in:
Dave Holoway
2020-06-08 16:02:30 +01:00
parent 1b1202598c
commit 261abb9cc7
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
langserver/java/typeident.js
View File

@@ -1,9 +1,9 @@
const { JavaType, WildcardType } = require('java-mti'); const { ArrayType, JavaType, WildcardType } = require('java-mti');
const { SourceMethod, SourceConstructor, SourceInitialiser } = require('./source-type'); const { SourceMethod, SourceConstructor, SourceInitialiser } = require('./source-type');
const ResolvedImport = require('./parsetypes/resolved-import'); const ResolvedImport = require('./parsetypes/resolved-import');
const { resolveTypeOrPackage, resolveNextTypeOrPackage } = require('./type-resolver'); const { resolveTypeOrPackage, resolveNextTypeOrPackage } = require('./type-resolver');
const { Token } = require('./tokenizer'); const { Token } = require('./tokenizer');
const { AnyType, ResolvedIdent } = require("./body-types"); const { AnyType } = require("./body-types");
/** /**
* @typedef {SourceMethod|SourceConstructor|SourceInitialiser} SourceMC * @typedef {SourceMethod|SourceConstructor|SourceInitialiser} SourceMC
@@ -40,7 +40,7 @@ function typeIdent(tokens, method, imports, typemap) {
} }
return AnyType.Instance; return AnyType.Instance;
} }
const { types, package_name } = resolveTypeOrPackage(tokens.current.value, method._owner, imports, typemap); let { types, package_name } = resolveTypeOrPackage(tokens.current.value, method._owner, imports, typemap);
tokens.inc(); tokens.inc();
for (;;) { for (;;) {
if (tokens.isValue('.')) { if (tokens.isValue('.')) {
@@ -58,6 +58,19 @@ function typeIdent(tokens, method, imports, typemap) {
} }
tokens.expectValue('>'); tokens.expectValue('>');
} }
} else if (tokens.isValue('[')) {
let arrdims = 0;
for(;;) {
arrdims++;
tokens.expectValue(']');
if (!tokens.isValue('[')) {
break;
}
}
if (!types[0]) {
types.push(AnyType.Instance);
}
types = types.map(t => new ArrayType(t, arrdims));
} else { } else {
break; break;
} }