Make symbol completions unique

Author: skovhus

server/src/__tests__/__snapshots__/analyzer.test.ts.snap

@@ -107,6 +107,139 @@ Array [
 ]
 `;
 
+exports[`findSymbolCompletions return a list of symbols 1`] = `
+Array [
+  Object {
+    "data": Object {
+      "name": "ret",
+      "type": "function",
+    },
+    "kind": undefined,
+    "label": "ret",
+  },
+  Object {
+    "data": Object {
+      "name": "configures",
+      "type": "function",
+    },
+    "kind": undefined,
+    "label": "configures",
+  },
+  Object {
+    "data": Object {
+      "name": "npm_config_loglevel",
+      "type": "function",
+    },
+    "kind": undefined,
+    "label": "npm_config_loglevel",
+  },
+  Object {
+    "data": Object {
+      "name": "node",
+      "type": "function",
+    },
+    "kind": undefined,
+    "label": "node",
+  },
+  Object {
+    "data": Object {
+      "name": "TMP",
+      "type": "function",
+    },
+    "kind": undefined,
+    "label": "TMP",
+  },
+  Object {
+    "data": Object {
+      "name": "BACK",
+      "type": "function",
+    },
+    "kind": undefined,
+    "label": "BACK",
+  },
+  Object {
+    "data": Object {
+      "name": "tar",
+      "type": "function",
+    },
+    "kind": undefined,
+    "label": "tar",
+  },
+  Object {
+    "data": Object {
+      "name": "MAKE",
+      "type": "function",
+    },
+    "kind": undefined,
+    "label": "MAKE",
+  },
+  Object {
+    "data": Object {
+      "name": "make",
+      "type": "function",
+    },
+    "kind": undefined,
+    "label": "make",
+  },
+  Object {
+    "data": Object {
+      "name": "clean",
+      "type": "function",
+    },
+    "kind": undefined,
+    "label": "clean",
+  },
+  Object {
+    "data": Object {
+      "name": "node_version",
+      "type": "function",
+    },
+    "kind": undefined,
+    "label": "node_version",
+  },
+  Object {
+    "data": Object {
+      "name": "t",
+      "type": "function",
+    },
+    "kind": undefined,
+    "label": "t",
+  },
+  Object {
+    "data": Object {
+      "name": "url",
+      "type": "function",
+    },
+    "kind": undefined,
+    "label": "url",
+  },
+  Object {
+    "data": Object {
+      "name": "ver",
+      "type": "function",
+    },
+    "kind": undefined,
+    "label": "ver",
+  },
+  Object {
+    "data": Object {
+      "name": "isnpm10",
+      "type": "function",
+    },
+    "kind": undefined,
+    "label": "isnpm10",
+  },
+  Object {
+    "data": Object {
+      "name": "NODE",
+      "type": "function",
+    },
+    "kind": undefined,
+    "label": "NODE",
+  },
+]
+`;
+
 exports[`findSymbols returns a list of SymbolInformation if uri is found 1`] = `
 Array [
   Object {

server/src/__tests__/analyzer.test.ts

@@ -67,3 +67,9 @@ describe('wordAtPoint', () => {
     // expect(analyzer.wordAtPoint(CURRENT_URI, 24, 4)).toEqual('else')
   })
 })
+
+describe('findSymbolCompletions', () => {
+  it('return a list of symbols', () => {
+    expect(analyzer.findSymbolCompletions(CURRENT_URI)).toMatchSnapshot()
+  })
+})

server/src/analyser.ts

@@ -7,6 +7,7 @@ import { Document } from 'tree-sitter'
 import * as bash from 'tree-sitter-bash'
 import * as LSP from 'vscode-languageserver'
 
+import { uniqueBasedOnHash } from './util/array'
 import * as TreeSitterUtil from './util/tree-sitter'
 
 type Kinds = { [type: string]: LSP.SymbolKind }
@@ -137,6 +138,24 @@ export default class Analyzer {
     return ds
   }
 
+  /**
+   * Find unique symbol completions for the given file.
+   */
+  public findSymbolCompletions(uri: string): LSP.CompletionItem[] {
+    const hashFunction = ({ name, kind }) => `${name}${kind}`
+
+    return uniqueBasedOnHash(this.findSymbols(uri), hashFunction).map(
+      (symbol: LSP.SymbolInformation) => ({
+        label: symbol.name,
+        kind: symbol.kind,
+        data: {
+          name: symbol.name,
+          type: 'function',
+        },
+      }),
+    )
+  }
+
   /**
    * Analyze the given document, cache the tree-sitter AST, and iterate over the
    * tree to find declarations.

server/src/server.ts

@@ -146,18 +146,7 @@ export default class BashServer {
     this.connection.console.log(
       `Asked for completions at ${pos.position.line}:${pos.position.character}`,
     )
-    const symbols = this.analyzer.findSymbols(pos.textDocument.uri)
-
-    const symbolCompletions = symbols.map((s: LSP.SymbolInformation) => {
-      return {
-        label: s.name,
-        kind: s.kind,
-        data: {
-          name: s.name,
-          type: 'function',
-        },
-      }
-    })
+    const symbolCompletions = this.analyzer.findSymbolCompletions(pos.textDocument.uri)
 
     const programCompletions = this.executables.list().map((s: string) => {
       return {

server/src/util/array.ts

@@ -12,3 +12,20 @@ export function flatten<A>(xs: A[][]): A[] {
 export function uniq<A>(a: A[]): A[] {
   return Array.from(new Set(a))
 }
+
+/**
+ * Removed all duplicates from the list based on the hash function.
+ */
+export function uniqueBasedOnHash<A>(list: A[], elementToHash: (a: A) => string): A[] {
+  const hashSet = new Set()
+
+  return list.reduce((accumulator, currentValue) => {
+    const hash = elementToHash(currentValue)
+    if (hashSet.has(hash)) {
+      return accumulator
+    }
+    hashSet.add(hash)
+
+    return [...accumulator, currentValue]
+  }, [])
+}