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

fix parse issue with nested generic types

Browse Source
This commit is contained in:
Dave Holoway
2020-06-07 22:38:18 +01:00
parent a4be37d872
commit 6bcdecee07
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -115,6 +115,11 @@ class TokenList {
} }
} }
} }
splice(start, delete_count, ...add) {
this.tokens.splice(start, delete_count, ...add);
this.current = this.tokens[this.idx];
}
} }
/** /**
@@ -1775,13 +1780,18 @@ function typeIdent(tokens, method, imports, typemap) {
} }
const { types, package_name } = resolveTypeOrPackage(tokens.current.value, method._owner, imports, typemap); const { types, package_name } = resolveTypeOrPackage(tokens.current.value, method._owner, imports, typemap);
let matches = new ResolvedIdent(tokens.current.value, [], [], types, package_name); let matches = new ResolvedIdent(tokens.current.value, [], [], types, package_name);
tokens.inc();
for (;;) { for (;;) {
tokens.inc();
if (tokens.isValue('.')) { if (tokens.isValue('.')) {
matches = parseDottedIdent(matches, tokens, typemap); matches = parseDottedIdent(matches, tokens, typemap);
} else if (tokens.isValue('<')) { } else if (tokens.isValue('<')) {
if (!tokens.isValue('>')) { if (!tokens.isValue('>')) {
typeIdentList(tokens, method, imports, typemap); typeIdentList(tokens, method, imports, typemap);
if (/>>>?/.test(tokens.current.value)) {
// we need to split >> and >>> into separate > tokens to handle things like List<Class<?>>
const new_tokens = tokens.current.value.split('').map((gt,i) => new Token(tokens.current.range.source, tokens.current.range.start + i, 1, 'comparison-operator'));
tokens.splice(tokens.idx, 1, ...new_tokens);
}
tokens.expectValue('>'); tokens.expectValue('>');
} }
} else { } else {