github/android-dev-ext
1
1
Fork 0
mirror of https://github.com/adelphes/android-dev-ext.git synced 2025-12-24 02:19:15 +00:00
Code Issues 41 Packages Projects Releases Wiki Activity

support package name as a resolved value

Browse Source
This commit is contained in:
Dave Holoway
2020-06-19 11:08:02 +01:00
parent 82e660eabc
commit a034a90735
9 changed files with 89 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
langserver/java/expressiontypes/Expression.js
View File

@@ -13,7 +13,7 @@ class Expression {
* @returns {ResolvedValue}
*/
resolveExpression(ri) {
throw new Error('Expression.resolveType');
throw new Error('Expression.resolveExpression');
}
/** @returns {Token|Token[]} */

2
langserver/java/expressiontypes/LambdaExpression.js
View File

@@ -21,7 +21,7 @@ class LambdaExpression extends Expression {
/**
* @param {ResolveInfo} ri
*/
resolveType(ri) {
resolveExpression(ri) {
return new LambdaType();
}

32
langserver/java/expressiontypes/MemberExpression.js
View File

@@ -5,8 +5,9 @@
*/
const { Expression } = require("./Expression");
const { CEIType } = require('java-mti');
const { AnyType, MethodType, TypeIdentType } = require('../anys');
const { AnyType, MethodType, PackageNameType, TypeIdentType } = require('../anys');
const { getTypeInheritanceList } = require('../expression-resolver');
const { resolveNextPackage } = require('../type-resolver');
const ParseProblem = require('../parsetypes/parse-problem');
class MemberExpression extends Expression {
@@ -25,25 +26,36 @@ class MemberExpression extends Expression {
* @param {ResolveInfo} ri
*/
resolveExpression(ri) {
let type = this.instance.resolveExpression(ri);
if (type instanceof TypeIdentType) {
let instance = this.instance.resolveExpression(ri);
if (instance instanceof TypeIdentType) {
// static member
type = type.type;
instance = instance.type;
}
if (type instanceof AnyType) {
return type;
if (instance instanceof AnyType) {
return instance;
}
const ident = this.member.value;
if (!(type instanceof CEIType)) {
if (instance instanceof PackageNameType) {
const { sub_package_name, type } = resolveNextPackage(instance.package_name, ident, ri.typemap);
if (!type && !sub_package_name) {
ri.problems.push(ParseProblem.Error(this.member, `Unresolved identifier: '${ident}'`));
}
return type ? new TypeIdentType(type)
: sub_package_name ? new PackageNameType(sub_package_name)
: AnyType.Instance;
}
if (!(instance instanceof CEIType)) {
ri.problems.push(ParseProblem.Error(this.member, `Unresolved member: '${ident}'`));
return AnyType.Instance;
}
const field = type.fields.find(f => f.name === ident);
const field = instance.fields.find(f => f.name === ident);
if (field) {
return field.type;
}
let methods = new Map();
getTypeInheritanceList(type).forEach(type => {
getTypeInheritanceList(instance).forEach(type => {
type.methods.forEach(m => {
let msig;
if (m.name === ident && !methods.has(msig = m.methodSignature)) {
@@ -54,7 +66,7 @@ class MemberExpression extends Expression {
if (methods.size > 0) {
return new MethodType([...methods.values()]);
}
ri.problems.push(ParseProblem.Error(this.member, `Unresolved member: '${ident}' in type '${type.fullyDottedRawName}'`));
ri.problems.push(ParseProblem.Error(this.member, `Unresolved member: '${ident}' in type '${instance.fullyDottedRawName}'`));
return AnyType.Instance;
}

2
langserver/java/expressiontypes/Variable.js
View File

@@ -24,7 +24,7 @@ class Variable extends Expression {
/**
* @param {ResolveInfo} ri
*/
resolveType(ri) {
resolveExpression(ri) {
return this.type;
}

1
langserver/java/expressiontypes/literals/Instance.js
View File

@@ -13,6 +13,7 @@ class InstanceLiteral extends LiteralValue {
*/
constructor(token, scoped_type) {
super(token, null);
this.token = token;
this.scoped_type = scoped_type;
}