refactor: remove old configuration

Author: sqs

src/client/client.integration.test.ts

@@ -32,7 +32,6 @@ describe('Client', () => {
                         try {
                             assert.deepStrictEqual(params, {
                                 capabilities: { experimental: 'test' },
-                                configurationCascade: { merged: {} },
                                 trace: Trace.Off,
                             } as InitializeParams)
                             resolve()

src/client/client.ts

@@ -178,7 +178,6 @@ export class Client implements Unsubscribable {
             capabilities: {
                 experimental: this.options.experimentalClientCapabilities,
             },
-            configurationCascade: { merged: {} },
             trace: this._trace || Trace.Off,
         }
 

src/client/controller.ts

@@ -11,11 +11,10 @@ import {
 import { Trace } from '../protocol/jsonrpc2/trace'
 import { isEqual } from '../util'
 import { Client, ClientOptions } from './client'
-import { applyContextUpdate, EMPTY_CONTEXT } from './context/context'
+import { EMPTY_CONTEXT } from './context/context'
 import { createObservableEnvironment, EMPTY_ENVIRONMENT, Environment, ObservableEnvironment } from './environment'
 import { Extension } from './extension'
 import { ExecuteCommandFeature } from './features/command'
-import { ConfigurationChangeNotificationFeature, ConfigurationUpdateFeature } from './features/configuration'
 import { ContributionFeature } from './features/contribution'
 import {
     TextDocumentDefinitionFeature,
@@ -212,16 +211,6 @@ export class Controller<X extends Extension, C extends ConfigurationCascade> imp
     }
 
     private registerClientFeatures(client: Client, configuration: Observable<C>): void {
-        client.registerFeature(new ConfigurationChangeNotificationFeature<C>(client, configuration))
-        client.registerFeature(
-            new ConfigurationUpdateFeature(
-                client,
-                (params: ConfigurationUpdateParams) =>
-                    new Promise<void>(resolve =>
-                        this._configurationUpdates.next({ ...params, extension: client.id, resolve })
-                    )
-            )
-        )
         client.registerFeature(new ContributionFeature(this.registries.contribution))
         client.registerFeature(new ExecuteCommandFeature(client, this.registries.commands))
         client.registerFeature(new TextDocumentDefinitionFeature(client, this.registries.textDocumentDefinition))

src/client/features/configuration.test.ts

@@ -19,7 +19,6 @@ describe('createExtensionHost', () => {
 
         const initParams: InitializeParams = {
             capabilities: { experimental: { a: 1 } },
-            configurationCascade: { merged: {} },
         }
         const initResult: InitializeResult = {}
 

src/client/features/configuration.ts

@@ -1,23 +1,18 @@
 import { Subscription } from 'rxjs'
-import { InitializeParams, Settings } from '../../protocol'
+import { InitializeParams } from '../../protocol'
 import { Connection } from '../../protocol/jsonrpc2/connection'
 
 /**
  * The Sourcegraph extension API, which extensions use to interact with the client.
  *
  * @template C the extension's settings
  */
-export interface SourcegraphExtensionAPI<C = Settings> {
+export interface SourcegraphExtensionAPI<C = any> {
     /**
      * The params passed by the client in the `initialize` request.
      */
     initializeParams: InitializeParams
 
-    /**
-     * The configuration settings from the client.
-     */
-    configuration: Configuration<C>
-
     /**
      * Command registration and execution.
      */
@@ -64,58 +59,6 @@ export interface Observable<T> {
     [Symbol.observable]?(): any
 }
 
-/**
- * Configuration settings for a specific resource (such as a file, directory, or repository) or subject (such as a
- * user or organization, depending on the client).
- *
- * It may be merged from the following sources of settings, in order:
- *
- * - Default settings
- * - Global settings
- * - Organization settings (for all organizations the user is a member of)
- * - User settings
- * - Client settings
- * - Repository settings
- * - Directory settings
- *
- * @template C configuration type
- */
-export interface Configuration<C> extends Observable<C> {
-    /**
-     * Returns a value from the configuration.
-     *
-     * @template K Valid keys on the configuration object.
-     * @param key The name of the configuration property to get.
-     * @return The configuration value, or undefined.
-     */
-    get<K extends keyof C>(key: K): C[K] | undefined
-
-    /**
-     * Observes changes to the configuration values for the given keys.
-     *
-     * @template K Valid keys on the configuration object.
-     * @param keys The names of the configuration properties to observe.
-     * @return An observable that emits when any of the keys' values change (using deep comparison).
-     */
-    watch<K extends keyof C>(...keys: K[]): Observable<Pick<C, K>>
-
-    /**
-     * Updates the configuration value for the given key. The updated configuration value is sent to the client for
-     * persistence.
-     *
-     * @template K Valid keys on the configuration object.
-     * @param key The name of the configuration property to update.
-     * @param value The new value, or undefined to remove it.
-     * @return A promise that resolves when the client acknowledges the update.
-     */
-    update<K extends keyof C>(key: K, value: C[K] | undefined): Promise<void>
-
-    // TODO: Future plans:
-    //
-    // - add a way to read configuration from a specific scope (aka subject, but "scope" is probably a better word)
-    // - describe how configuration defaults are supported
-}
-
 /**
  * Command registration and execution.
  */

src/extension/extensionHost.test.ts

@@ -18,7 +18,6 @@ describe('activateExtension (old)', () => {
 
         const initParams: InitializeParams = {
             capabilities: {},
-            configurationCascade: { merged: {} },
         }
         const initResult: InitializeResult = {}
 

src/extension/old/api.ts

@@ -1,6 +1,5 @@
 import { Subscription } from 'rxjs'
 import {
-    ConfigurationCascade,
     InitializedNotification,
     InitializeParams,
     InitializeRequest,
@@ -10,23 +9,17 @@ import {
 } from '../../protocol'
 import { Connection, createConnection, Logger, MessageTransports } from '../../protocol/jsonrpc2/connection'
 import { createWebWorkerMessageTransports } from '../../protocol/jsonrpc2/transports/webWorker'
-import { Commands, Configuration, Observable, SourcegraphExtensionAPI } from './api'
+import { Commands, SourcegraphExtensionAPI } from './api'
 import { createExtCommands } from './features/commands'
-import { createExtConfiguration } from './features/configuration'
 
 class ExtensionHandle<C> implements SourcegraphExtensionAPI<C> {
-    public readonly configuration: Configuration<C> & Observable<C>
     public readonly commands: Commands
 
     private subscription = new Subscription()
 
     constructor(public readonly rawConnection: Connection, public readonly initializeParams: InitializeParams) {
         this.subscription.add(this.rawConnection)
 
-        this.configuration = createExtConfiguration<C>(
-            this.rawConnection,
-            initializeParams.configurationCascade as ConfigurationCascade<C>
-        )
         this.commands = createExtCommands(this.rawConnection)
     }