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

improve reporting of unresolved type errors

Browse Source
This commit is contained in:
Dave Holoway
2020-06-11 15:00:26 +01:00
parent 3ab97ef235
commit c454753385
1 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1737,7 +1737,12 @@ function rootTerm(tokens, locals, method, imports, typemap) {
*/ */
function newTerm(tokens, locals, method, imports, typemap) { function newTerm(tokens, locals, method, imports, typemap) {
tokens.expectValue('new'); tokens.expectValue('new');
const type_start_token = tokens.idx;
const ctr_type = typeIdent(tokens, method, imports, typemap, false); const ctr_type = typeIdent(tokens, method, imports, typemap, false);
if (ctr_type instanceof AnyType) {
const toks = tokens.tokens.slice(type_start_token, tokens.idx);
addproblem(tokens, ParseProblem.Error(toks, `Unresolved type: '${toks.map(t => t.source).join('')}'`));
}
let match = new ResolvedIdent(`new ${ctr_type.simpleTypeName}`, [], [], [ctr_type]); let match = new ResolvedIdent(`new ${ctr_type.simpleTypeName}`, [], [], [ctr_type]);
switch(tokens.current.value) { switch(tokens.current.value) {
case '[': case '[':
@@ -1869,18 +1874,22 @@ function methodCallExpression(tokens, instance, call_arguments, typemap) {
if (!types[0] && !methods[0]) { if (!types[0] && !methods[0]) {
const callargtypes = call_arguments.map(a => a.variables[0] ? a.variables[0].type.fullyDottedTypeName : '<unknown-type>').join(', '); const callargtypes = call_arguments.map(a => a.variables[0] ? a.variables[0].type.fullyDottedTypeName : '<unknown-type>').join(', ');
if (instance.methods[0]) { if (instance.methods[0]) {
if (!(instance.methods[0] instanceof AnyMethod)) {
const methodlist = instance.methods.map(m => m.label).join('\n- '); const methodlist = instance.methods.map(m => m.label).join('\n- ');
addproblem(tokens, ParseProblem.Error(tokens.current, addproblem(tokens, ParseProblem.Error(tokens.current,
`No compatible method found. Tried to match:\n- ${methodlist}\nagainst call argument types: (${callargtypes})`)) `No compatible method found. Tried to match:\n- ${methodlist}\nagainst call argument types: (${callargtypes})`))
}
// fake a result with AnyMethod // fake a result with AnyMethod
methods.push(new AnyMethod(instance.source)); methods.push(new AnyMethod(instance.source));
} else if (instance.types[0]) { } else if (instance.types[0]) {
if (!(instance.types[0] instanceof AnyType)) {
const ctrlist = instance.types[0].constructors.map(c => c.label).join('\n- '); const ctrlist = instance.types[0].constructors.map(c => c.label).join('\n- ');
const match_message = instance.types[0].constructors.length const match_message = instance.types[0].constructors.length
? `Tried to match:\n- ${ctrlist}\nagainst call argument types: (${callargtypes})` ? `Tried to match:\n- ${ctrlist}\nagainst call argument types: (${callargtypes})`
: 'The type has no accessible constructors'; : 'The type has no accessible constructors';
addproblem(tokens, ParseProblem.Error(tokens.current, addproblem(tokens, ParseProblem.Error(tokens.current,
`No compatible constructor found for type '${instance.types[0].fullyDottedTypeName}'. ${match_message}`)); `No compatible constructor found for type '${instance.types[0].fullyDottedTypeName}'. ${match_message}`));
}
// fake a result with AnyType // fake a result with AnyType
types.push(new AnyType(instance.source)); types.push(new AnyType(instance.source));
} }