mirror of
https://github.com/adelphes/android-dev-ext.git
synced 2025-12-22 17:39:19 +00:00
* initial working language server * first hacky version of source parsing and type checking * first iteration of method body parser * add support for prefix/postfix inc expressions * add basic support for parsing new expressions * different attempt to parse using collapsable text ranges * fix parsing of binary operstors following a bracket expression * updated validation to use new JavaTypes module instead of MTIs * add support for array-literal expressions * fix || and && not being tokenized as operators allow float literals starting with dot * add new method body parser to use direct linear parsing * add super as an object literal * fix interface constructors check constructor type modifiers * fix assignment operator types * Fix resolving of enclosed type identifiers * add default constructor for class types with no explicit constructors * add missing constructor validator * add constructor parameters to list of resolvable types * update SourceMethod to pass name in super constructor * add Any* classes to reduce cascading errors * update method call parameter checking use isTypeAssignable instead of getParameterCompatibleTypeSignatures * tidy up isTypeAssignable allow class equivilents for primitives * add more info when methods/ctrs cannot be matched * allow interfaces to be cast to class instances * use isTypeAssignable for checking branch test expressions * allow AnyValue to be a constant value * split shift operators from bitwise operators * add support for literal numbers to be assignable to multiple primtive types * clear diagnostics when document is closed * update check for cast expression * casting only applies to qualified term not a whole expression * allow all primitive-number-type casts * add support for synchronized statement * update primitive type compatibility * allow null to be cast to any non-primitve * use better regex for string literals * allow character literals to be assigned to number types * add support for array qualifiers after a variable name * make sure any long specifier is stripped from a bigint value * improve invalid array expression message add AnyType array element to prevent cascading errors * make default a modifer keyword for interface default method support * initial support for wildcard type arguments * fix parse issue with nested generic types * allow generic types to be assigned to inherited types with compatible type arguments * allow unicode characters, $ and _ in identifiers * map primitive types to their boxed versions for class member * support assert statement * allow unicode char literals * make type parser and body parser use same tokenizer * reuse parsed tokens instead of tokenizing each method body * re-add throws as a keyword * treat default and synchronized as modifiers * add SourceInitialiser support * refactor to prepare for merging with type parsing * add support for array qualifiers in type identifiers * pass scoped type instead of method to typeIdent * update ResolvableType to use same type resolving as method body parsing * add support for post-name array qualifiers in fields and parameters * post-name array qualifiers in method decls * add type variables to SourceMethod * initial attempt to support type variable arguments in methods * specialise methods with type variables * don't require default interface methods to be implemented * make variable arity parameters an array type * tidy array constructors and fix some warnings * update isCallCompatible to handle variable arity calls * improve assert statement support * parse labels and break/continue targets * refactor new term qualifiers * add support for generic inferred-type arguments * improve modifier checks for interface types * improve reporting of unresolved type errors * fix type checking of field and method declarations * add missng strictfp modifier * refactor in preparation for parsing local types * replace Locals with scopeable MethodDeclarations to allow labels and types to be stored * initial changes to support local type declarations * update to use new set of SourceX classes * refactor to allow expressions to have a type scope * replace regex parsing with linear parsing * generate source types before parsing * fix support for resolving type variables in method declarations * fix checking of array literal compatability * report errors from unit parsing * remove local modifier validation during parse add parameter modifier checking to validation * allow trailing comma for array literals * start separating validation from parsing * add support for parsing enum values * allow uppercase 0X in hex literals * include enclosing types in identifier search * add support for parsing parameterless lambdas * ignore unresolved types in extends/implements * implement specialisation of SourceType * allow super as a member qualifier * allow empty enums * don't report missing constructors if superclass has none * update typemap declarations to use CEIType instead of JavaType * fix resolving of class type variables * fix bad imports when resolving annotations * allow null scope in findIdentifier * add support for static member imports * import types from same package * remove this qualifier from isCastExpression * add hex exponent support * parse try-with-resources * fix resolving imported enclosed types * extract expression types into separate files * extract statement types into separate files * fix type warnings * extract literals into separate files * remove Value class, add NewExpression and separate out Any classes * rename source types module * remove some parse checks that should be in verify * support token extraction in expressions * implement resolveExpression * add type cast checking * check for valid type in class member expressions * allow assigns for assignable type arguments * improve reporting of unresolved identifiers * add new array validation * validate array literals * validate array indexes * improve validation of binary operators * rename ResolvedType to ResolvedValue * improve checking of number literals * support package name as a resolved value * implement method body and ststement validation * improve method call resolving * add support for this() and super() constructor calls * remove return type for source constructors * add checks for unary operators * ensure tokens are assigned for qualified expressions * check castability using type assignments * add implicit enum methods values() and valueOf() * add basic type checking of lambda expressions * fix return type check * fix assert statement checks * improve support for ternary operators in assignments and method invocations * perform more detailed search of implemented methods * initial test of context-dependant code completion * support package, type and static field import completion * support for member expressions * use exact type signatures for locating types for completion items * add support for field and method docs * add support for docs in source types * support member completion for array types improve comment formatting * ensure Object is always last in the list of inherited types * add owning method to statements create common keyword statement class * improve code completion list add method parameters order list items by scope * add source types to list hide this and super for non-methods * fix bad member resolution at end of block fix missing method and type docs * add support for editing multiple files * allow multiple source files to be used in parsing * load and parse files at startup * add support for displaying method signatures * add single trace function with timestamps * implement shceduleReparse to reduce parsing load while typing * remove parsed type list logging * wait for reparsing before returning method signatures * resolve new object contructors * improve extraction of parameter docs * update @types/vscode * cache decoded android library in globalStoragePath * load single android library cache from local folder * android-29 library cache * allow configurable app root setting * set configurable trace logging and update section names * description updates * handle null token passed to ParseProblem * refactoring * Rename language client extension to Android * ignore unnamed type declarations * handle java file change notifications * make sure we only try and parse java files * add option to allow language server to be shutdown * simplify handling of this and class member qualifiers * relocate java-mti package into project * get main node install to install langserver dependencies * remove debugging pause * rename body-parser3 to body-parser * clean up import resolving code * remove unused field from ResolvedImport * remove validation modules that used old parser types * remove old parser files * remove redundant types and functions used by old parser * move addproblem into TokenList * remove unused ResolvedType class * validate more statements * add support for parsing and validating anonymous types * hide some method modifiers which aren't useful to show * code comments and minor improvements * fix some type warnings * improve support for completion of enum values * add type name to parameter completion labels * ignore synthetic members in completion list * use a specialised map for handling case-insenstive file uris * add basic build script * reference java-mti package from GitHub * revert @types/vscode * update initial file loading to use URIs passed from the client changes to the appSourceRoot now require an extension restart * add support for loading filtered androidx libraries for code completion * update version of java-mti * add mixpanel package * add basic analytics * fix dependency versions * fix dependency versions * set empty cache file markers * add language server debug config * add file to build script * add unqualified type members when inside a method * apply statics filter to enum values * add basic debugger analytics * include current time in startup event * add terminate reason to debugger * update changelog and readme
153 lines
4.2 KiB
JavaScript
153 lines
4.2 KiB
JavaScript
/**
|
|
* @typedef {Map<string,CEIType>} TypeMap
|
|
*/
|
|
const { JavaType, CEIType, MethodBase, TypeVariable } = require('java-mti');
|
|
const { ResolvedImport } = require('./import-resolver');
|
|
|
|
/**
|
|
*
|
|
* @param {string} ident
|
|
* @param {TypeVariable[]} type_variables
|
|
* @param {CEIType|MethodBase} scope
|
|
* @param {ResolvedImport[]} imports
|
|
* @param {TypeMap} typemap
|
|
*/
|
|
function resolveTypeOrPackage(ident, type_variables, scope, imports, typemap) {
|
|
const types = [];
|
|
let package_name = '';
|
|
|
|
const tv = type_variables.find(tv => tv.name === ident);
|
|
if (tv) {
|
|
types.push(tv.type);
|
|
}
|
|
|
|
if (scope) {
|
|
|
|
if (!types[0] && scope instanceof MethodBase) {
|
|
// is it a type variable in the current scope
|
|
const tv = scope.typeVariables.find(tv => tv.name === ident);
|
|
if (tv) {
|
|
types.push(tv.type);
|
|
}
|
|
}
|
|
|
|
const scoped_type = scope instanceof CEIType ? scope : scope.owner;
|
|
if (!types[0]) {
|
|
// is it an enclosed type of the currently scoped type or any outer type
|
|
const scopes = scoped_type.shortSignature.split('$');
|
|
while (scopes.length) {
|
|
const enc_type = typemap.get(`${scopes.join('$')}$${ident}`);
|
|
if (enc_type) {
|
|
types.push(enc_type);
|
|
break;
|
|
}
|
|
scopes.pop();
|
|
}
|
|
if (!types[0] && scoped_type.simpleTypeName === ident) {
|
|
types.push(scoped_type);
|
|
}
|
|
}
|
|
|
|
if (!types[0]) {
|
|
// is it a type variable of the currently scoped type
|
|
const tv = scoped_type.typeVariables.find(tv => tv.name === ident);
|
|
if (tv) {
|
|
types.push(tv.type);
|
|
}
|
|
}
|
|
}
|
|
|
|
if (!types[0]) {
|
|
// is it a type from the imports
|
|
for (let i of imports) {
|
|
const fqn = i.fullyQualifiedNames.find(fqn => fqn.endsWith(ident) && /[$/]/.test(fqn[fqn.length-ident.length-1]));
|
|
if (fqn) {
|
|
types.push(i.types.get(fqn));
|
|
}
|
|
}
|
|
}
|
|
|
|
if (!types[0]) {
|
|
// is it a default-package type
|
|
const default_type = typemap.get(ident);
|
|
if (default_type) {
|
|
types.push(default_type);
|
|
}
|
|
}
|
|
|
|
// the final option is the start of a package name
|
|
const package_root = ident + '/';
|
|
const typelist = [...typemap.keys()];
|
|
if (typelist.find(fqn => fqn.startsWith(package_root))) {
|
|
package_name = ident;
|
|
}
|
|
|
|
return {
|
|
types,
|
|
package_name,
|
|
}
|
|
}
|
|
|
|
/**
|
|
*
|
|
* @param {string} ident
|
|
* @param {JavaType[]} outer_types
|
|
* @param {string} outer_package_name
|
|
* @param {TypeMap} typemap
|
|
*/
|
|
function resolveNextTypeOrPackage(ident, outer_types, outer_package_name, typemap) {
|
|
const types = [];
|
|
let package_name = '';
|
|
|
|
outer_types.forEach(type => {
|
|
if (type instanceof CEIType) {
|
|
const enclosed_type_signature = `${type.shortSignature}$${ident}`;
|
|
const enclosed_type = typemap.get(enclosed_type_signature);
|
|
if (enclosed_type) {
|
|
// it matches an inner/enclosed type
|
|
types.push(enclosed_type);
|
|
}
|
|
}
|
|
})
|
|
|
|
if (outer_package_name) {
|
|
const { type, sub_package_name } = resolveNextPackage(outer_package_name, ident, typemap);
|
|
if (type) {
|
|
types.push(type);
|
|
}
|
|
package_name = sub_package_name;
|
|
}
|
|
|
|
return {
|
|
types,
|
|
package_name,
|
|
}
|
|
}
|
|
|
|
/**
|
|
*
|
|
* @param {string} package_name
|
|
* @param {string} ident
|
|
* @param {TypeMap} typemap
|
|
*/
|
|
function resolveNextPackage(package_name, ident, typemap) {
|
|
let type = null, sub_package_name = '';
|
|
const qualified_name = `${package_name}/${ident}`;
|
|
type = typemap.get(qualified_name) || null;
|
|
const package_match = qualified_name + '/';
|
|
if ([...typemap.keys()].find(fqn => fqn.startsWith(package_match))) {
|
|
// it matches a sub-package
|
|
sub_package_name = qualified_name;
|
|
}
|
|
return {
|
|
type,
|
|
sub_package_name
|
|
}
|
|
}
|
|
|
|
module.exports = {
|
|
resolveTypeOrPackage,
|
|
resolveNextTypeOrPackage,
|
|
resolveNextPackage,
|
|
}
|