stash

2 files changed, 37 insertions, 135 deletions

diff --git a/script/core/completion.lua b/script/core/completion.lua
index 06219e74..dc4ddf28 100644
--- a/script/core/completion.lua
+++ b/script/core/completion.lua
@@ -191,13 +191,7 @@ local function buildDesc(source)
         return
     end
     local hover = getHover.get(source)
-    local md = markdown()
-    md:add('lua', hover.label)
-    md:splitLine()
-    md:add('md',  hover.description)
-    md:splitLine()
-    md:add('lua', getSnip(source))
-    return md
+    return hover
 end
 
 local function buildFunction(results, source, value, oop, data)
diff --git a/script/core/hover/init.lua b/script/core/hover/init.lua
index c6c2d92e..6e98d6c9 100644
--- a/script/core/hover/init.lua
+++ b/script/core/hover/init.lua
@@ -1,145 +1,55 @@
 local files      = require 'files'
-local searcher   = require 'core.searcher'
 local vm         = require 'vm'
 local getLabel   = require 'core.hover.label'
 local getDesc    = require 'core.hover.description'
 local util       = require 'utility'
 local findSource = require 'core.find-source'
-local lang       = require 'language'
 local markdown   = require 'provider.markdown'
 local infer      = require 'core.infer'
 
-local function eachFunctionAndOverload(value, callback)
-    callback(value)
-    if not value.bindDocs then
-        return
-    end
-    for _, doc in ipairs(value.bindDocs) do
-        if doc.type == 'doc.overload' then
-            callback(doc.overload)
-        end
-    end
-end
+local function getHover(source)
+    local md        = markdown()
+    local defMark   = {}
+    local labelMark = {}
+    local descMark  = {}
 
-local function getHoverAsValue(source)
-    local label = getLabel(source)
-    local desc  = getDesc(source)
-    if not desc then
-        local values = vm.getDefs(source)
-        for _, def in ipairs(values) do
-            desc = getDesc(def)
-            if desc then
-                break
-            end
+    local function addHover(def)
+        if defMark[def] then
+            return
         end
-    end
-    return {
-        label       = label,
-        source      = source,
-        description = desc,
-    }
-end
+        defMark[def] = true
 
-local function getHoverAsFunction(source)
-    local values = vm.getDefs(source)
-    local desc   = getDesc(source)
-    local labels = {}
-    local defs = 0
-    local protos = 0
-    local other = 0
-    local mark = {}
-    for _, def in ipairs(values) do
-        def = searcher.getObjectValue(def) or def
-        if def.type == 'function'
-        or def.type == 'doc.type.function' then
-            eachFunctionAndOverload(def, function (value)
-                if mark[value] then
-                    return
-                end
-                mark[value] =true
-                local label = getLabel(value)
-                if label then
-                    defs = defs + 1
-                    labels[label] = (labels[label] or 0) + 1
-                    if labels[label] == 1 then
-                        protos = protos + 1
-                    end
-                end
-                desc = desc or getDesc(value)
-            end)
-        elseif def.type == 'table'
-        or     def.type == 'boolean'
-        or     def.type == 'string'
-        or     def.type == 'integer'
-        or     def.type == 'number' then
-            other = other + 1
-            desc = desc or getDesc(def)
-        end
-    end
+        local label = getLabel(def)
+        local desc  = getDesc(def)
 
-    if defs == 0 then
-        return getHoverAsValue(source)
-    end
+        if not labelMark[tostring(label)] then
+            labelMark[tostring(label)] = true
+            md:add('lua', label)
+            md:splitLine()
+        end
 
-    if defs == 1 and other == 0 then
-        return {
-            label       = next(labels),
-            source      = source,
-            description = desc,
-        }
+        if not descMark[tostring(desc)] then
+            descMark[tostring(desc)] = true
+            md:add('md', desc)
+            md:splitLine()
+        end
     end
 
-    local lines = {}
-    if defs > 1 then
-        lines[#lines+1] = lang.script('HOVER_MULTI_DEF_PROTO', defs, protos)
-    end
-    if other > 0 then
-        lines[#lines+1] = lang.script('HOVER_MULTI_PROTO_NOT_FUNC', other)
-    end
-    if defs > 1 then
-        for label, count in util.sortPairs(labels) do
-            lines[#lines+1] = ('(%d) %s'):format(count, label)
+    if infer.searchAndViewInfers(source) == 'function' then
+        for _, def in ipairs(vm.getDefs(source)) do
+            if def.type == 'function'
+            or def.type == 'doc.type.function' then
+                addHover(def)
+            end
         end
     else
-        lines[#lines+1] = next(labels)
-    end
-    local label = table.concat(lines, '\n')
-    return {
-        label       = label,
-        source      = source,
-        description = desc,
-    }
-end
-
-local function getHoverAsDocName(source)
-    local label = getLabel(source)
-    local desc  = getDesc(source)
-    return {
-        label       = label,
-        source      = source,
-        description = desc,
-    }
-end
-
-local function isFunction(source)
-    local defs = vm.getAllDefs(source)
-    for _, def in ipairs(defs) do
-        if def.type == 'function' then
-            return true
+        addHover(source)
+        for _, def in ipairs(vm.getDefs(source)) do
+            addHover(def)
         end
     end
-    return false
-end
 
-local function getHover(source)
-    if source.type == 'doc.type.name' then
-        return getHoverAsDocName(source)
-    end
-    if isFunction(source) then
-        return getHoverAsFunction(source)
-    else
-        return getHoverAsValue(source)
-    end
+    return md
 end
 
 local accept = {
@@ -168,14 +78,12 @@ local function getHoverByUri(uri, offset)
     end
     local hover = getHover(source)
     if SHOWSOURCE then
-        hover.description = ('%s\n---\n\n```lua\n%s\n```'):format(
-            hover.description or '',
-            util.dump(source, {
-                deep = 1,
-            })
-        )
+        hover:splitLine()
+        hover:add('lua', util.dump(source, {
+            deep = 1,
+        }))
     end
-    return hover
+    return hover, source
 end
 
 return {