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

ignore unresolved types in extends/implements

Browse Source
This commit is contained in:
Dave Holoway
2020-06-16 16:01:21 +01:00
parent 9ac6086bad
commit 46838686ea
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
langserver/java/validation/bad-extends.js
View File

@@ -1,15 +1,19 @@
const { SourceType, SourceTypeIdent } = require('../source-type'); const { SourceType } = require('../source-type');
const ParseProblem = require('../parsetypes/parse-problem'); const ParseProblem = require('../parsetypes/parse-problem');
const { AnyType } = require('../body-types');
/** /**
* @param {SourceType} source_type * @param {SourceType} source_type
* @param {*} probs * @param {*} probs
*/ */
function checkExtends(source_type, probs) { function checkExtends(source_type, probs) {
if (source_type.extends_types.length === 0) { const supertypes = source_type.extends_types
.map(st => st.resolved)
.filter(t => !(t instanceof AnyType));
if (supertypes.length === 0) {
return; return;
} }
const supertypes = source_type.extends_types.map(st => st.resolved);
const supertype = supertypes[0]; const supertype = supertypes[0];
if (source_type.typeKind === 'enum') { if (source_type.typeKind === 'enum') {
probs.push(ParseProblem.Error(source_type.extends_types[0].tokens, `Enum types cannot declare a superclass`)); probs.push(ParseProblem.Error(source_type.extends_types[0].tokens, `Enum types cannot declare a superclass`));

10
langserver/java/validation/bad-implements.js
View File

@@ -1,5 +1,6 @@
const ParseProblem = require('../parsetypes/parse-problem'); const ParseProblem = require('../parsetypes/parse-problem');
const {SourceType} = require('../source-type'); const {SourceType} = require('../source-type');
const { AnyType } = require('../body-types');
const { UnresolvedType } = require('java-mti'); const { UnresolvedType } = require('java-mti');
/** /**
@@ -7,15 +8,18 @@ const { UnresolvedType } = require('java-mti');
* @param {*} probs * @param {*} probs
*/ */
function checkImplements(source_type, probs) { function checkImplements(source_type, probs) {
if (source_type.implements_types.length === 0) { const superinterfaces = source_type.implements_types
.map(st => st.resolved)
.filter(t => !(t instanceof AnyType));
if (superinterfaces.length === 0) {
return; return;
} }
const interfaces = source_type.implements_types.map(it => it.resolved);
if (source_type.typeKind === 'interface') { if (source_type.typeKind === 'interface') {
probs.push(ParseProblem.Error(source_type.implements_types[0].tokens, `Interface types cannot declare an implements section`)); probs.push(ParseProblem.Error(source_type.implements_types[0].tokens, `Interface types cannot declare an implements section`));
} }
if (source_type.typeKind === 'class') { if (source_type.typeKind === 'class') {
interfaces.forEach((intf, i) => { superinterfaces.forEach((intf, i) => {
if (intf instanceof UnresolvedType) { if (intf instanceof UnresolvedType) {
return; return;
} }