wip on lsp-client (must yarn link @sourcegraph/lsp-client with changes from sourcegraph/lsp-client#11

chrismwendt · chrismwendt · commit 94d914d8801b · 2019-05-14T10:58:01.000-07:00
diff --git a/package.json b/package.json
@@ -153,6 +153,7 @@
   },
   "dependencies": {
     "@sourcegraph/basic-code-intel": "6.0.16",
+    "@sourcegraph/lsp-client": "^2.0.0-beta.1",
     "@sourcegraph/vscode-ws-jsonrpc": "0.0.3-fork",
     "prettier": "^1.16.4",
     "rxjs": "^6.3.3",
diff --git a/src/lang-go.ts b/src/lang-go.ts
@@ -1,3 +1,4 @@
+import * as lspClient from '@sourcegraph/lsp-client'
 import '@babel/polyfill'
 
 import { activateBasicCodeIntel, registerFeedbackButton } from '@sourcegraph/basic-code-intel'
@@ -26,6 +27,7 @@ import {
 import { ConsoleLogger, createWebSocketConnection } from '@sourcegraph/vscode-ws-jsonrpc'
 import gql from 'tagged-template-noop'
 import { Settings } from './settings'
+import { TextDocument } from 'sourcegraph'
 
 // If we can rid ourselves of file:// URIs, this type won't be necessary and we
 // can use lspext.Xreference directly.
@@ -739,11 +741,43 @@ const DUMMY_CTX = { subscriptions: { add: (_unsubscribable: any) => void 0 } }
 
 export function activate(ctx: sourcegraph.ExtensionContext = DUMMY_CTX): void {
     async function afterActivate(): Promise<void> {
-        const address = sourcegraph.configuration.get<Settings>().get('go.serverUrl')
-        if (address) {
-            ctx.subscriptions.add(registerFeedbackButton({ languageID: 'go', sourcegraph, isPrecise: true }))
+        if (Math.random() < 0) {
+            const address = sourcegraph.configuration.get<Settings>().get('go.serverUrl')
+            if (address) {
+                ctx.subscriptions.add(registerFeedbackButton({ languageID: 'go', sourcegraph, isPrecise: true }))
+                await activateUsingWebSockets(ctx)
+            } else {
+                activateBasicCodeIntel({
+                    sourcegraph,
+                    languageID: 'go',
+                    fileExts: ['go'],
+                    filterDefinitions: ({ repo, filePath, pos, fileContent, results }) => {
+                        const currentFileImportedPaths = fileContent
+                            .split('\n')
+                            .map(line => {
+                                // Matches the import at index 3
+                                const match = /^(import |\t)(\w+ |\. )?"(.*)"$/.exec(line)
+                                return match ? match[3] : undefined
+                            })
+                            .filter((x): x is string => Boolean(x))
+
+                        const currentFileImportPath = repo + '/' + path.dirname(filePath)
+
+                        const filteredResults = results.filter(result => {
+                            const resultImportPath = result.repo + '/' + path.dirname(result.file)
+                            return (
+                                currentFileImportedPaths.some(i => resultImportPath.includes(i)) ||
+                                resultImportPath === currentFileImportPath
+                            )
+                        })
 
-            await activateUsingWebSockets(ctx)
+                        return filteredResults.length === 0 ? results : filteredResults
+                    },
+                    commentStyle: {
+                        lineRegex: /\/\/\s?/,
+                    },
+                })(ctx)
+            }
         } else {
             ctx.subscriptions.add(
                 registerFeedbackButton({
@@ -753,36 +787,45 @@ export function activate(ctx: sourcegraph.ExtensionContext = DUMMY_CTX): void {
                 })
             )
 
-            activateBasicCodeIntel({
-                sourcegraph,
-                languageID: 'go',
-                fileExts: ['go'],
-                filterDefinitions: ({ repo, filePath, pos, fileContent, results }) => {
-                    const currentFileImportedPaths = fileContent
-                        .split('\n')
-                        .map(line => {
-                            // Matches the import at index 3
-                            const match = /^(import |\t)(\w+ |\. )?"(.*)"$/.exec(line)
-                            return match ? match[3] : undefined
-                        })
-                        .filter((x): x is string => Boolean(x))
-
-                    const currentFileImportPath = repo + '/' + path.dirname(filePath)
-
-                    const filteredResults = results.filter(result => {
-                        const resultImportPath = result.repo + '/' + path.dirname(result.file)
-                        return (
-                            currentFileImportedPaths.some(i => resultImportPath.includes(i)) ||
-                            resultImportPath === currentFileImportPath
-                        )
+            const token = await getOrTryToCreateAccessToken()
+            if (!token) {
+                // console.log('No token')
+            } else {
+                // tslint:disable-next-line: no-empty
+                const noop = () => {}
+
+                const serverURL = sourcegraph.configuration.get<Settings>().value['go.serverUrl']
+                if (serverURL) {
+                    const client = await lspClient.register({
+                        sourcegraph,
+                        transport: lspClient.webSocketTransport({
+                            serverUrl: serverURL,
+                            logger: {
+                                error: noop,
+                                warn: noop,
+                                info: noop,
+                                log: noop,
+                            },
+                        }),
+                        documentSelector: [{ language: 'go' }],
+                        // clientToServerURI: uri => ..., // optional
+                        // serverToClientURI: uri => ..., // optional
+                        initializationOptions: (url: URL) => {
+                            url.hash = ''
+                            return {
+                                zipURL: constructZipURL({
+                                    repoName: pathname(url.href).replace(/^\/+/, ''),
+                                    revision: url.search.substr(1),
+                                    token,
+                                }),
+                            }
+                        },
                     })
-
-                    return filteredResults.length === 0 ? results : filteredResults
-                },
-                commentStyle: {
-                    lineRegex: /\/\/\s?/,
-                },
-            })(ctx)
+                    ctx.subscriptions.add(client)
+                } else {
+                    // console.log('No go.serverUrl set')
+                }
+            }
         }
     }
     setTimeout(afterActivate, 100)
diff --git a/yarn.lock b/yarn.lock
@@ -714,6 +714,20 @@
   resolved "https://registry.yarnpkg.com/@sourcegraph/prettierrc/-/prettierrc-3.0.0.tgz#716b64b287565f98f539f76bea206912ab4d03b3"
   integrity sha512-ziLujsC3IESHGYdtiJ7yVjte9i7mr6jKWTYtCVqgOWeY1Er0/xsQ/sdZIyK61tD282wvd7VjS4pk5RoGEN7biw==
 
+"@sourcegraph/lsp-client@^2.0.0-beta.1":
+  version "2.0.0-beta.1"
+  resolved "https://registry.yarnpkg.com/@sourcegraph/lsp-client/-/lsp-client-2.0.0-beta.1.tgz#d231d8caba53a1ff70de20f7b442c2ea439d3b37"
+  integrity sha512-hho0weMoCxKk96hYkj4re7B6JxY+NccfUm2pgv0+YUKBDWRijqO8sqlgOsN8tl+H1s7UjvE7xw//cENI1N+NGA==
+  dependencies:
+    "@sourcegraph/vscode-ws-jsonrpc" "^0.0.3-fork"
+    lodash "^4.17.11"
+    rxjs "^6.4.0"
+    sourcegraph "^22.0.0"
+    type-zoo "^3.2.1"
+    uuid "^3.3.2"
+    vscode-languageserver-protocol "^3.14.1"
+    vscode-languageserver-types "^3.14.0"
+
 "@sourcegraph/tsconfig@^4.0.0":
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/@sourcegraph/tsconfig/-/tsconfig-4.0.0.tgz#dd2a406f90760bb789fd89fde4bd0a8d681f2767"
@@ -728,7 +742,7 @@
     tslint-config-prettier "^1.6.0"
     tslint-react "^3.2.0"
 
-"@sourcegraph/vscode-ws-jsonrpc@0.0.3-fork":
+"@sourcegraph/vscode-ws-jsonrpc@0.0.3-fork", "@sourcegraph/vscode-ws-jsonrpc@^0.0.3-fork":
   version "0.0.3-fork"
   resolved "https://registry.yarnpkg.com/@sourcegraph/vscode-ws-jsonrpc/-/vscode-ws-jsonrpc-0.0.3-fork.tgz#83728a14616ef0587298e7849d960b61853a9954"
   integrity sha512-EJLq/ni66glk3xYyOZtUIEbjTCw8kMI6RvO0YQtPd+4um2+aTSM1LfN4NrsiVrRkG7EG/U2OkFlKqT8mGo6w4Q==
@@ -4834,7 +4848,7 @@ rxjs-tslint-rules@^4.12.0:
     tslib "^1.8.0"
     tsutils "^3.0.0"
 
-rxjs@^6.3.3:
+rxjs@^6.3.3, rxjs@^6.4.0:
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.4.0.tgz#f3bb0fe7bda7fb69deac0c16f17b50b0b8790504"
   integrity sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==
@@ -5066,6 +5080,11 @@ source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6:
   dependencies:
     vscode-languageserver-types "^3.12.0"
 
+sourcegraph@^22.0.0:
+  version "22.0.0"
+  resolved "https://registry.yarnpkg.com/sourcegraph/-/sourcegraph-22.0.0.tgz#b259929c31bf367f5160056698a881dc26eb36bd"
+  integrity sha512-cJHby0OPCM0y0BmRTKhY89D02f9koROluHMJGQGNE8q9CoIVbe1s6ctHCytz7bjY9mKtCpQMbtxYQhfIm5S4lg==
+
 sourcegraph@^23.0.0:
   version "23.0.0"
   resolved "https://registry.yarnpkg.com/sourcegraph/-/sourcegraph-23.0.0.tgz#1fb96015af3e84cc9cc2944823f04a7e952ed565"
@@ -5482,6 +5501,11 @@ type-check@~0.3.2:
   dependencies:
     prelude-ls "~1.1.2"
 
+type-zoo@^3.2.1:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/type-zoo/-/type-zoo-3.3.0.tgz#d5b59393b09a48ac30380c50e2369e828817e9b3"
+  integrity sha512-ID2kIg4QMbujPOpphFvSl7yyk0JaN2+5m2cprhxpzJqYWHhozLbYOHCAZqq7j1PPfzLe8XrYeZfPb99v96WVRw==
+
 typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
@@ -5599,6 +5623,11 @@ util@0.10.3, util@^0.10.3:
   dependencies:
     inherits "2.0.1"
 
+uuid@^3.3.2:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
+  integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
+
 v8-compile-cache@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.2.tgz#a428b28bb26790734c4fc8bc9fa106fccebf6a6c"
@@ -5642,7 +5671,7 @@ vscode-languageserver-protocol@^3.14.1:
     vscode-jsonrpc "^4.0.0"
     vscode-languageserver-types "3.14.0"
 
-vscode-languageserver-types@3.14.0, vscode-languageserver-types@^3.12.0:
+vscode-languageserver-types@3.14.0, vscode-languageserver-types@^3.12.0, vscode-languageserver-types@^3.14.0:
   version "3.14.0"
   resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.14.0.tgz#d3b5952246d30e5241592b6dde8280e03942e743"
   integrity sha512-lTmS6AlAlMHOvPQemVwo3CezxBp0sNB95KNPkqp3Nxd5VFEnuG1ByM0zlRWos0zjO3ZWtkvhal0COgiV1xIA4A==
