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

improve reporting of unresolved identifiers

Browse Source
This commit is contained in:
Dave Holoway
2020-06-18 13:16:39 +01:00
parent c1f2ccdc4a
commit d869afe2fa
3 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
langserver/java/body-types.js
View File

@@ -5,6 +5,7 @@
const { JavaType, CEIType, ArrayType, Method } = require('java-mti');
const { Token } = require('./tokenizer');
const { AnyType, MethodType, TypeIdentType } = require('./anys');
const ParseProblem = require('./parsetypes/parse-problem');
class ResolvedIdent {
@@ -39,6 +40,7 @@ class ResolvedIdent {
if (this.types[0]) {
return new TypeIdentType(this.types[0]);
}
ri.problems.push(ParseProblem.Error(this.tokens, `Unresolved identifier: ${this.source}`));
return AnyType.Instance;
}

11
langserver/java/expression-resolver.js
View File

@@ -50,14 +50,13 @@ function checkTypeAssignable(variable_type, value_type, tokens, problems) {
value_type.types.forEach(t => checkTypeAssignable(variable_type, t, tokens, problems));
return;
}
if (!(value_type instanceof JavaType)) {
if (value_type instanceof JavaType) {
if (!isTypeAssignable(variable_type, value_type)) {
problems.push(ParseProblem.Error(tokens(), `Incompatible types: Expression of type '${value_type.fullyDottedTypeName}' cannot be assigned to a variable of type '${variable_type.fullyDottedTypeName}'`));
}
return;
}
if (!isTypeAssignable(variable_type, value_type)) {
const t = tokens();
if (t.length || (t && !Array.isArray(t)))
problems.push(ParseProblem.Error(t, `Incompatible types: Expression of type '${value_type.fullyDottedTypeName}' cannot be assigned to a variable of type '${variable_type.fullyDottedTypeName}'`));
}
problems.push(ParseProblem.Error(tokens(), `Field, variable or method call expected`));
}
/**

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

@@ -5,8 +5,9 @@
*/
const { Expression } = require("./Expression");
const { CEIType } = require('java-mti');
const { AnyType, MethodType } = require('../anys');
const { AnyType, MethodType, TypeIdentType } = require('../anys');
const { getTypeInheritanceList } = require('../expression-resolver');
const ParseProblem = require('../parsetypes/parse-problem');
class MemberExpression extends Expression {
/**
@@ -24,11 +25,19 @@ class MemberExpression extends Expression {
* @param {ResolveInfo} ri
*/
resolveExpression(ri) {
const type = this.instance.resolveExpression(ri);
if (!(type instanceof CEIType)) {
return AnyType.Instance;
let type = this.instance.resolveExpression(ri);
if (type instanceof TypeIdentType) {
// static member
type = type.type;
}
if (type instanceof AnyType) {
return type;
}
const ident = this.member.value;
if (!(type instanceof CEIType)) {
ri.problems.push(ParseProblem.Error(this.member, `Unresolved member: '${ident}'`));
return AnyType.Instance;
}
const field = type.fields.find(f => f.name === ident);
if (field) {
return field.type;
@@ -45,6 +54,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}'`));
return AnyType.Instance;
}