Prepare release

Further simplify configureEditorOrViewsServiceConfig

Author: kaisalmen

README.md

@@ -78,7 +78,7 @@ The following table describes which version of **monaco-languageclient** and **m
 
 | monaco-languageclient | monaco-vscode-api | monaco-editor | comment |
 | :----         | :----   | :---   | :--- |
-| 6.3.0         | 1.80.2  | 0.40.0 | Released 2023-08-0x |
+| 6.3.0         | 1.80.2  | 0.40.0 | Released 2023-08-04 |
 | 6.2.0         | 1.79.3  | 0.39.0 | Released 2023-06-16 |
 | 6.1.0         | 1.79.1  | 0.38.0 | Released 2023-06-12 |
 | 6.0.3         | 1.78.8  | 0.37.1 | Released 2023-05-31 |

package-lock.json

@@ -5,6 +5,7 @@ All notable changes to this npm module are documented in this file.
 ## [6.3.0] - 2023-08-0x
 
 - Update to `monaco-editor` `0.40.0` and `monaco-vscode-api` `1.80.2` [#513](https://github.com/TypeFox/monaco-languageclient/pull/513)
+  - vscode api services have been cleaned-up and fully aligned with `monaco-vscode-api
 
 ## [6.2.0] - 2023-06-16
 

packages/client/CHANGELOG.md

@@ -1,6 +1,6 @@
 {
   "name": "monaco-languageclient",
-  "version": "6.3.0-next.2",
+  "version": "6.3.0",
   "description": "Monaco Language client implementation",
   "author": {
     "name": "TypeFox GmbH",

packages/client/package.json

@@ -18,8 +18,7 @@ export type InitializeServiceConfig = {
     enableNotificationService?: boolean;
     enableModelService?: boolean;
     configureEditorOrViewsServiceConfig?: {
-        enableViewsService: boolean;
-        useDefaultOpenEditorFunction: boolean;
+        enableViewsService?: boolean;
         openEditorFunc?: OpenEditor
     };
     configureConfigurationServiceConfig?: {
@@ -93,7 +92,7 @@ export const importAllServices = async (config?: InitializeServiceConfig) => {
         addService('model', import('vscode/service-override/model'));
     }
     if (lc.configureEditorOrViewsServiceConfig !== undefined) {
-        if (lc.configureEditorOrViewsServiceConfig.enableViewsService) {
+        if (lc.configureEditorOrViewsServiceConfig.enableViewsService === true) {
             addService('views', import('vscode/service-override/views'));
         } else {
             addService('editor', import('vscode/service-override/editor'));
@@ -206,14 +205,14 @@ export const importAllServices = async (config?: InitializeServiceConfig) => {
 
         let services: editor.IEditorOverrideServices = {};
         if (serviceName === 'editor' || serviceName === 'views') {
-            if (lc.configureEditorOrViewsServiceConfig!.useDefaultOpenEditorFunction) {
+            if (lc.configureEditorOrViewsServiceConfig?.openEditorFunc) {
+                services = loadedImport.default(lc.configureEditorOrViewsServiceConfig.openEditorFunc);
+            } else {
                 const defaultOpenEditorFunc: OpenEditor = async (model, options, sideBySide) => {
                     console.log('Trying to open a model', model, options, sideBySide);
                     return undefined;
                 };
                 services = loadedImport.default(defaultOpenEditorFunc);
-            } else if (lc.configureEditorOrViewsServiceConfig?.openEditorFunc) {
-                services = loadedImport.default(lc.configureEditorOrViewsServiceConfig.openEditorFunc);
             }
         } else if (serviceName === 'configuration') {
             if (lc.configureConfigurationServiceConfig?.defaultWorkspaceUri) {

packages/client/src/monaco-vscode-api-services.ts

@@ -23,7 +23,7 @@
     "langium": "~1.2.1",
     "langium-statemachine-dsl": "~1.2.0",
     "monaco-editor-workers": "0.40.0",
-    "monaco-languageclient": "6.3.0-next.2",
+    "monaco-languageclient": "~6.3.0",
     "normalize-url": "~8.0.0",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",

packages/examples/main/package.json

@@ -83,8 +83,6 @@ export const createJsonEditor = async (config: {
             enableTextmateService: true,
             enableModelService: true,
             configureEditorOrViewsServiceConfig: {
-                enableViewsService: false,
-                useDefaultOpenEditorFunction: true
             },
             enableKeybindingsService: true,
             enableLanguagesService: true,

packages/examples/main/src/common.ts

@@ -120,8 +120,6 @@ try {
         enableTextmateService: true,
         enableModelService: true,
         configureEditorOrViewsServiceConfig: {
-            enableViewsService: false,
-            useDefaultOpenEditorFunction: true
         },
         configureConfigurationServiceConfig: {
             defaultWorkspaceUri: '/tmp'

packages/examples/main/src/langium/langiumClient.ts

@@ -120,8 +120,6 @@ try {
         enableTextmateService: true,
         enableModelService: true,
         configureEditorOrViewsServiceConfig: {
-            enableViewsService: true,
-            useDefaultOpenEditorFunction: true
         },
         configureConfigurationServiceConfig: {
             defaultWorkspaceUri: '/tmp'

packages/examples/main/src/langium/statemachineClient.ts

@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "private": "true",
   "dependencies": {
-    "monaco-languageclient": "6.3.0-next.2",
+    "monaco-languageclient": "~6.3.0",
     "monaco-editor": "~0.40.0",
     "vscode": "npm:@codingame/monaco-vscode-api@~1.80.2"
   },