Add badges. (#116)

Author: efritz

package.json

@@ -157,7 +157,7 @@
     "typescript": "^3.1.6"
   },
   "dependencies": {
-    "@sourcegraph/basic-code-intel": "9.0.0",
+    "@sourcegraph/basic-code-intel": "10.0.0",
     "@sourcegraph/lsp-client": "^2.0.0-beta.2",
     "@sourcegraph/vscode-ws-jsonrpc": "0.0.3-fork",
     "prettier": "^1.16.4",

src/lang-go.ts

@@ -1,6 +1,6 @@
 import '@babel/polyfill'
 
-import { Handler, initLSIF, asyncFirst, wrapMaybe, Maybe } from '@sourcegraph/basic-code-intel'
+import { Handler, initLSIF, asyncFirst, wrapMaybe, Maybe, impreciseBadge } from '@sourcegraph/basic-code-intel'
 import { convertHover } from '@sourcegraph/lsp-client/dist/lsp-conversion'
 import * as wsrpc from '@sourcegraph/vscode-ws-jsonrpc'
 import { ajax } from 'rxjs/ajax'
@@ -817,15 +817,50 @@ export function activate(ctx: sourcegraph.ExtensionContext = DUMMY_CTX): void {
 
         ctx.subscriptions.add(
             sourcegraph.languages.registerHoverProvider(goFiles, {
-                provideHover: asyncFirst([lsif.hover, lsp.hover, wrapMaybe(basicCodeIntel.hover)], null),
+                provideHover: async (doc, pos) => {
+                    const lsifResult = await lsif.hover(doc, pos)
+                    if (lsifResult) {
+                        return lsifResult.value
+                    }
+
+                    const lspResult = await lsp.hover(doc, pos)
+                    if (lspResult) {
+                        return lspResult.value
+                    }
+
+                    const val = await basicCodeIntel.hover(doc, pos)
+                    if (!val) {
+                        return undefined
+                    }
+
+                    return { ...val, badge: impreciseBadge }
+                },
             })
         )
         ctx.subscriptions.add(
             sourcegraph.languages.registerDefinitionProvider(goFiles, {
-                provideDefinition: asyncFirst(
-                    [lsif.definition, lsp.definition, wrapMaybe(basicCodeIntel.definition)],
-                    null
-                ),
+                provideDefinition: async (doc, pos) => {
+                    const lsifResult = await lsif.definition(doc, pos)
+                    if (lsifResult) {
+                        return lsifResult.value
+                    }
+
+                    const lspResult = await lsp.definition(doc, pos)
+                    if (lspResult) {
+                        return lspResult.value
+                    }
+
+                    const val = await basicCodeIntel.definition(doc, pos)
+                    if (!val) {
+                        return undefined
+                    }
+
+                    if (Array.isArray(val)) {
+                        return val.map(v => ({ ...v, badge: impreciseBadge }))
+                    }
+
+                    return { ...val, badge: impreciseBadge }
+                },
             })
         )
         ctx.subscriptions.add(
@@ -850,7 +885,12 @@ export function activate(ctx: sourcegraph.ExtensionContext = DUMMY_CTX): void {
                     return [
                         ...(lsifReferences === undefined ? [] : lsifReferences.value),
                         // Drop fuzzy references from files that have LSIF results.
-                        ...fuzzyReferences.filter(fuzzyRef => !lsifFiles.has(file(fuzzyRef))),
+                        ...fuzzyReferences
+                            .filter(fuzzyRef => !lsifFiles.has(file(fuzzyRef)))
+                            .map(v => ({
+                                ...v,
+                                badge: impreciseBadge,
+                            })),
                     ]
                 },
             })

yarn.lock

@@ -700,10 +700,10 @@
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd"
   integrity sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==
 
-"@sourcegraph/basic-code-intel@9.0.0":
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/@sourcegraph/basic-code-intel/-/basic-code-intel-9.0.0.tgz#fb750d8b02a4dcb6eb1dab123ea547c3c8897203"
-  integrity sha512-HChZ2dOlG2teKWwnTG72zZcK7eXpndCzp/z0nM+UmDgtUG7xAoO68xt1NMmko2mkD/aTqlya4ni9D9jMEN5oAA==
+"@sourcegraph/basic-code-intel@10.0.0":
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/@sourcegraph/basic-code-intel/-/basic-code-intel-10.0.0.tgz#b505f9c8dd2cd63b0bd98b3fd8ad4c7813464c65"
+  integrity sha512-ZYFv3zMEOQK3LlSr5McevXWMbBZsuOLT3JWrr1T4bCZ4prQ3A5yvyIinsDWAK5y31obTrb+v0KZJ0i8ly7HbAg==
   dependencies:
     lodash "^4.17.11"
     rxjs "^6.3.3"