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

update ResolvableType to use same type resolving as method body parsing

Browse Source
This commit is contained in:
Dave Holoway
2020-06-08 21:02:34 +01:00
parent 7c9acfd7ca
commit 426735aa25
5 changed files with 82 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
langserver/java/TokenList.js
View File

@@ -30,7 +30,7 @@ class TokenList {
* @param {string} value
*/
isValue(value) {
if (this.current.value === value) {
if (this.current && this.current.value === value) {
this.inc();
return true;
}
@@ -45,14 +45,18 @@ class TokenList {
if (this.isValue(value)) {
return true;
}
const token = this.current || this.tokens[this.tokens.length - 1];
const addproblem = require("./body-parser3").addproblem;
addproblem(this, ParseProblem.Error(this.current, `${value} expected`));
addproblem(this, ParseProblem.Error(token, `${value} expected`));
return false;
}
get previous() {
for (let idx = this.idx - 1; idx >= 0; idx--) {
if (idx === 0 || this.tokens[idx].kind !== 'wsc') {
if (idx <= 0) {
return this.tokens[0];
}
if (this.tokens[idx].kind !== 'wsc') {
return this.tokens[idx];
}
}