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

support for member expressions

Browse Source
This commit is contained in:
Dave Holoway
2020-06-24 17:10:49 +01:00
parent db865825d0
commit b70592a0f7
3 changed files with 114 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
langserver/java/body-parser3.js
View File

@@ -1703,6 +1703,7 @@ function qualifiers(matches, tokens, mdecls, scope, imports, typemap) {
*/
function memberQualifier(matches, tokens, mdecls, scope, imports, typemap) {
tokens.mark();
const dot = tokens.current;
tokens.expectValue('.');
let expr, label = `${matches.source}.${tokens.current.value}`;
let types = [], package_name = '';
@@ -1724,7 +1725,7 @@ function memberQualifier(matches, tokens, mdecls, scope, imports, typemap) {
member = null;
addproblem(tokens, ParseProblem.Error(tokens.current, `Identifier expected`));
}
expr = new MemberExpression(matches, member);
expr = new MemberExpression(matches, dot, member);
break;
}
tokens.inc();

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

@@ -13,11 +13,13 @@ const ParseProblem = require('../parsetypes/parse-problem');
class MemberExpression extends Expression {
/**
* @param {ResolvedIdent} instance
* @param {Token} dot
* @param {Token|null} member
*/
constructor(instance, member) {
constructor(instance, dot, member) {
super();
this.instance = instance;
this.dot = dot;
// member will be null for incomplete expressions
this.member = member;
}
@@ -27,16 +29,18 @@ class MemberExpression extends Expression {
*/
resolveExpression(ri) {
let instance = this.instance.resolveExpression(ri);
if (instance instanceof TypeIdentType) {
// static member
instance = instance.type;
}
if (instance instanceof AnyType) {
return instance;
}
const ident = this.member.value;
if (instance instanceof PackageNameType) {
this.dot.loc = `fqs:${instance.package_name}`;
if (!this.member) {
return instance;
}
this.member.loc = this.dot.loc;
const ident = this.member.value;
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}'`));
@@ -46,10 +50,24 @@ class MemberExpression extends Expression {
: AnyType.Instance;
}
let loc = `fqi`;
if (instance instanceof TypeIdentType) {
loc = 'fqs';
instance = instance.type;
}
if (!(instance instanceof JavaType)) {
ri.problems.push(ParseProblem.Error(this.member, `Unresolved member: '${ident}'`));
return AnyType.Instance;
}
this.dot.loc = `${loc}:${instance.fullyDottedTypeName}`
if (!this.member) {
ri.problems.push(ParseProblem.Error(this.dot, `Identifier expected`));
return instance;
}
this.member.loc = this.dot.loc;
const ident = this.member.value;
const field = instance.fields.find(f => f.name === ident);
if (field) {
return field.type;