From 81c42a80f522175001e7ac0078fda2f4e044a27d Mon Sep 17 00:00:00 2001 From: Daniel Hung Date: Mon, 10 Dec 2018 19:23:09 -0800 Subject: [PATCH] tweak hover content --- src/completion.js | 2 +- src/constants.js | 2 +- src/hover.js | 71 +++++++++++++++++++++++++++++++---------------- 3 files changed, 49 insertions(+), 26 deletions(-) diff --git a/src/completion.js b/src/completion.js index 22d7687..29b260d 100644 --- a/src/completion.js +++ b/src/completion.js @@ -69,7 +69,7 @@ module.exports = class KiteCompletionProvider { item.sortText = fill(String(i), length, '0'); item.insertText = c.insert; if (c.documentation_text !== '') { - item.documentation = new MarkdownString(`__${c.symbol.value[0].repr}__    _${c.hint}_ + item.documentation = new MarkdownString(`[𝕜𝕚𝕥𝕖]  __${c.symbol.value[0].repr}__    _${c.hint}_ ${c.documentation_text} diff --git a/src/constants.js b/src/constants.js index dabc456..4b12b5b 100644 --- a/src/constants.js +++ b/src/constants.js @@ -30,7 +30,7 @@ const AUTOCORRECT_SHOW_SIDEBAR = 'Reopen sidebar'; const AUTOCORRECT_DONT_SHOW_SIDEBAR = 'Fix code quietly'; module.exports = { - ATTEMPTS, + ATTEMPTS, INTERVAL, PYTHON_MODE, NEW_PYTHON_MODE, diff --git a/src/hover.js b/src/hover.js index 2175a67..21b56db 100644 --- a/src/hover.js +++ b/src/hover.js @@ -23,40 +23,63 @@ module.exports = class KiteHoverProvider { if (data && data.symbol && data.symbol.length) { const [symbol] = data.symbol; const id = symbolId(symbol); - const texts = [{ - language: 'python', - value: `${symbolName(symbol)} ${symbolKind(symbol)}` - }, - ]; - const links = []; - - if (!idIsEmpty(id)) { - links.push(`[docs](command:kite.more-position?${escapeCommandArguments({ - position, - source: 'Hover', - })})`); - } else { - links.push(`[docs](command:kite.more-position?${escapeCommandArguments({ - position, - source: 'Hover', - })})`); - } + const docsLink = `[Docs](command:kite.more-position?${escapeCommandArguments({ + position, + source: 'Hover', + })})`; + let defLink; if (data && data.report && data.report.definition && data.report.definition.filename !== '') { const defData = escapeCommandArguments({ file: data.report.definition.filename, line: data.report.definition.line, source: 'Hover', }); - links.push(`[def](command:kite.def?${defData})`); + defLink = `[Def](command:kite.def?${defData})`; } - if (links.length) { - const md = new vscode.MarkdownString('**Kite:** ' + links.join(' ')) - md.isTrusted = true; - texts.push(md); - } + const content = new vscode.MarkdownString(`[𝕜𝕚𝕥𝕖] ${symbolName(symbol)} (${docsLink}${defLink ? ', ' + defLink : ''})    ${symbolKind(symbol)}`); + content.isTrusted = true; + + const texts = [ + content + ]; + + // const texts = [{ + // language: 'python', + // value: `[𝕜𝕚𝕥𝕖] ${symbolName(symbol)}${docsLink} ${symbolKind(symbol)}` + // }, + // ]; + + // const links = []; + + // if (!idIsEmpty(id)) { + // links.push(`[docs](command:kite.more-position?${escapeCommandArguments({ + // position, + // source: 'Hover', + // })})`); + // } else { + // links.push(`[docs](command:kite.more-position?${escapeCommandArguments({ + // position, + // source: 'Hover', + // })})`); + // } + + // if (data && data.report && data.report.definition && data.report.definition.filename !== '') { + // const defData = escapeCommandArguments({ + // file: data.report.definition.filename, + // line: data.report.definition.line, + // source: 'Hover', + // }); + // links.push(`[def](command:kite.def?${defData})`); + // } + + // if (links.length) { + // const md = new vscode.MarkdownString('**Kite:** ' + links.join(' ')) + // md.isTrusted = true; + // texts.push(md); + // } return new Hover(compact(texts)); }