Fix parameter ordering (#1485)

README.md

@@ -39,6 +39,7 @@ After cloning the repository, run `npm install` to install dependencies and `npm
 - added proposed CodeActionKind.RefactorMove
 - snippet support in Workspace edits
 - support to control the parallelism of the dispatch requests and notification. This is a breaking change since it allows notification handlers to return a promise to control this.
+- make client browser implementation consistent with the node implementation in terms of arguments. This is a breaking change since it re-ordered parameter declarations.
 
 ## 3.17.5 Protocol, 9.0.1 Client and 9.0.1 Server
 

client/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "vscode-languageclient",
 	"description": "VSCode Language client implementation",
-	"version": "10.0.0-next.6",
+	"version": "10.0.0-next.7",
 	"author": "Microsoft Corporation",
 	"license": "MIT",
 	"engines": {

client/src/browser/main.ts

@@ -14,23 +14,23 @@ export type ServerOptions = Worker | (() => Promise<Worker | MessageTransports>)
 
 export class LanguageClient extends BaseLanguageClient {
 
-	private readonly options: ServerOptions;
+	private readonly serverOptions: ServerOptions;
 
-	constructor(id: string, name: string, clientOptions: LanguageClientOptions, options: ServerOptions) {
+	constructor(id: string, name: string, serverOptions: ServerOptions, clientOptions: LanguageClientOptions) {
 		super(id, name, clientOptions);
-		this.options = options;
+		this.serverOptions = serverOptions;
 	}
 
 	protected async createMessageTransports(_encoding: string): Promise<MessageTransports> {
-		if (typeof this.options === 'function') {
-			const result = await this.options();
+		if (typeof this.serverOptions === 'function') {
+			const result = await this.serverOptions();
 			if (result instanceof Worker) {
 				return this.createMessageTransportsFromWorker(result);
 			} else {
 				return result;
 			}
 		} else {
-			return this.createMessageTransportsFromWorker(this.options);
+			return this.createMessageTransportsFromWorker(this.serverOptions);
 		}
 	}