refactor: remove unneeded decorations and windows impl

Author: sqs

src/client/controller.ts

@@ -17,7 +17,6 @@ import { Extension } from './extension'
 import { ExecuteCommandFeature } from './features/command'
 import { ConfigurationChangeNotificationFeature, ConfigurationUpdateFeature } from './features/configuration'
 import { ContributionFeature } from './features/contribution'
-import { TextDocumentDecorationFeature } from './features/decoration'
 import {
     TextDocumentDefinitionFeature,
     TextDocumentImplementationFeature,
@@ -233,7 +232,6 @@ export class Controller<X extends Extension, C extends ConfigurationCascade> imp
         client.registerFeature(
             new TextDocumentTypeDefinitionFeature(client, this.registries.textDocumentTypeDefinition)
         )
-        client.registerFeature(new TextDocumentDecorationFeature(client, this.registries.textDocumentDecoration))
         client.registerFeature(
             new WindowShowMessageFeature(
                 client,

src/client/features/decoration.test.ts

@@ -2,7 +2,7 @@ import * as assert from 'assert'
 import { of } from 'rxjs'
 import { TestScheduler } from 'rxjs/testing'
 import { TextDocumentIdentifier } from '../../client/types/textDocument'
-import { TextDocumentDecoration } from '../../protocol'
+import { TextDocumentDecoration } from '../../protocol/plainTypes'
 import { getDecorations, ProvideTextDocumentDecorationSignature } from './decoration'
 import { FIXTURE as COMMON_FIXTURE } from './registry.test'
 

src/client/features/decoration.ts

@@ -1,7 +1,7 @@
 import { combineLatest, Observable } from 'rxjs'
 import { map, switchMap } from 'rxjs/operators'
 import { TextDocumentIdentifier } from '../../client/types/textDocument'
-import { TextDocumentDecoration } from '../../protocol/decoration'
+import { TextDocumentDecoration } from '../../protocol/plainTypes'
 import { FeatureProviderRegistry } from './registry'
 import { flattenAndCompact } from './util'
 

src/client/providers/decoration.test.ts

@@ -18,7 +18,7 @@ describe('createExtensionHost', () => {
         clientConnection.listen()
 
         const initParams: InitializeParams = {
-            capabilities: { decoration: true, experimental: { a: 1 } },
+            capabilities: { experimental: { a: 1 } },
             configurationCascade: { merged: {} },
         }
         const initResult: InitializeResult = {}

src/client/providers/decoration.ts

@@ -1,7 +1,5 @@
 import { Subscription } from 'rxjs'
-import * as sourcegraph from 'sourcegraph'
-import { TextDocumentIdentifier } from '../../client/types/textDocument'
-import { InitializeParams, Settings, TextDocumentDecoration } from '../../protocol'
+import { InitializeParams, Settings } from '../../protocol'
 import { Connection } from '../../protocol/jsonrpc2/connection'
 
 /**
@@ -20,17 +18,6 @@ export interface SourcegraphExtensionAPI<C = Settings> {
      */
     configuration: Configuration<C>
 
-    /**
-     * The application windows on the client.
-     */
-    windows: Windows
-
-    /**
-     * The active window, or `null` if there is no active window. The active window is the window that was
-     * focused most recently.
-     */
-    activeWindow: Window | null
-
     /**
      * Command registration and execution.
      */
@@ -129,61 +116,6 @@ export interface Configuration<C> extends Observable<C> {
     // - describe how configuration defaults are supported
 }
 
-/**
- * The application windows on the client.
- */
-export interface Windows extends Observable<Window[]> {
-    /**
-     * Display a prompt and request text input from the user.
-     *
-     * @todo TODO: always shows on the active window if any; should pass window as a param?
-     *
-     * @param message The message to show.
-     * @param defaultValue The default value for the user input, or undefined for no default.
-     * @returns The user's input, or null if the user (or the client) canceled the input request.
-     */
-    showInputBox(message: string, defaultValue?: string): Promise<string | null>
-
-    /**
-     * Sets the decorations for the given document. All previous decorations for the document are cleared.
-     *
-     * @param resource The document to decorate.
-     * @param decorations The decorations to apply to the document.
-     */
-    setDecorations(resource: TextDocumentIdentifier, decorations: TextDocumentDecoration[]): void
-}
-
-/**
- * The application window where the client is running.
- */
-export interface Window {
-    /**
-     * Whether this window is the active window in the application. At most 1 window can be active.
-     */
-    readonly isActive: boolean
-
-    /**
-     * The active user interface component (such as a text editor) in this window, or null if there is no active
-     * component.
-     */
-    readonly activeComponent: Component | null
-}
-
-/**
- * A user interface component in an application window (such as a text editor).
- */
-export interface Component {
-    /**
-     * Whether this component is the active component in the application. At most 1 component can be active.
-     */
-    readonly isActive: boolean
-
-    /**
-     * The URI of the resource (such as a file) that this component is displaying, or null if there is none.
-     */
-    resource: sourcegraph.URI | null
-}
-
 /**
  * Command registration and execution.
  */

src/extension/extensionHost.test.ts

@@ -17,7 +17,7 @@ describe('activateExtension (old)', () => {
         clientConnection.listen()
 
         const initParams: InitializeParams = {
-            capabilities: { decoration: true },
+            capabilities: {},
             configurationCascade: { merged: {} },
         }
         const initResult: InitializeResult = {}

src/extension/old/api.ts

@@ -10,19 +10,14 @@ import {
 } from '../../protocol'
 import { Connection, createConnection, Logger, MessageTransports } from '../../protocol/jsonrpc2/connection'
 import { createWebWorkerMessageTransports } from '../../protocol/jsonrpc2/transports/webWorker'
-import { Commands, Configuration, Observable, SourcegraphExtensionAPI, Window, Windows } from './api'
+import { Commands, Configuration, Observable, SourcegraphExtensionAPI } from './api'
 import { createExtCommands } from './features/commands'
 import { createExtConfiguration } from './features/configuration'
-import { ExtWindows } from './features/windows'
 
 class ExtensionHandle<C> implements SourcegraphExtensionAPI<C> {
     public readonly configuration: Configuration<C> & Observable<C>
-    public get windows(): Windows & Observable<Window[]> {
-        return this._windows
-    }
     public readonly commands: Commands
 
-    private _windows: ExtWindows
     private subscription = new Subscription()
 
     constructor(public readonly rawConnection: Connection, public readonly initializeParams: InitializeParams) {
@@ -32,14 +27,9 @@ class ExtensionHandle<C> implements SourcegraphExtensionAPI<C> {
             this.rawConnection,
             initializeParams.configurationCascade as ConfigurationCascade<C>
         )
-        this._windows = new ExtWindows(this.rawConnection)
         this.commands = createExtCommands(this.rawConnection)
     }
 
-    public get activeWindow(): Window | null {
-        return this._windows.activeWindow
-    }
-
     public close(): void {
         this.subscription.unsubscribe()
     }