python.languageServer.url -> python.serverUrl

python.sourcegraph.url -> python.sourcegraphUrl

Author: Beyang Liu

README.md

@@ -31,11 +31,11 @@ Docker image `sourcegraph/lang-python` from Docker Hub.
 1. Add these to your Sourcegraph settings:
 
     ```json
-      "python.languageServer.url": "ws://localhost:4288",
-      "python.sourcegraph.url": "http://host.docker.internal:7080",
+      "python.serverUrl": "ws://localhost:4288",
+      "python.sourcegraphUrl": "http://host.docker.internal:7080",
     ```
 
-    If you're running on Linux, change `python.sourcegraph.url` to the IP given by:
+    If you're running on Linux, change `python.sourcegraphUrl` to the IP given by:
 
     ```bash
     ip addr show docker0 | grep -Po 'inet \K[\d.]+'

package.json

@@ -20,7 +20,7 @@
     "configuration": {
       "title": "Python settings",
       "properties": {
-        "python.languageServer.url": {
+        "python.serverUrl": {
           "description": "The URL to the Python language server (which is an instance of https://github.com/sourcegraph/python-language-server).",
           "type": "string",
           "format": "uri",

src/settings.ts

@@ -1,6 +1,6 @@
 interface Settings {
-    ['python.languageServer.url']?: string
+    ['python.serverUrl']?: string
     ['python.accessToken']?: string
-    ['python.sourcegraph.url']?: string
+    ['python.sourcegraphUrl']?: string
     ['python.traceLogging']?: boolean
 }

src/sourcegraph-python.ts

@@ -34,15 +34,15 @@ const DUMMY_CTX = { subscriptions: { add: (_unsubscribable: any) => void 0 } }
 
 export function activate(ctx: sourcegraph.ExtensionContext = DUMMY_CTX): void {
     const languageServerUrl = sourcegraph.configuration.get<Settings>().value[
-        'python.languageServer.url'
+        'python.serverUrl'
     ]
     if (!languageServerUrl) {
         if (sourcegraph.app.activeWindow) {
             const docURL = `${sourcegraph.internal.sourcegraphURL
                 .toString()
                 .replace(/\/$/, '')}/extensions/sourcegraph/python`
             sourcegraph.app.activeWindow.showNotification(
-                'Configure `python.languageServer.url` in user settings for Python code intelligence.\n\n[Documentation](' +
+                'Configure `python.serverUrl` in user settings for Python code intelligence.\n\n[Documentation](' +
                     docURL +
                     ')'
             )
@@ -67,7 +67,7 @@ export function activate(ctx: sourcegraph.ExtensionContext = DUMMY_CTX): void {
 
                 const settings = sourcegraph.configuration.get<Settings>().value
                 const zipUrl = new URL(
-                    settings['python.sourcegraph.url'] ||
+                    settings['python.sourcegraphUrl'] ||
                         sourcegraph.internal.sourcegraphURL.toString()
                 )
                 const accessToken = await getOrTryToCreateAccessToken()