Do not block LSIF definition/hovers with isLSIFAvailable. (#307)

Author: efritz

src/extension/extension.ts

@@ -6,7 +6,7 @@ import { URL as _URL, URLSearchParams as _URLSearchParams } from 'whatwg-url'
 Object.assign(_URL, self.URL)
 Object.assign(self, { URL: _URL, URLSearchParams: _URLSearchParams })
 
-import { initLSIF, mkIsLSIFAvailable, impreciseBadge } from '@sourcegraph/basic-code-intel'
+import { initLSIF, impreciseBadge } from '@sourcegraph/basic-code-intel'
 import { Tracer as LightstepTracer } from '@sourcegraph/lightstep-tracer-webworker'
 import {
     createMessageConnection,
@@ -120,7 +120,6 @@ export async function activate(ctx: sourcegraph.ExtensionContext): Promise<void>
     const config = new BehaviorSubject(getConfig())
     ctx.subscriptions.add(sourcegraph.configuration.subscribe(() => config.next(getConfig())))
 
-    const isLSIFAvailable = mkIsLSIFAvailable()
     const lsif = initLSIF()
     const basicCodeIntel = initBasicCodeIntel()
 
@@ -468,7 +467,7 @@ export async function activate(ctx: sourcegraph.ExtensionContext): Promise<void>
                         return
                     }
 
-                    if (!(await isLSIFAvailable(textDocument)) && config.value['typescript.serverUrl']) {
+                    if (config.value['typescript.serverUrl']) {
                         const serverRootUri = resolveServerRootUri(textDocumentUri, serverSgEndpoint)
                         const serverTextDocumentUri = toServerTextDocumentUri(textDocumentUri, serverSgEndpoint)
                         const connection = await getOrCreateConnection(serverRootUri, { token, span })
@@ -513,9 +512,7 @@ export async function activate(ctx: sourcegraph.ExtensionContext): Promise<void>
                     logger.log('Hover trace', span.generateTraceURL())
                 }
 
-                const lsifResult = (await isLSIFAvailable(textDocument))
-                    ? await lsif.hover(textDocument, position)
-                    : undefined
+                const lsifResult = await lsif.hover(textDocument, position)
                 if (lsifResult) {
                     yield lsifResult.value
                 } else if (!config.value['typescript.serverUrl']) {
@@ -567,9 +564,7 @@ export async function activate(ctx: sourcegraph.ExtensionContext): Promise<void>
                         logger.log('Definition trace', span.generateTraceURL())
                     }
 
-                    const lsifResult = (await isLSIFAvailable(textDocument))
-                        ? await lsif.definition(textDocument, position)
-                        : undefined
+                    const lsifResult = await lsif.definition(textDocument, position)
                     if (lsifResult) {
                         yield lsifResult.value
                     } else if (!config.value['typescript.serverUrl']) {
@@ -843,10 +838,6 @@ export async function activate(ctx: sourcegraph.ExtensionContext): Promise<void>
                         logger.log('Implementation trace', span.generateTraceURL())
                     }
 
-                    if (await isLSIFAvailable(textDocument)) {
-                        return null
-                    }
-
                     const textDocumentUri = new URL(textDocument.uri)
                     const serverRootUri = resolveServerRootUri(textDocumentUri, serverSgEndpoint)
                     const serverTextDocumentUri = toServerTextDocumentUri(textDocumentUri, serverSgEndpoint)