improve document-symbol

Author: sumneko

script/core/document-symbol.lua

@@ -199,28 +199,57 @@ local function buildValue(source, sub, used, symbols)
     }
 end
 
-local function buildAnonymousFunction(source, sub, used, symbols)
+local function buildAnonymous(source, sub, used, symbols)
     if used[source] then
         return
     end
     used[source] = true
     local head = ''
     local parent = source.parent
     if     parent.type == 'return' then
-        head = 'return '
+        head = 'return'
     elseif parent.type == 'callargs' then
         local call = parent.parent
         local node = call.node
-        head = buildName(node, sub) .. ' -> '
+        head = buildName(node, sub) .. ' ->'
+    end
+    if source.type == 'function' then
+        symbols[#symbols+1] = {
+            name           = head,
+            detail         = ('function (%s)'):format(buildFunctionParams(source)),
+            kind           = define.SymbolKind.Function,
+            range          = { source.start, source.finish },
+            selectionRange = { source.keyword[1], source.keyword[2] },
+            valueRange     = { source.start, source.finish },
+        }
+    elseif source.type == 'table' then
+        local kind      = define.SymbolKind.Object
+        local details   = {}
+        local lastField = source[#source]
+        if lastField then
+            if  lastField.type == 'tableexp'
+            and lastField.tindex == #source then
+                -- Array
+                kind = define.SymbolKind.Array
+                details[#details+1] = '['
+                details[#details+1] = buildArray(source, sub)
+                details[#details+1] = ']'
+            else
+                -- Object
+                details[#details+1] = '{'
+                details[#details+1] = buildTable(source, sub)
+                details[#details+1] = '}'
+            end
+        end
+        symbols[#symbols+1] = {
+            name           = head,
+            detail         = table.concat(details),
+            kind           = kind,
+            range          = { source.start, source.finish },
+            selectionRange = { source.start, source.finish },
+            valueRange     = { source.start, source.finish },
+        }
     end
-    symbols[#symbols+1] = {
-        name           = '',
-        detail         = ('%sfunction (%s)'):format(head, buildFunctionParams(source)),
-        kind           = define.SymbolKind.Function,
-        range          = { source.start, source.finish },
-        selectionRange = { source.keyword[1], source.keyword[2] },
-        valueRange     = { source.start, source.finish },
-    }
 end
 
 local function buildBlock(source, sub, used, symbols)
@@ -280,8 +309,9 @@ local function buildSource(source, sub, used, symbols)
     or     source.type == 'tableexp'
     or     source.type == 'tableindex' then
         buildValue(source, sub, used, symbols)
-    elseif source.type == 'function' then
-        buildAnonymousFunction(source, sub, used, symbols)
+    elseif source.type == 'function'
+    or     source.type == 'table' then
+        buildAnonymous(source, sub, used, symbols)
     elseif source.type == 'if'
     or     source.type == 'while'
     or     source.type == 'in'

script/provider/provider.lua

@@ -785,7 +785,7 @@ m.register 'textDocument/documentSymbol' {
                 symbol.selectionRange[2]
             )
             if symbol.name == '' then
-                symbol.name = lang.script.SYMBOL_ANONYMOUS
+                symbol.name = ' '
             end
             symbol.valueRange = nil
             if symbol.children then

test/document_symbol/init.lua

@@ -105,8 +105,8 @@ end
 ]]
 {
     [1] = {
-        name = '',
-        detail = 'return function ()',
+        name = 'return',
+        detail = 'function ()',
         kind = define.SymbolKind.Function,
         range = {7, 10003},
         selectionRange = {7, 15},
@@ -565,11 +565,21 @@ local t = f({
         valueRange = {10, 20002},
         children = {
             [1] = {
-                name = 'k',
-                detail = '1',
-                kind = define.SymbolKind.Number,
-                range = {10004, 10009},
-                selectionRange = {10004, 10005},
+                name = 'f ->',
+                detail = '{k}',
+                kind = define.SymbolKind.Object,
+                range = {12, 20001},
+                selectionRange = {12, 20001},
+                valueRange = {12, 20001},
+                children = {
+                    [1] = {
+                        name = 'k',
+                        detail = '1',
+                        kind = define.SymbolKind.Number,
+                        range = {10004, 10009},
+                        selectionRange = {10004, 10005},
+                    }
+                }
             }
         }
     }
@@ -632,12 +642,22 @@ local a = f {
         valueRange = {10, 30001},
         children = {
             [1] = {
-                name = 'x',
-                detail = 'function ()',
-                kind = define.SymbolKind.Function,
-                range = {10004, 20007},
-                selectionRange = {10004, 10005},
-                valueRange = {10008, 20007},
+                name = 'f ->',
+                detail = '{x}',
+                kind = define.SymbolKind.Object,
+                range = {12, 30001},
+                selectionRange = {12, 30001},
+                valueRange = {12, 30001},
+                children = {
+                    [1] = {
+                        name = 'x',
+                        detail = 'function ()',
+                        kind = define.SymbolKind.Function,
+                        range = {10004, 20007},
+                        selectionRange = {10004, 10005},
+                        valueRange = {10008, 20007},
+                    }
+                }
             }
         }
     }
@@ -650,8 +670,8 @@ end)
 ]]
 {
     [1] = {
-        name = '',
-        detail = 'table.sort -> function (a, b)',
+        name = 'table.sort ->',
+        detail = 'function (a, b)',
         kind = define.SymbolKind.Function,
         range = {14, 20003},
         selectionRange = {14, 22},