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

ignore synthetic members in completion list

Browse Source
This commit is contained in:
Dave Holoway
2020-06-30 14:02:35 +01:00
parent 4cd0764a9d
commit 10848b2910
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
langserver/completions.js
View File

@@ -71,10 +71,13 @@ function getTypedNameCompletion(typemap, type_signature, opts, typelist) {
/** /**
* @param {string[]} modifiers * @param {string[]} modifiers
* @param {JavaType} t * @param {JavaType} t
* @param {boolean} [synthetic]
*/ */
function shouldInclude(modifiers, t) { function shouldInclude(modifiers, t, synthetic) {
// filter statics/instances // filter statics/instances
if (opts.statics !== modifiers.includes('static')) return; if (opts.statics !== modifiers.includes('static')) return;
// exclude synthetic entries
if (synthetic) return;
if (modifiers.includes('public')) return true; if (modifiers.includes('public')) return true;
if (modifiers.includes('protected')) return true; if (modifiers.includes('protected')) return true;
// only include private items for the current type // only include private items for the current type
@@ -90,7 +93,7 @@ function getTypedNameCompletion(typemap, type_signature, opts, typelist) {
.forEach(e => enumValues.set(e.name, {e, t})) .forEach(e => enumValues.set(e.name, {e, t}))
} }
t.fields.sort(sortBy.name) t.fields.sort(sortBy.name)
.filter(f => shouldInclude(f.modifiers, t)) .filter(f => shouldInclude(f.modifiers, t, f.isSynthetic))
.forEach(f => { .forEach(f => {
if (f.isEnumValue) { if (f.isEnumValue) {
enumValues.set(f.name, {e:f, t}); enumValues.set(f.name, {e:f, t});
@@ -99,7 +102,7 @@ function getTypedNameCompletion(typemap, type_signature, opts, typelist) {
} }
}); });
t.methods.sort(sortBy.name) t.methods.sort(sortBy.name)
.filter(f => shouldInclude(f.modifiers, t)) .filter(m => shouldInclude(m.modifiers, t, m.isSynthetic))
.forEach(m => methods.set(`${m.name}${m.methodSignature}`, {m, t})); .forEach(m => methods.set(`${m.name}${m.methodSignature}`, {m, t}));
}); });