More consistent naming

Author: dbaeumer

…-node-tests/src/workspaceFolders.test.ts …t-node-tests/src/workspaceFolder.test.tsclient-node-tests/src/workspaceFolders.test.ts renamed to client-node-tests/src/workspaceFolder.test.ts client-node-tests/src/workspaceFolders.test.ts renamed to client-node-tests/src/workspaceFolder.test.ts

@@ -4,7 +4,7 @@ import * as assert from 'assert';
 import * as vscode from 'vscode';
 import * as sinon from 'sinon';
 
-import { WorkspaceFoldersFeature } from 'vscode-languageclient/lib/common/workspaceFolders';
+import { WorkspaceFoldersFeature } from 'vscode-languageclient/lib/common/workspaceFolder';
 import { BaseLanguageClient, MessageTransports, DidChangeWorkspaceFoldersParams, Disposable } from 'vscode-languageclient';
 import * as proto from 'vscode-languageserver-protocol';
 

client/src/common/client.ts

@@ -63,7 +63,7 @@ import type { ConfigurationWorkspaceMiddleware } from './configuration';
 import type { ColorProviderMiddleware } from './colorProvider';
 import type { ImplementationMiddleware } from './implementation';
 import type { TypeDefinitionMiddleware } from './typeDefinition';
-import type { WorkspaceFolderWorkspaceMiddleware } from './workspaceFolders';
+import type { WorkspaceFolderWorkspaceMiddleware } from './workspaceFolder';
 import type { FoldingRangeProviderMiddleware } from './foldingRange';
 import type { DeclarationMiddleware } from './declaration';
 import type { SelectionRangeProviderMiddleware } from './selectionRange';
@@ -72,10 +72,10 @@ import type { SemanticTokensMiddleware, SemanticTokensProviders } from './semant
 import type { FileOperationsMiddleware } from './fileOperations';
 import type { LinkedEditingRangeMiddleware } from './linkedEditingRange';
 import type { DiagnosticFeatureProvider } from './proposed.diagnostic';
-import type { InlineValueMiddleware, InlineValueProviderShape } from './proposed.inlineValues';
-import type { InlayHintsMiddleware, InlayHintsProviderShape } from './proposed.inlayHints';
+import type { InlineValueMiddleware, InlineValueProviderShape } from './proposed.inlineValue';
+import type { InlayHintsMiddleware, InlayHintsProviderShape } from './proposed.inlayHint';
 import type { TypeHierarchyMiddleware } from './proposed.typeHierarchy';
-import type { $NotebookCellTextDocumentFilter, NotebookDocumentProviderFeature, NotebookDocumentMiddleware } from './proposed.notebooks';
+import type { $NotebookCellTextDocumentFilter, NotebookDocumentProviderFeature, NotebookDocumentMiddleware } from './proposed.notebook';
 
 import * as c2p from './codeConverter';
 import * as p2c from './protocolConverter';

client/src/common/commonClient.ts

@@ -11,7 +11,7 @@ import { ColorProviderFeature } from './colorProvider';
 import { ConfigurationFeature as PullConfigurationFeature } from './configuration';
 import { ImplementationFeature } from './implementation';
 import { TypeDefinitionFeature } from './typeDefinition';
-import { WorkspaceFoldersFeature } from './workspaceFolders';
+import { WorkspaceFoldersFeature } from './workspaceFolder';
 import { FoldingRangeFeature } from './foldingRange';
 import { DeclarationFeature } from './declaration';
 import { SelectionRangeFeature } from './selectionRange';
@@ -61,9 +61,9 @@ export abstract class CommonLanguageClient extends BaseLanguageClient {
 // Exporting proposed protocol.
 import * as pd from './proposed.diagnostic';
 import * as pt from './proposed.typeHierarchy';
-import * as iv from './proposed.inlineValues';
-import * as ih from './proposed.inlayHints';
-import * as nb from './proposed.notebooks';
+import * as iv from './proposed.inlineValue';
+import * as ih from './proposed.inlayHint';
+import * as nb from './proposed.notebook';
 
 export namespace ProposedFeatures {
 	export function createAll(client: BaseLanguageClient): (StaticFeature | DynamicFeature<any>)[] {

client/src/common/proposed.inlayHints.ts client/src/common/proposed.inlayHint.tsclient/src/common/proposed.inlayHints.ts renamed to client/src/common/proposed.inlayHint.ts

@@ -71,8 +71,8 @@ export namespace LSPErrorCodes {
 import * as diag from './proposed.diagnostic';
 import * as typeh from './proposed.typeHierarchy';
 import * as iv from './proposed.inlineValue';
-import * as nb from './proposed.notebooks';
-import * as ih from './proposed.inlayHints';
+import * as nb from './proposed.notebook';
+import * as ih from './proposed.inlayHint';
 
 export namespace Proposed {
 	export type DiagnosticClientCapabilities = diag.DiagnosticClientCapabilities;