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

add support for post-name array qualifiers in fields and parameters

Browse Source
This commit is contained in:
Dave Holoway
2020-06-08 22:50:30 +01:00
parent 426735aa25
commit 74a0339962
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
langserver/java/parser9.js
View File

@@ -926,7 +926,7 @@ class BoundedTypeVar extends TextBlock {
class VarDeclBlock extends TextBlock { class VarDeclBlock extends TextBlock {
// this definition is used for fields, parameters and locals // this definition is used for fields, parameters and locals
// - it includes (...) for variable-arity parameters // - it includes (...) for variable-arity parameters
static parseRE = /([PWD](?: *T)?(?: *\. *[PWD](?: *T)?)*(?: *(A))?)( +| *(\.{3}) *)(W)(?: *(A))?/g; static parseRE = /([PWD](?: *T)?(?: *\. *[PWD](?: *T)?)*(?: *(A))?)( +| *(\.{3}) *)(W)(?:( *)(A))?/g;
static marker = 'V'; static marker = 'V';
/** /**
@@ -940,6 +940,7 @@ class VarDeclBlock extends TextBlock {
const sm = section.sourcemap(); const sm = section.sourcemap();
const name_idx = sm.map[match[1].length + match[3].length]; const name_idx = sm.map[match[1].length + match[3].length];
this.name_token = section.blocks[name_idx]; this.name_token = section.blocks[name_idx];
this.post_name_arr_token = match[7] ? section.blocks[sm.map[match[0].lastIndexOf('A')]] : null;
const varargs_idx = sm.map[match[0].indexOf('...')]; const varargs_idx = sm.map[match[0].indexOf('...')];
this.varargs_token = section.blocks[varargs_idx]; this.varargs_token = section.blocks[varargs_idx];
let end_of_type_tokens = (varargs_idx || name_idx); let end_of_type_tokens = (varargs_idx || name_idx);
@@ -948,6 +949,9 @@ class VarDeclBlock extends TextBlock {
end_of_type_tokens -= 1; end_of_type_tokens -= 1;
} }
this.type_tokens = section.blocks.slice(0, end_of_type_tokens); this.type_tokens = section.blocks.slice(0, end_of_type_tokens);
if (this.post_name_arr_token) {
this.type_tokens.push(this.post_name_arr_token);
}
} }
get name() { get name() {