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

ensure tokens are assigned for qualified expressions

Browse Source
This commit is contained in:
Dave Holoway
2020-06-22 13:03:28 +01:00
parent df210b4659
commit 4fc616daa1
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1639,12 +1639,10 @@ function expressionList(tokens, mdecls, scope, imports, typemap, opts) {
} }
/** /**
* @param {TokenList} tokens
* @param {Token} open_array
* @param {ResolvedIdent} instance * @param {ResolvedIdent} instance
* @param {ResolvedIdent} index * @param {ResolvedIdent} index
*/ */
function arrayElementOrConstructor(tokens, open_array, instance, index) { function arrayElementOrConstructor(instance, index) {
const ident = `${instance.source}[${index.source}]`; const ident = `${instance.source}[${index.source}]`;
const types = instance.types.map(t => new FixedLengthArrayType(t, index)); const types = instance.types.map(t => new FixedLengthArrayType(t, index));
return new ResolvedIdent(ident, [new ArrayIndexExpression(instance, index)], [], types, '', index.tokens.slice()); return new ResolvedIdent(ident, [new ArrayIndexExpression(instance, index)], [], types, '', index.tokens.slice());
@@ -1721,7 +1719,7 @@ function memberQualifier(matches, tokens, mdecls, scope, imports, typemap) {
break; break;
} }
tokens.inc(); tokens.inc();
return new ResolvedIdent(label, [expr], [], types, package_name, tokens.markEnd()); return new ResolvedIdent(label, [expr], [], types, package_name, [...matches.tokens, ...tokens.markEnd()]);
} }
/** /**
@@ -1733,17 +1731,18 @@ function memberQualifier(matches, tokens, mdecls, scope, imports, typemap) {
* @param {Map<string,CEIType>} typemap * @param {Map<string,CEIType>} typemap
*/ */
function arrayQualifiers(matches, tokens, mdecls, scope, imports, typemap) { function arrayQualifiers(matches, tokens, mdecls, scope, imports, typemap) {
while (tokens.isValue('[')) { while (tokens.current.value === '[') {
let open_array = tokens.current; tokens.mark();
tokens.inc();
if (tokens.isValue(']')) { if (tokens.isValue(']')) {
// array type // array type
matches = arrayTypeExpression(matches); matches = arrayTypeExpression(matches, tokens.markEnd());
} else { } else {
// array index // array index
const index = expression(tokens, mdecls, scope, imports, typemap); const index = expression(tokens, mdecls, scope, imports, typemap);
matches = arrayElementOrConstructor(tokens, open_array, matches, index);
// @ts-ignore
tokens.expectValue(']'); tokens.expectValue(']');
tokens.markEnd();
matches = arrayElementOrConstructor(matches, index);
} }
} }
return matches; return matches;
@@ -1759,20 +1758,22 @@ function arrayQualifiers(matches, tokens, mdecls, scope, imports, typemap) {
*/ */
function methodCallQualifier(matches, tokens, mdecls, scope, imports, typemap) { function methodCallQualifier(matches, tokens, mdecls, scope, imports, typemap) {
let args = []; let args = [];
tokens.mark();
tokens.expectValue('('); tokens.expectValue('(');
if (!tokens.isValue(')')) { if (!tokens.isValue(')')) {
args = expressionList(tokens, mdecls, scope, imports, typemap); args = expressionList(tokens, mdecls, scope, imports, typemap);
tokens.expectValue(')'); tokens.expectValue(')');
} }
return new ResolvedIdent(`${matches.source}(${args.map(a => a.source).join(', ')})`, [new MethodCallExpression(matches, args)]); return new ResolvedIdent(`${matches.source}(${args.map(a => a.source).join(', ')})`, [new MethodCallExpression(matches, args)], [], [], '', [...matches.tokens, ...tokens.markEnd()]);
} }
/** /**
* @param {ResolvedIdent} matches * @param {ResolvedIdent} matches
* @param {Token[]} array_tokens
*/ */
function arrayTypeExpression(matches) { function arrayTypeExpression(matches, array_tokens) {
const types = matches.types.map(t => new SourceArrayType(t)); const types = matches.types.map(t => new SourceArrayType(t));
return new ResolvedIdent(`${matches.source}[]`, [], [], types); return new ResolvedIdent(`${matches.source}[]`, [], [], types, '', [...matches.tokens, ...array_tokens]);
} }
/** /**