Improve outline hierarchy

By providing the container name and changing the symbols ranges to contain the entire nodes ranges not just the name of the symbol. The last part has the unfortunate consequence that when you go to a definition it will no longer go to the exact word but instead the line where the symbol is defined.

Author: mads-hartmann

server/src/analyser.ts

@@ -190,12 +190,21 @@ export default class Analyzer {
  const name = contents.slice(named.startIndex, named.endIndex)
  const namedDeclarations = this.uriToDeclarations[uri][name] || []
 
+ const parent = TreeSitterUtil.findParent(n, p => p.type === 'function_definition')
+ const parentName = parent
+ ? contents.slice(
+ parent.firstNamedChild.startIndex,
+ parent.firstNamedChild.endIndex,
+ )
+ : null
+
  namedDeclarations.push(
  LSP.SymbolInformation.create(
  name,
  this.treeSitterTypeToLSPKind[n.type],
- TreeSitterUtil.range(named),
+ TreeSitterUtil.range(n),
  uri,
+ parentName,
  ),
  )
  this.uriToDeclarations[uri][name] = namedDeclarations

server/src/util/tree-sitter.ts

@@ -40,3 +40,17 @@ export function isReference(n: ASTNode): boolean {
  return false
  }
 }
+
+export function findParent(
+ start: ASTNode,
+ predicate: (n: ASTNode) => boolean,
+): ASTNode | null {
+ let node = start.parent
+ while (node !== null) {
+ if (predicate(node)) {
+ return node
+ }
+ node = node.parent
+ }
+ return null
+}