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 modifier checks for interface types

Browse Source
This commit is contained in:
Dave Holoway
2020-06-11 14:40:34 +01:00
parent 5b29b9998d
commit 3ab97ef235
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
langserver/java/validation/modifier-errors.js
View File

@@ -78,29 +78,35 @@ function checkMethodModifiers(type, ownertypemods, method, probs) {
checkConflictingAccess(method.modifiers, probs); checkConflictingAccess(method.modifiers, probs);
const allmods = new Map(method.modifiers.map(m => [m.source, m])); const allmods = new Map(method.modifiers.map(m => [m.source, m]));
const is_interface_kind = /@?interface/.test(type.kind());
const has_body = method.body().simplified.startsWith('B');
if (allmods.has('abstract') && allmods.has('final')) { if (allmods.has('abstract') && allmods.has('final')) {
probs.push(ParseProblem.Error(allmods.get('abstract'), 'Method declarations cannot be abstract and final')); probs.push(ParseProblem.Error(allmods.get('abstract'), 'Method declarations cannot be abstract and final'));
} }
if (allmods.has('abstract') && allmods.has('native')) { if (allmods.has('abstract') && allmods.has('native')) {
probs.push(ParseProblem.Error(allmods.get('abstract'), 'Method declarations cannot be abstract and native')); probs.push(ParseProblem.Error(allmods.get('abstract'), 'Method declarations cannot be abstract and native'));
} }
if (allmods.has('abstract') && method.body().simplified.startsWith('B')) { if (allmods.has('abstract') && has_body) {
probs.push(ParseProblem.Error(allmods.get('abstract'), 'Method declarations marked as abstract cannot have a method body')); probs.push(ParseProblem.Error(allmods.get('abstract'), 'Method declarations marked as abstract cannot have a method body'));
} }
if (type.kind() !== 'interface' && !allmods.has('abstract') && !allmods.has('native') && !method.body().simplified.startsWith('B')) { if (!is_interface_kind && !allmods.has('abstract') && !allmods.has('native') && !has_body) {
probs.push(ParseProblem.Error(method, `Method '${method.name}' must have an implementation or be defined as abstract or native`)); probs.push(ParseProblem.Error(method, `Method '${method.name}' must have an implementation or be defined as abstract or native`));
} }
if (type.kind() !== 'interface' && allmods.has('abstract') && !ownertypemods.has('abstract')) { if (!is_interface_kind && allmods.has('abstract') && !ownertypemods.has('abstract')) {
probs.push(ParseProblem.Error(method, `Method '${method.name}' cannot be declared abstract inside a non-abstract type`)); probs.push(ParseProblem.Error(method, `Method '${method.name}' cannot be declared abstract inside a non-abstract type`));
} }
if (allmods.has('native') && method.body().simplified.startsWith('B')) { if (is_interface_kind && has_body && !allmods.has('default')) {
probs.push(ParseProblem.Error(method, `Non-default interface methods cannot have a method body`));
}
if (allmods.has('native') && has_body) {
probs.push(ParseProblem.Error(allmods.get('native'), 'Method declarations marked as native cannot have a method body')); probs.push(ParseProblem.Error(allmods.get('native'), 'Method declarations marked as native cannot have a method body'));
} }
// JLS8 // JLS8
if (type.kind() !== 'interface' && allmods.has('default')) { if (type.kind() !== 'interface' && allmods.has('default')) {
probs.push(ParseProblem.Error(method, `Default method declarations are only allowed inside interfaces`)); probs.push(ParseProblem.Error(method, `Default method declarations are only allowed inside interfaces`));
} }
if (allmods.has('default') && !method.body().simplified.startsWith('B')) { if (allmods.has('default') && !has_body) {
probs.push(ParseProblem.Error(method, `Default method declarations must have an implementation`)); probs.push(ParseProblem.Error(method, `Default method declarations must have an implementation`));
} }
} }