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

improve extraction of parameter docs

Browse Source
This commit is contained in:
Dave Holoway
2020-06-27 00:01:19 +01:00
parent 8f9bf25e4c
commit 2c522e38b1
1 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
langserver/server.js
View File

@@ -1015,27 +1015,24 @@ async function onSignatureHelp(request) {
trace(`onSignatureHelp - ${token.methodCallInfo.methods.length} methods`); trace(`onSignatureHelp - ${token.methodCallInfo.methods.length} methods`);
sighelp = { sighelp = {
signatures: token.methodCallInfo.methods.map(m => { signatures: token.methodCallInfo.methods.map(m => {
const documentation = formatDoc(`#### ${m.owner.simpleTypeName}${m instanceof Method ? `.${m.name}` : ''}()`, m.docs);
const param_docs = new Map();
if (documentation) {
for (let m, re=/@param\s+(\S+)([\d\D]+?)(?=\n\n|\n[ \t*]*@\w+|$)/g; m = re.exec(documentation.value);) {
param_docs.set(m[1], m[2]);
}
}
/** @type {import('vscode-languageserver').SignatureInformation} */ /** @type {import('vscode-languageserver').SignatureInformation} */
let si = { let si = {
label: m.label, label: m.label,
documentation: formatDoc(`#### ${m.owner.simpleTypeName}${m instanceof Method ? `.${m.name}` : ''}()`, m.docs), documentation,
parameters: m.parameters.map(p => { parameters: m.parameters.map(p => {
/** @type {import('vscode-languageserver').MarkupContent} */
let param_documentation = null;
// include a space at the end of the search string so we don't inadvertently match substring parameters, eg: method(type, typeName)
const param_doc_offset = m.docs.indexOf(`@param ${p.name} `);
if (param_doc_offset > 0) {
const doc_match = m.docs.slice(param_doc_offset).match(/@param (\S+)([\d\D]+?)(\n\n|\n[ \t*]*@\w+|$)/);
if (doc_match) {
param_documentation = {
kind:'markdown',
value: `**${doc_match[1]}**: ${formatDoc('', doc_match[2].trim()).value}`,
}
}
}
/** @type {import('vscode-languageserver').ParameterInformation} */ /** @type {import('vscode-languageserver').ParameterInformation} */
let pi = { let pi = {
documentation: param_documentation, documentation: {
kind: 'markdown',
value: param_docs.has(p.name) ? `**${p.name}**: ${param_docs.get(p.name)}` : '',
},
label: p.label label: p.label
} }
return pi; return pi;