refactor: make most names singular to be consistent

BREAKING CHANGE: Many files (modules) changed names to be singular, not plural.

Author: sqs

examples/client/config.ts

@@ -1,4 +1,4 @@
-import { DocumentSelector } from '../../src/types/documents'
+import { DocumentSelector } from '../../src/types/document'
 
 export default require('./package.json').cxp as {
     url: string

examples/client/example-client-simple.ts

@@ -2,7 +2,7 @@ import * as NodeWebSocket from 'ws'
 import { createMessageConnection } from '../../src/jsonrpc2/connection'
 import { createWebSocketMessageTransports } from '../../src/jsonrpc2/transports/nodeWebSocket'
 import { InitializeParams, InitializeRequest, InitializeResult } from '../../src/protocol'
-import { TextDocumentDecorationsParams, TextDocumentDecorationsRequest } from '../../src/protocol/decorations'
+import { TextDocumentDecorationsParams, TextDocumentDecorationsRequest } from '../../src/protocol/decoration'
 import config from './config'
 
 async function run(): Promise<void> {

examples/client/example-client.ts

@@ -2,13 +2,13 @@ import { BehaviorSubject } from 'rxjs'
 import { filter } from 'rxjs/operators'
 import * as WebSocket from 'ws'
 import { Client, ClientState } from '../../src/client/client'
-import { TextDocumentStaticDecorationsFeature } from '../../src/client/features/decorations'
+import { TextDocumentStaticDecorationsFeature } from '../../src/client/features/decoration'
 import { TextDocumentHoverFeature } from '../../src/client/features/hover'
-import { TextDocumentDidOpenFeature } from '../../src/client/features/textDocuments'
+import { TextDocumentDidOpenFeature } from '../../src/client/features/textDocument'
 import { createObservableEnvironment, EMPTY_ENVIRONMENT, Environment } from '../../src/environment/environment'
 import { NoopProviderRegistry } from '../../src/environment/providers/textDocument'
 import { createWebSocketMessageTransports } from '../../src/jsonrpc2/transports/nodeWebSocket'
-import { TextDocumentDecorationsParams, TextDocumentDecorationsRequest } from '../../src/protocol/decorations'
+import { TextDocumentDecorationsParams, TextDocumentDecorationsRequest } from '../../src/protocol/decoration'
 import config from './config'
 
 const environment = new BehaviorSubject<Environment>(EMPTY_ENVIRONMENT)

examples/server/example-server-node.ts

@@ -4,7 +4,7 @@ import * as WebSocket from 'ws'
 import { createWebSocketMessageTransports } from '../../src/jsonrpc2/transports/nodeWebSocket'
 import { StreamMessageReader, StreamMessageWriter } from '../../src/jsonrpc2/transports/stream'
 import { InitializeResult } from '../../src/protocol'
-import { TextDocumentDecoration, TextDocumentDecorationsParams } from '../../src/protocol/decorations'
+import { TextDocumentDecoration, TextDocumentDecorationsParams } from '../../src/protocol/decoration'
 import { Connection, createConnection } from '../../src/server/server'
 
 function register(connection: Connection): void {

examples/server/example-server-webworker.ts

@@ -1,6 +1,6 @@
 import { createWebWorkerMessageTransports, Worker } from '../../src/jsonrpc2/transports/webWorker'
 import { InitializeResult } from '../../src/protocol'
-import { TextDocumentDecoration, TextDocumentDecorationsParams } from '../../src/protocol/decorations'
+import { TextDocumentDecoration, TextDocumentDecorationsParams } from '../../src/protocol/decoration'
 import { Connection, createConnection } from '../../src/server/server'
 
 declare var self: Worker

src/client/client.ts

@@ -22,7 +22,7 @@ import {
     UnregistrationParams,
     UnregistrationRequest,
 } from '../protocol'
-import { DocumentSelector } from '../types/documents'
+import { DocumentSelector } from '../types/document'
 import { URI } from '../types/textDocument'
 import { isFunction } from '../util'
 import { Connection, createConnection } from './connection'

src/client/features/commands.ts src/client/features/command.ts

@@ -6,7 +6,7 @@ import {
     ServerCapabilities,
     TextDocumentRegistrationOptions,
 } from '../../protocol'
-import { DocumentSelector } from '../../types/documents'
+import { DocumentSelector } from '../../types/document'
 import { isFunction } from '../../util'
 import { Client } from '../client'
 

src/client/features/common.ts

@@ -20,7 +20,7 @@ import { DynamicFeature, ensure, RegistrationData, StaticFeature } from './commo
  * Support for extension settings managed by the client (workspace/didChangeConfiguration notifications to the
  * server).
  */
-export class ConfigurationChangeNotificationsFeature implements DynamicFeature<undefined> {
+export class ConfigurationChangeNotificationFeature implements DynamicFeature<undefined> {
     private subscriptions = new Subscription()
     private listener: Subscription | null = null
 

src/client/features/configuration.ts

@@ -10,8 +10,8 @@ import {
     TextDocumentDecorationsRequest,
     TextDocumentPublishDecorationsNotification,
     TextDocumentPublishDecorationsParams,
-} from '../../protocol/decorations'
-import { DocumentSelector } from '../../types/documents'
+} from '../../protocol/decoration'
+import { DocumentSelector } from '../../types/document'
 import { NextSignature } from '../../types/middleware'
 import { Client } from '../client'
 import { ensure, TextDocumentFeature } from './common'

src/client/features/decorations.ts src/client/features/decoration.ts

@@ -10,7 +10,7 @@ import {
     TextDocumentPositionParams,
     TextDocumentRegistrationOptions,
 } from '../../protocol'
-import { DocumentSelector } from '../../types/documents'
+import { DocumentSelector } from '../../types/document'
 import { NextSignature } from '../../types/middleware'
 import { Client } from '../client'
 import { ensure, TextDocumentFeature } from './common'

src/client/features/hover.ts

@@ -5,7 +5,7 @@ import { StaticFeature } from './common'
 /**
  * Support for server log messages (window/logMessage notifications from the server).
  */
-export class WindowLogMessagesFeature implements StaticFeature {
+export class WindowLogMessageFeature implements StaticFeature {
     constructor(
         private client: Client,
         /** Called when the client receives a window/logMessage notification. */

src/client/features/logMessages.ts src/client/features/logMessage.ts

@@ -12,7 +12,7 @@ import { StaticFeature } from './common'
  * Support for server messages intended for display to the user (window/showMessages notifications and
  * window/showMessageRequest requests from the server).
  */
-export class WindowShowMessagesFeature implements StaticFeature {
+export class WindowShowMessageFeature implements StaticFeature {
     constructor(
         private client: Client,
         /** Called when the client receives a window/showMessage notification. */

src/client/features/showMessages.ts src/client/features/message.ts

@@ -10,7 +10,7 @@ import {
     ServerCapabilities,
     TextDocumentRegistrationOptions,
 } from '../../protocol'
-import { DocumentSelector } from '../../types/documents'
+import { DocumentSelector } from '../../types/document'
 import { NextSignature } from '../../types/middleware'
 import { match } from '../../types/textDocument'
 import { Client } from '../client'

src/client/features/textDocuments.ts src/client/features/textDocument.ts

@@ -3,7 +3,7 @@ import { NextSignature } from '../types/middleware'
 import {
     HandleTextDocumentDecorationsMiddleware,
     ProvideTextDocumentDecorationsMiddleware,
-} from './features/decorations'
+} from './features/decoration'
 import { ProvideTextDocumentHoverMiddleware } from './features/hover'
 
 export interface Middleware {

src/client/middleware.ts

@@ -1,6 +1,6 @@
 import * as assert from 'assert'
 import { Position, Range } from 'vscode-languageserver-types'
-import { TextDocumentDecoration } from '../protocol/decorations'
+import { TextDocumentDecoration } from '../protocol/decoration'
 import { createValidator } from './validator'
 
 const validator = createValidator()

src/client/validator.test.ts

@@ -1,4 +1,4 @@
-import { TextDocumentDecoration } from '../protocol/decorations'
+import { TextDocumentDecoration } from '../protocol/decoration'
 
 export interface Validator {
     asTextDocumentDecoration(value: TextDocumentDecoration): TextDocumentDecoration

src/client/validator.ts

@@ -1,20 +1,20 @@
 import { BehaviorSubject, Observable, Subject, Subscription, SubscriptionLike, Unsubscribable } from 'rxjs'
 import { distinctUntilChanged, filter, map } from 'rxjs/operators'
 import { Client, ClientOptions } from '../client/client'
-import { ExecuteCommandFeature } from '../client/features/commands'
+import { ExecuteCommandFeature } from '../client/features/command'
 import {
-    ConfigurationChangeNotificationsFeature,
+    ConfigurationChangeNotificationFeature,
     ConfigurationFeature,
     ConfigurationUpdateFeature,
 } from '../client/features/configuration'
 import {
     TextDocumentDynamicDecorationsFeature,
     TextDocumentStaticDecorationsFeature,
-} from '../client/features/decorations'
+} from '../client/features/decoration'
 import { TextDocumentHoverFeature } from '../client/features/hover'
-import { WindowLogMessagesFeature } from '../client/features/logMessages'
-import { WindowShowMessagesFeature } from '../client/features/showMessages'
-import { TextDocumentDidOpenFeature } from '../client/features/textDocuments'
+import { WindowLogMessageFeature } from '../client/features/logMessage'
+import { WindowShowMessageFeature } from '../client/features/message'
+import { TextDocumentDidOpenFeature } from '../client/features/textDocument'
 import { MessageTransports } from '../jsonrpc2/connection'
 import { Trace } from '../jsonrpc2/trace'
 import {
@@ -164,7 +164,7 @@ export class Controller<X extends Extension = Extension> implements Unsubscribab
     }
 
     private registerClientFeatures(client: Client, settings: Observable<ExtensionSettings>): void {
-        client.registerFeature(new ConfigurationChangeNotificationsFeature(client, settings))
+        client.registerFeature(new ConfigurationChangeNotificationFeature(client, settings))
         client.registerFeature(new ConfigurationFeature(client, settings))
         client.registerFeature(
             new ConfigurationUpdateFeature(
@@ -185,12 +185,12 @@ export class Controller<X extends Extension = Extension> implements Unsubscribab
             new TextDocumentDynamicDecorationsFeature(client, this.registries.textDocumentDecorations)
         )
         client.registerFeature(
-            new WindowLogMessagesFeature(client, (params: LogMessageParams) =>
+            new WindowLogMessageFeature(client, (params: LogMessageParams) =>
                 this._logMessages.next({ ...params, extension: client.id })
             )
         )
         client.registerFeature(
-            new WindowShowMessagesFeature(
+            new WindowShowMessageFeature(
                 client,
                 (params: ShowMessageParams) => this._showMessages.next({ ...params, extension: client.id }),
                 (params: ShowMessageRequestParams) =>

src/environment/controller.ts

@@ -1,7 +1,7 @@
 import { combineLatest, Observable } from 'rxjs'
 import { catchError, map, switchMap } from 'rxjs/operators'
 import { TextDocumentRegistrationOptions } from '../../protocol'
-import { TextDocumentDecoration, TextDocumentDecorationsParams } from '../../protocol/decorations'
+import { TextDocumentDecoration, TextDocumentDecorationsParams } from '../../protocol/decoration'
 import { compact, flatten } from '../../util'
 import { TextDocumentFeatureProviderRegistry } from './textDocument'
 

src/environment/providers/decoration.ts

@@ -1,4 +1,4 @@
-import { CommandRegistry } from '../client/features/commands'
+import { CommandRegistry } from '../client/features/command'
 import { TextDocumentDecorationsProviderRegistry } from './providers/decoration'
 import { TextDocumentHoverProviderRegistry } from './providers/hover'
 

src/environment/registries.ts

@@ -28,7 +28,7 @@ import {
     ResponseMessage,
 } from './messages'
 import { LogTraceNotification, SetTraceNotification, Trace, Tracer } from './trace'
-import { DataCallback, MessageReader, MessageWriter } from './transports'
+import { DataCallback, MessageReader, MessageWriter } from './transport'
 
 // Copied from vscode-languageserver to avoid adding extraneous dependencies.
 

src/jsonrpc2/connection.ts

@@ -1,6 +1,6 @@
-import { Emitter, Event } from '../jsonrpc2/events'
-import { Message } from '../jsonrpc2/messages'
 import { isFunction } from '../util'
+import { Emitter, Event } from './events'
+import { Message } from './messages'
 
 // Copied from vscode-jsonrpc to avoid adding extraneous dependencies.
 

src/jsonrpc2/transports.ts src/jsonrpc2/transport.ts

@@ -1,6 +1,6 @@
 import { MessageTransports } from '../connection'
 import { Message } from '../messages'
-import { AbstractMessageReader, AbstractMessageWriter, DataCallback, MessageReader, MessageWriter } from '../transports'
+import { AbstractMessageReader, AbstractMessageWriter, DataCallback, MessageReader, MessageWriter } from '../transport'
 
 // Copied subset of WebSocket from the TypeScript "dom" core library to avoid needing to add that lib to
 // tsconfig.json.

src/jsonrpc2/transports/browserWebSocket.ts

@@ -1,7 +1,7 @@
 import * as NodeWebSocket from 'ws'
 import { MessageTransports } from '../connection'
 import { Message } from '../messages'
-import { AbstractMessageReader, AbstractMessageWriter, DataCallback, MessageReader, MessageWriter } from '../transports'
+import { AbstractMessageReader, AbstractMessageWriter, DataCallback, MessageReader, MessageWriter } from '../transport'
 
 class WebSocketMessageReader extends AbstractMessageReader implements MessageReader {
     private pending: Message[] = []

src/jsonrpc2/transports/nodeWebSocket.ts

@@ -1,6 +1,6 @@
 import { Socket } from 'net'
 import { Message } from '../messages'
-import { AbstractMessageWriter, MessageWriter } from '../transports'
+import { AbstractMessageWriter, MessageWriter } from '../transport'
 import { ContentLength, CRLF, StreamMessageReader } from './stream'
 
 export class SocketMessageReader extends StreamMessageReader {

src/jsonrpc2/transports/socket.ts

@@ -1,5 +1,5 @@
 import { Message } from '../messages'
-import { AbstractMessageReader, AbstractMessageWriter, DataCallback, MessageReader, MessageWriter } from '../transports'
+import { AbstractMessageReader, AbstractMessageWriter, DataCallback, MessageReader, MessageWriter } from '../transport'
 
 const DefaultSize = 8192
 const CR: number = Buffer.from('\r', 'ascii')[0]

src/jsonrpc2/transports/stream.ts

@@ -1,6 +1,6 @@
 import { MessageTransports } from '../connection'
 import { Message } from '../messages'
-import { AbstractMessageReader, AbstractMessageWriter, DataCallback, MessageReader, MessageWriter } from '../transports'
+import { AbstractMessageReader, AbstractMessageWriter, DataCallback, MessageReader, MessageWriter } from '../transport'
 
 // TODO: use transferable objects in postMessage for perf
 

src/jsonrpc2/transports/webWorker.ts

@@ -1,17 +1,17 @@
 import { CodeLensOptions } from './codeLens'
-import { ColorClientCapabilities, ColorServerCapabilities } from './colors'
-import { ExecuteCommandOptions } from './commands'
+import { ColorClientCapabilities, ColorServerCapabilities } from './color'
+import { ExecuteCommandOptions } from './command'
 import { CompletionOptions } from './completion'
 import { ConfigurationClientCapabilities } from './configuration'
-import { ContributionsClientCapabilities, ContributionsServerCapabilities } from './contributions'
-import { DecorationsClientCapabilities, DecorationsServerCapabilities } from './decorations'
-import { DocumentLinkOptions } from './documentLinks'
-import { ImplementationClientCapabilities, ImplementationServerCapabilities } from './implementations'
+import { ContributionsClientCapabilities, ContributionsServerCapabilities } from './contribution'
+import { DecorationsClientCapabilities, DecorationsServerCapabilities } from './decoration'
+import { DocumentLinkOptions } from './documentLink'
+import { ImplementationClientCapabilities, ImplementationServerCapabilities } from './implementation'
 import { SignatureHelpOptions } from './signatureHelp'
 import { TextDocumentClientCapabilities, TextDocumentSyncKind, TextDocumentSyncOptions } from './textDocument'
-import { TypeDefinitionClientCapabilities, TypeDefinitionServerCapabilities } from './typeDefinitions'
+import { TypeDefinitionClientCapabilities, TypeDefinitionServerCapabilities } from './typeDefinition'
 import { WorkspaceClientCapabilities } from './workspace'
-import { WorkspaceFoldersClientCapabilities, WorkspaceFoldersServerCapabilities } from './workspaceFolders'
+import { WorkspaceFoldersClientCapabilities, WorkspaceFoldersServerCapabilities } from './workspaceFolder'
 
 /**
  * Defines the capabilities provided by the client.

src/protocol/capabilities.ts

@@ -1,30 +1,30 @@
 export * from './capabilities'
-export * from './codeActions'
+export * from './codeAction'
 export * from './codeLens'
-export * from './colors'
-export * from './commands'
+export * from './color'
+export * from './command'
 export * from './completion'
 export * from './configuration'
-export * from './contributions'
-export * from './decorations'
-export * from './definitions'
-export * from './diagnostics'
-export * from './documentHighlights'
-export * from './documentLinks'
-export * from './edits'
-export * from './files'
+export * from './contribution'
+export * from './decoration'
+export * from './definition'
+export * from './diagnostic'
+export * from './documentHighlight'
+export * from './documentLink'
+export * from './edit'
+export * from './file'
 export * from './formatting'
 export * from './hover'
-export * from './implementations'
+export * from './implementation'
 export * from './initialize'
-export * from './messages'
-export * from './references'
+export * from './message'
+export * from './reference'
 export * from './registration'
 export * from './rename'
 export * from './signatureHelp'
-export * from './symbols'
+export * from './symbol'
 export * from './telemetry'
 export * from './textDocument'
-export * from './typeDefinitions'
-export * from './workspaceFolders'
+export * from './typeDefinition'
+export * from './workspaceFolder'
 export * from './workspace'

src/protocol/codeActions.ts src/protocol/codeAction.ts

@@ -1,7 +1,7 @@
 import { NotificationType, RequestType } from '../jsonrpc2/messages'
 import { URI } from '../types/textDocument'
 import { ClientCapabilities, ServerCapabilities } from './capabilities'
-import { WorkspaceFoldersInitializeParams } from './workspaceFolders'
+import { WorkspaceFoldersInitializeParams } from './workspaceFolder'
 
 /**
  * The initialize request is sent from the client to the server. It is sent once as the request after starting up

src/protocol/colors.ts src/protocol/color.ts

@@ -12,7 +12,7 @@ import {
     VersionedTextDocumentIdentifier,
 } from 'vscode-languageserver-types'
 import { NotificationType, RequestType } from '../jsonrpc2/messages'
-import { DocumentSelector } from '../types/documents'
+import { DocumentSelector } from '../types/document'
 /**
  * A parameter literal used in requests to pass a text document and a position inside that
  * document.

src/protocol/commands.ts src/protocol/command.ts

@@ -1,6 +1,6 @@
 import * as minimatch from 'minimatch'
 import { Range, TextDocument } from 'vscode-languageserver-types'
-import { DocumentFilter, DocumentSelector } from './documents'
+import { DocumentFilter, DocumentSelector } from './document'
 
 export type URI = string