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

update ResolvableType to use same type resolving as method body parsing

Browse Source
This commit is contained in:
Dave Holoway
2020-06-08 21:02:34 +01:00
parent 7c9acfd7ca
commit 426735aa25
5 changed files with 82 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
langserver/java/typeident.js
View File

@@ -1,4 +1,4 @@
const { ArrayType, CEIType, JavaType, WildcardType } = require('java-mti');
const { ArrayType, CEIType, JavaType, PrimitiveType, WildcardType } = require('java-mti');
const { SourceMethod, SourceConstructor, SourceInitialiser } = require('./source-type');
const ResolvedImport = require('./parsetypes/resolved-import');
const { resolveTypeOrPackage, resolveNextTypeOrPackage } = require('./type-resolver');
@@ -34,30 +34,29 @@ function typeIdentList(tokens, scoped_type, imports, typemap) {
* @param {Map<string,JavaType>} typemap
*/
function typeIdent(tokens, scoped_type, imports, typemap) {
if (tokens.current.kind !== 'ident') {
if (tokens.current.value === '?') {
return wildcardTypeArgument(tokens, scoped_type, imports, typemap);
}
return AnyType.Instance;
let types = [], package_name = '';
switch(tokens.current.kind) {
case 'ident':
({ types, package_name } = resolveTypeOrPackage(tokens.current.value, scoped_type, imports, typemap));
break;
case 'primitive-type':
types.push(PrimitiveType.fromName(tokens.current.value));
break;
default:
return tokens.current.value === '?'
? wildcardTypeArgument(tokens, scoped_type, imports, typemap)
: AnyType.Instance;
}
let { types, package_name } = resolveTypeOrPackage(tokens.current.value, scoped_type, imports, typemap);
tokens.inc();
for (;;) {
if (tokens.isValue('.')) {
if (tokens.current.kind !== 'ident') {
break;
}
resolveNextTypeOrPackage(tokens.current.value, types, package_name, typemap);
({ types, package_name } = resolveNextTypeOrPackage(tokens.current.value, types, package_name, typemap));
tokens.inc();
} else if (tokens.isValue('<')) {
if (!tokens.isValue('>')) {
typeIdentList(tokens, scoped_type, imports, typemap);
if (/>>>?/.test(tokens.current.value)) {
// we need to split >> and >>> into separate > tokens to handle things like List<Class<?>>
const new_tokens = tokens.current.value.split('').map((gt,i) => new Token(tokens.current.range.source, tokens.current.range.start + i, 1, 'comparison-operator'));
tokens.splice(tokens.idx, 1, ...new_tokens);
}
tokens.expectValue('>');
}
genericTypeArgs(tokens, types, scoped_type, imports, typemap);
} else if (tokens.isValue('[')) {
let arrdims = 0;
for(;;) {
@@ -79,6 +78,37 @@ function typeIdent(tokens, scoped_type, imports, typemap) {
return types[0] || AnyType.Instance;
}
/**
*
* @param {TokenList} tokens
* @param {JavaType[]} types
* @param {CEIType} scoped_type
* @param {ResolvedImport[]} imports
* @param {Map<string,JavaType>} typemap
*/
function genericTypeArgs(tokens, types, scoped_type, imports, typemap) {
if (!tokens.isValue('>')) {
const type_arguments = typeIdentList(tokens, scoped_type, imports, typemap);
types.forEach((t,i,arr) => {
if (t instanceof CEIType) {
let specialised = t.specialise(type_arguments);
if (typemap.has(specialised.shortSignature)) {
arr[i] = typemap.get(specialised.shortSignature);
return;
}
typemap.set(specialised.shortSignature, specialised);
arr[i] = specialised;
}
});
if (/>>>?/.test(tokens.current.value)) {
// we need to split >> and >>> into separate > tokens to handle things like List<Class<?>>
const new_tokens = tokens.current.value.split('').map((gt,i) => new Token(tokens.current.range.source, tokens.current.range.start + i, 1, 'comparison-operator'));
tokens.splice(tokens.idx, 1, ...new_tokens);
}
tokens.expectValue('>');
}
}
/**
* @param {TokenList} tokens
* @param {CEIType} scoped_type
@@ -105,3 +135,4 @@ function wildcardTypeArgument(tokens, scoped_type, imports, typemap) {
exports.typeIdent = typeIdent;
exports.typeIdentList = typeIdentList;
exports.genericTypeArgs = genericTypeArgs;