github/android-dev-ext
1
1
Fork 0
mirror of https://github.com/adelphes/android-dev-ext.git synced 2025-12-22 17:39:19 +00:00
Code Issues 41 Packages Projects Releases Wiki Activity

post-name array qualifiers in method decls

Browse Source
This commit is contained in:
Dave Holoway
2020-06-09 12:05:25 +01:00
parent 74a0339962
commit 252b476147
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
langserver/java/parser9.js
View File

@@ -439,7 +439,7 @@ class MCBlock extends DeclarationBlock {
} }
class MethodBlock extends MCBlock { class MethodBlock extends MCBlock {
static parseRE = /([MQT](?:\s*[MQT])*\s+)?(V\s*)R(\s*L)?\s*[B;]/g; static parseRE = /([MQT](?:\s*[MQT])*\s+)?(V\s*)R(\s*A)?(\s*L)?\s*[B;]/g;
/** /**
* *
@@ -449,25 +449,25 @@ class MethodBlock extends MCBlock {
constructor(section, simplified, match) { constructor(section, simplified, match) {
super(section, simplified, match); super(section, simplified, match);
const sm = section.sourcemap(); const sm = section.sourcemap();
const varoffset = match[1] ? match[1].length : 0;
/** @type {VarDeclBlock} */ /** @type {VarDeclBlock} */
// @ts-ignore // @ts-ignore
this.varBlock = section.blocks[sm.map[varoffset]]; this.varBlock = section.blocks[sm.map[match[0].lastIndexOf('V')]];
this.postNameArrToken = section.blocks[sm.map[match[0].lastIndexOf('A')]];
} }
/** /**
* Return the method name * Return the method name
*/ */
get name() { get name() {
return this.varBlock ? this.varBlock.name : ''; return this.varBlock.name;
} }
get type() { get type() {
return this.varBlock ? this.varBlock.type : ''; return this.varBlock.type + (this.postNameArrToken ? this.postNameArrToken.source : '');
} }
get typeTokens() { get typeTokens() {
return this.varBlock ? this.varBlock.typeTokens : []; return this.postNameArrToken ? [...this.varBlock.typeTokens, this.postNameArrToken] : this.varBlock.typeTokens;
} }
} }