showDoc on cursor

This commit is contained in:
ckcz123 2020-06-05 09:12:16 +08:00
parent d3e27a76c8
commit f9786a7de3
2 changed files with 13 additions and 11 deletions

View File

@ -1860,21 +1860,21 @@
function showContextInfo(ts, cm, pos, queryName, c) { function showContextInfo(ts, cm, pos, queryName, c) {
ts.request(cm, queryName, function(error, data) { ts.request(cm, queryName, function(error, data) {
if (error) return showError(ts, cm, error); data = data || {};
if (ts.options.typeTip) { data.type = data.type || '';
var tip = ts.options.typeTip(data); data.doc = data.doc || '';
} else { if (!error && (data.type.startsWith('fn(') || data.doc)) {
var tip = elt("span", null, elt("strong", null, data.type || "not found")); var tip = elt("span", null, elt("strong", null, data.type || "not found"));
if (data.doc) if (data.doc)
tip.appendChild(document.createTextNode(" — " + data.doc)); tip.appendChild(document.createTextNode(" — " + data.doc)); /*
if (data.url) { if (data.type.startsWith('fn(') && data.url) {
tip.appendChild(document.createTextNode(" ")); tip.appendChild(document.createTextNode(" "));
var child = tip.appendChild(elt("a", null, "[docs]")); var child = tip.appendChild(elt("a", null, "[docs]"));
child.href = data.url; child.href = data.url;
child.target = "_blank"; child.target = "_blank";
} } */
tempTooltip(cm, tip, ts);
} }
tempTooltip(cm, tip, ts);
if (c) c(); if (c) c();
}, pos); }, pos);
} }
@ -2204,7 +2204,6 @@
} }
// Tooltips // Tooltips
function tempTooltip(cm, content, ts) { function tempTooltip(cm, content, ts) {
if (cm.state.ternTooltip) remove(cm.state.ternTooltip); if (cm.state.ternTooltip) remove(cm.state.ternTooltip);
var where = cm.cursorCoords(); var where = cm.cursorCoords();
@ -2215,7 +2214,7 @@
} }
function clear() { function clear() {
cm.state.ternTooltip = null; cm.state.ternTooltip = null;
if (tip.parentNode) fadeOut(tip) if (tip.parentNode) remove(tip)
clearActivity() clearActivity()
} }
var mouseOnTip = false, old = false; var mouseOnTip = false, old = false;

View File

@ -34,7 +34,10 @@ editor_multi = function () {
editor_multi.codeEditor = codeEditor; editor_multi.codeEditor = codeEditor;
codeEditor.on("cursorActivity", function (cm) { codeEditor.on("cursorActivity", function (cm) {
ternServer.updateArgHints(cm); if (codeEditor.getOption("autocomplete")) {
ternServer.updateArgHints(cm);
ternServer.showDocs(cm);
}
}); });
codeEditor.on("keyup", function (cm, event) { codeEditor.on("keyup", function (cm, event) {