Fallback from LSIF to others (#290)

Author: chrismwendt

package.json

@@ -211,7 +211,7 @@
     "yarn-deduplicate": "^1.1.1"
   },
   "dependencies": {
-    "@sourcegraph/basic-code-intel": "^7.0.9",
+    "@sourcegraph/basic-code-intel": "^7.0.10",
     "@sourcegraph/lightstep-tracer-webworker": "^0.20.14-fork.3",
     "@sourcegraph/typescript-language-server": "^0.3.7-fork",
     "@sourcegraph/vscode-ws-jsonrpc": "0.0.3-fork",

src/extension/extension.ts

@@ -513,9 +513,11 @@ export async function activate(ctx: sourcegraph.ExtensionContext): Promise<void>
                     logger.log('Hover trace', span.generateTraceURL())
                 }
 
-                if (await isLSIFAvailable(textDocument)) {
-                    const lsifResult = await lsif.hover(textDocument, position)
-                    yield lsifResult && lsifResult.value
+                const lsifResult = (await isLSIFAvailable(textDocument))
+                    ? await lsif.hover(textDocument, position)
+                    : undefined
+                if (lsifResult) {
+                    yield lsifResult.value
                 } else if (!config.value['typescript.serverUrl']) {
                     yield await basicCodeIntel.hover(textDocument, position)
                 } else {
@@ -560,9 +562,11 @@ export async function activate(ctx: sourcegraph.ExtensionContext): Promise<void>
                         logger.log('Definition trace', span.generateTraceURL())
                     }
 
-                    if (await isLSIFAvailable(textDocument)) {
-                        const lsifResult = await lsif.definition(textDocument, position)
-                        yield lsifResult ? lsifResult.value : null
+                    const lsifResult = (await isLSIFAvailable(textDocument))
+                        ? await lsif.definition(textDocument, position)
+                        : undefined
+                    if (lsifResult) {
+                        yield lsifResult.value
                     } else if (!config.value['typescript.serverUrl']) {
                         yield await basicCodeIntel.definition(textDocument, position)
                     } else {
@@ -609,11 +613,10 @@ export async function activate(ctx: sourcegraph.ExtensionContext): Promise<void>
                     logger.log('References trace', span.generateTraceURL())
                 }
 
-                if (await isLSIFAvailable(textDocument)) {
-                    const lsifResult = await lsif.references(textDocument, position)
-                    yield (lsifResult && lsifResult.value) || []
-                } else if (!config.value['typescript.serverUrl']) {
-                    yield (await basicCodeIntel.references(textDocument, position)) || []
+                if (!config.value['typescript.serverUrl']) {
+                    const lsifReferences = await lsif.references(textDocument, position)
+                    const fuzzyReferences = (await basicCodeIntel.references(textDocument, position)) || []
+                    yield [...(lsifReferences === undefined ? [] : lsifReferences.value), ...fuzzyReferences]
                 } else {
                     const textDocumentUri = new URL(textDocument.uri)
                     const serverRootUri = resolveServerRootUri(textDocumentUri, serverSgEndpoint)

yarn.lock

@@ -801,10 +801,10 @@
   resolved "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd"
   integrity sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==
 
-"@sourcegraph/basic-code-intel@^7.0.9":
-  version "7.0.9"
-  resolved "https://registry.npmjs.org/@sourcegraph/basic-code-intel/-/basic-code-intel-7.0.9.tgz#b137eac5fce738eaa739422d2c3d67ccc6a890e0"
-  integrity sha512-z/grKdwm33Zxf+UXgnbnHtE5dhTk53UFyTAQhNPzvAzCYhLbLEcjN6YxH2M3f4tmXH/XIwXzhS0VlkliBXqkeg==
+"@sourcegraph/basic-code-intel@^7.0.10":
+  version "7.0.10"
+  resolved "https://registry.npmjs.org/@sourcegraph/basic-code-intel/-/basic-code-intel-7.0.10.tgz#26d1af33f48075199e4ec0ca1cb53d64bdcb162f"
+  integrity sha512-lZNd90AJFRJIQM2V8tzxzVlXPRQMrdIJ81T8vzGKXPwRjkT+Qr4mCqoRJKERL6J3OOcb9ElfQ3KwzSNvawwL2g==
   dependencies:
     lodash "^4.17.11"
     rxjs "^6.3.3"