Use entire workspace for completion symbols

Author: skovhus

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

@@ -126,140 +126,7 @@ Array [
 ]
 `;
 
-exports[`findSymbolCompletions return a list of symbols 1`] = `
-Array [
-  Object {
-    "data": Object {
-      "name": "ret",
-      "type": 3,
-    },
-    "kind": 6,
-    "label": "ret",
-  },
-  Object {
-    "data": Object {
-      "name": "configures",
-      "type": 3,
-    },
-    "kind": 6,
-    "label": "configures",
-  },
-  Object {
-    "data": Object {
-      "name": "npm_config_loglevel",
-      "type": 3,
-    },
-    "kind": 6,
-    "label": "npm_config_loglevel",
-  },
-  Object {
-    "data": Object {
-      "name": "node",
-      "type": 3,
-    },
-    "kind": 6,
-    "label": "node",
-  },
-  Object {
-    "data": Object {
-      "name": "TMP",
-      "type": 3,
-    },
-    "kind": 6,
-    "label": "TMP",
-  },
-  Object {
-    "data": Object {
-      "name": "BACK",
-      "type": 3,
-    },
-    "kind": 6,
-    "label": "BACK",
-  },
-  Object {
-    "data": Object {
-      "name": "tar",
-      "type": 3,
-    },
-    "kind": 6,
-    "label": "tar",
-  },
-  Object {
-    "data": Object {
-      "name": "MAKE",
-      "type": 3,
-    },
-    "kind": 6,
-    "label": "MAKE",
-  },
-  Object {
-    "data": Object {
-      "name": "make",
-      "type": 3,
-    },
-    "kind": 6,
-    "label": "make",
-  },
-  Object {
-    "data": Object {
-      "name": "clean",
-      "type": 3,
-    },
-    "kind": 6,
-    "label": "clean",
-  },
-  Object {
-    "data": Object {
-      "name": "node_version",
-      "type": 3,
-    },
-    "kind": 6,
-    "label": "node_version",
-  },
-  Object {
-    "data": Object {
-      "name": "t",
-      "type": 3,
-    },
-    "kind": 6,
-    "label": "t",
-  },
-  Object {
-    "data": Object {
-      "name": "url",
-      "type": 3,
-    },
-    "kind": 6,
-    "label": "url",
-  },
-  Object {
-    "data": Object {
-      "name": "ver",
-      "type": 3,
-    },
-    "kind": 6,
-    "label": "ver",
-  },
-  Object {
-    "data": Object {
-      "name": "isnpm10",
-      "type": 3,
-    },
-    "kind": 6,
-    "label": "isnpm10",
-  },
-  Object {
-    "data": Object {
-      "name": "NODE",
-      "type": 3,
-    },
-    "kind": 6,
-    "label": "NODE",
-  },
-]
-`;
-
-exports[`findSymbols issue 101 1`] = `
+exports[`findSymbolsForFile issue 101 1`] = `
 Array [
   Object {
     "kind": 12,
@@ -335,7 +202,7 @@ Array [
 ]
 `;
 
-exports[`findSymbols returns a list of SymbolInformation if uri is found 1`] = `
+exports[`findSymbolsForFile returns a list of SymbolInformation if uri is found 1`] = `
 Array [
   Object {
     "kind": 13,

server/src/__tests__/analyzer.test.ts

@@ -61,23 +61,23 @@ describe('findReferences', () => {
   })
 })
 
-describe('findSymbols', () => {
+describe('findSymbolsForFile', () => {
   it('returns empty list if uri is not found', () => {
     analyzer.analyze(CURRENT_URI, FIXTURES.INSTALL)
-    const result = analyzer.findSymbols('foobar.sh')
+    const result = analyzer.findSymbolsForFile({ uri: 'foobar.sh' })
     expect(result).toEqual([])
   })
 
   it('returns a list of SymbolInformation if uri is found', () => {
     analyzer.analyze(CURRENT_URI, FIXTURES.INSTALL)
-    const result = analyzer.findSymbols(CURRENT_URI)
+    const result = analyzer.findSymbolsForFile({ uri: CURRENT_URI })
     expect(result).not.toEqual([])
     expect(result).toMatchSnapshot()
   })
 
   it('issue 101', () => {
     analyzer.analyze(CURRENT_URI, FIXTURES.ISSUE101)
-    const result = analyzer.findSymbols(CURRENT_URI)
+    const result = analyzer.findSymbolsForFile({ uri: CURRENT_URI })
     expect(result).not.toEqual([])
     expect(result).toMatchSnapshot()
   })
@@ -102,9 +102,91 @@ describe('wordAtPoint', () => {
 })
 
 describe('findSymbolCompletions', () => {
-  it('return a list of symbols', () => {
-    analyzer.analyze(CURRENT_URI, FIXTURES.INSTALL)
-    expect(analyzer.findSymbolCompletions(CURRENT_URI)).toMatchSnapshot()
+  it('return a list of symbols across the workspace', () => {
+    analyzer.analyze('install.sh', FIXTURES.INSTALL)
+    analyzer.analyze('sourcing-sh', FIXTURES.SOURCING)
+
+    expect(analyzer.findSymbolsMatchingWord({ word: 'npm_config_logl' }))
+      .toMatchInlineSnapshot(`
+      Array [
+        Object {
+          "kind": 13,
+          "location": Object {
+            "range": Object {
+              "end": Object {
+                "character": 27,
+                "line": 40,
+              },
+              "start": Object {
+                "character": 0,
+                "line": 40,
+              },
+            },
+            "uri": "dummy-uri.sh",
+          },
+          "name": "npm_config_loglevel",
+        },
+        Object {
+          "kind": 13,
+          "location": Object {
+            "range": Object {
+              "end": Object {
+                "character": 31,
+                "line": 48,
+              },
+              "start": Object {
+                "character": 2,
+                "line": 48,
+              },
+            },
+            "uri": "dummy-uri.sh",
+          },
+          "name": "npm_config_loglevel",
+        },
+        Object {
+          "kind": 13,
+          "location": Object {
+            "range": Object {
+              "end": Object {
+                "character": 27,
+                "line": 40,
+              },
+              "start": Object {
+                "character": 0,
+                "line": 40,
+              },
+            },
+            "uri": "install.sh",
+          },
+          "name": "npm_config_loglevel",
+        },
+        Object {
+          "kind": 13,
+          "location": Object {
+            "range": Object {
+              "end": Object {
+                "character": 31,
+                "line": 48,
+              },
+              "start": Object {
+                "character": 2,
+                "line": 48,
+              },
+            },
+            "uri": "install.sh",
+          },
+          "name": "npm_config_loglevel",
+        },
+      ]
+    `)
+
+    expect(analyzer.findSymbolsMatchingWord({ word: 'xxxxxxxx' })).toMatchInlineSnapshot(
+      `Array []`,
+    )
+
+    expect(analyzer.findSymbolsMatchingWord({ word: 'BLU' })).toMatchInlineSnapshot(
+      `Array []`,
+    )
   })
 })
 

server/src/__tests__/server.test.ts

@@ -219,7 +219,7 @@ describe('server', () => {
       {} as any,
     )
 
-    // Limited set
+    // Limited set (not using snapshot due to different executables on CI and locally)
     expect('length' in result && result.length < 5).toBe(true)
     expect(result).toEqual(
       expect.arrayContaining([
@@ -281,4 +281,102 @@ describe('server', () => {
 
     expect(result).toEqual([])
   })
+
+  it('responds to onCompletion when word is found in another file', async () => {
+    const { connection, server } = await initializeServer()
+    server.register(connection)
+
+    const onCompletion = connection.onCompletion.mock.calls[0][0]
+
+    const resultVariable = await onCompletion(
+      {
+        textDocument: {
+          uri: FIXTURE_URI.SOURCING,
+        },
+        position: {
+          // $BLU (variable)
+          line: 6,
+          character: 7,
+        },
+      },
+      {} as any,
+    )
+
+    expect(resultVariable).toMatchInlineSnapshot(`
+      Array [
+        Object {
+          "data": Object {
+            "name": "BLUE",
+            "type": 3,
+          },
+          "documentation": "Variable defined in ../extension.inc",
+          "kind": 6,
+          "label": "BLUE",
+        },
+      ]
+    `)
+
+    const resultFunction = await onCompletion(
+      {
+        textDocument: {
+          uri: FIXTURE_URI.SOURCING,
+        },
+        position: {
+          // add_a_us (function)
+          line: 8,
+          character: 7,
+        },
+      },
+      {} as any,
+    )
+
+    expect(resultFunction).toMatchInlineSnapshot(`
+      Array [
+        Object {
+          "data": Object {
+            "name": "add_a_user",
+            "type": 3,
+          },
+          "documentation": "Function defined in ../issue101.sh",
+          "kind": 3,
+          "label": "add_a_user",
+        },
+      ]
+    `)
+  })
+
+  it('responds to onCompletion with local symbol when word is found in multiple files', async () => {
+    const { connection, server } = await initializeServer()
+    server.register(connection)
+
+    const onCompletion = connection.onCompletion.mock.calls[0][0]
+
+    const result = await onCompletion(
+      {
+        textDocument: {
+          uri: FIXTURE_URI.SOURCING,
+        },
+        position: {
+          // BOL (BOLD is defined in multiple places)
+          line: 12,
+          character: 7,
+        },
+      },
+      {} as any,
+    )
+
+    expect(result).toMatchInlineSnapshot(`
+      Array [
+        Object {
+          "data": Object {
+            "name": "BOLD",
+            "type": 3,
+          },
+          "documentation": undefined,
+          "kind": 6,
+          "label": "BOLD",
+        },
+      ]
+    `)
+  })
 })