From f2137eb35c17d2807eabf71a3f5d7ab9cd12899c Mon Sep 17 00:00:00 2001 From: Dave Holoway Date: Thu, 2 Jul 2020 22:39:13 +0100 Subject: [PATCH] add unqualified type members when inside a method --- langserver/completions.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/langserver/completions.js b/langserver/completions.js index e48d002..307e003 100644 --- a/langserver/completions.js +++ b/langserver/completions.js @@ -381,6 +381,7 @@ async function getCompletionItems(params, liveParsers, androidLibrary) { let locals = [], modifiers = dct.modifiers, + type_members = [], sourceTypes = []; if (parsed.unit) { @@ -421,6 +422,12 @@ async function getCompletionItems(params, liveParsers, androidLibrary) { locals.push(...dct.instances); } + type_members = getTypedNameCompletion( + parsed.typemap, + options.method.owner.typeSignature, + { statics: !!options.method.modifierTokens.find(m => m.value === 'static') } + ); + // if we're inside a method, don't show the modifiers modifiers = []; } @@ -451,6 +458,7 @@ async function getCompletionItems(params, liveParsers, androidLibrary) { return [ ...locals, + ...type_members, ...dct.primitiveTypes, ...dct.literals, ...modifiers,