Merge pull request #15 from mkslanc/change-mode-fix

Changing document mode to unsupported now will not produce errors
mkslanc · Dec 22, 2022 · f2d5e85 · f2d5e85
2 parents 31ba10c + 7b17ebe
commit f2d5e85
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 28 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ace-linters-root",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "scripts": {
     "build": "webpack",
     "start": "webpack-dev-server"

diff --git a/packages/ace-linters/build/bundle.ace-linters.js b/packages/ace-linters/build/bundle.ace-linters.js
diff --git a/packages/ace-linters/language-provider.ts b/packages/ace-linters/language-provider.ts
@@ -88,7 +88,7 @@ export class LanguageProvider<OptionsType = AceLinters.ServiceOptions> {
 
             // @ts-ignore
             this.editor.on("changeMode", () => {
-                this.$message.changeMode(this.$fileName, this.$mode, this.$options, this.$onInit);
+                this.$message.changeMode(this.$fileName, this.editor.getValue(), this.$mode, this.$options, this.$onInit);
             });
         });
     }

diff --git a/packages/ace-linters/message-controller.ts b/packages/ace-linters/message-controller.ts
@@ -75,8 +75,8 @@ export class MessageController {
         this.postMessage(message, callback)
     }
 
-    changeMode(sessionId: string, mode: string, options: AceLinters.ServiceOptions, callback?: () => void) {
-        this.postMessage(new ChangeModeMessage(sessionId, mode, options), callback);
+    changeMode(sessionId: string, value: string, mode: string, options: AceLinters.ServiceOptions, callback?: () => void) {
+        this.postMessage(new ChangeModeMessage(sessionId, value, mode, options), callback);
     }
 
     changeOptions(sessionId: string, options: AceLinters.ServiceOptions, callback?: () => void) {

diff --git a/packages/ace-linters/message-types.ts b/packages/ace-linters/message-types.ts
@@ -100,9 +100,11 @@ export class ChangeModeMessage extends BaseMessage {
     type: MessageType = MessageType.changeMode;
     mode: string;
     options: ServiceOptions;
+    value: string;
 
-    constructor(sessionId: string, mode: string, options: ServiceOptions) {
+    constructor(sessionId: string, value: string, mode: string, options: ServiceOptions) {
         super(sessionId);
+        this.value = value;
         this.mode = mode;
         this.options = options;
     }

diff --git a/packages/ace-linters/package.json b/packages/ace-linters/package.json
@@ -1,11 +1,13 @@
 {
   "name": "ace-linters",
   "author": "Azat Alimov <mkslanc@gmail.com>",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "scripts": {
-    "build": "webpack"
+    "clean": "rimraf build",
+    "build": "npm run clean && webpack --mode=production",
+    "build-dev": "npm run clean && webpack --mode=development"
   },
-  "dependencies": {
+  "dev-dependencies": {
     "vscode-html-languageservice": "latest",
     "vscode-css-languageservice": "latest",
     "vscode-json-languageservice": "4.2.1",

diff --git a/packages/ace-linters/services/service-manager.ts b/packages/ace-linters/services/service-manager.ts
@@ -97,28 +97,30 @@ export class ServiceManager {
 
         let document = new Document(documentValue);
         let serviceInstance = await this.$getServiceInstanceByMode(mode);
+        if (!serviceInstance)
+            return;
         serviceInstance.addDocument(sessionID, document, options);
         this.$sessionIDToMode[sessionID] = mode;
     }
 
-    async changeDocumentMode(sessionID: string, mode: string, options: ServiceOptions) {
-        let service = this.getServiceInstance(sessionID);
-        let documentValue = service.getDocumentValue(sessionID);
+    async changeDocumentMode(sessionID: string, value: string, mode: string, options: ServiceOptions) {
         this.removeDocument(sessionID);
-        await this.addDocument(sessionID, documentValue, mode, options);
+        await this.addDocument(sessionID, value, mode, options);
     }
 
     removeDocument(sessionID: string) {
         let service = this.getServiceInstance(sessionID);
-        service.removeDocument(sessionID);
-        delete this.$sessionIDToMode[sessionID];
+        if (service) {
+            service.removeDocument(sessionID);
+            delete this.$sessionIDToMode[sessionID];
+        }
     }
 
     getServiceInstance(sessionID: string): LanguageService {
         let mode = this.$sessionIDToMode[sessionID];
         let service = this.findServiceByMode(mode);
         if (!mode || !service?.serviceInstance)
-            throw Error("No registered service for " + sessionID);
+            return; //TODO:
 
         return service.serviceInstance;
     }

diff --git a/packages/ace-linters/web.worker.ts b/packages/ace-linters/web.worker.ts
@@ -13,34 +13,34 @@ ctx.onmessage = async (ev) => {
     };
     switch (message["type"] as MessageType) {
         case MessageType.format:
-            postMessage["value"] = manager.getServiceInstance(sessionID).format(sessionID, message.value, message.format);
+            postMessage["value"] = manager.getServiceInstance(sessionID)?.format(sessionID, message.value, message.format);
             break;
         case MessageType.complete:
-            postMessage["value"] = await manager.getServiceInstance(sessionID).doComplete(sessionID, message.value);
+            postMessage["value"] = await manager.getServiceInstance(sessionID)?.doComplete(sessionID, message.value);
             break;
         case MessageType.resolveCompletion:
-            postMessage["value"] = await manager.getServiceInstance(sessionID).resolveCompletion(sessionID, message.value);
+            postMessage["value"] = await manager.getServiceInstance(sessionID)?.resolveCompletion(sessionID, message.value);
             break;
         case MessageType.change:
-            manager.getServiceInstance(sessionID).setValue(sessionID, message.value);
+            manager.getServiceInstance(sessionID)?.setValue(sessionID, message.value);
             break;
         case MessageType.applyDelta:
-            manager.getServiceInstance(sessionID).applyDeltas(sessionID, message.value);
+            manager.getServiceInstance(sessionID)?.applyDeltas(sessionID, message.value);
             break;
         case MessageType.hover:
-            postMessage["value"] = await manager.getServiceInstance(sessionID).doHover(sessionID, message.value);
+            postMessage["value"] = await manager.getServiceInstance(sessionID)?.doHover(sessionID, message.value);
             break;
         case MessageType.validate:
-            postMessage["value"] = await manager.getServiceInstance(sessionID).doValidation(sessionID);
+            postMessage["value"] = await manager.getServiceInstance(sessionID)?.doValidation(sessionID);
             break;
         case MessageType.init: //this should be first message
             await manager.addDocument(sessionID, message.value, message.mode, message.options);
             break;
         case MessageType.changeMode:
-            await manager.changeDocumentMode(sessionID, message.mode, message.options);
+            await manager.changeDocumentMode(sessionID, message.value, message.mode, message.options);
             break;
         case MessageType.changeOptions:
-            manager.getServiceInstance(sessionID).setOptions(sessionID, message.options);
+            manager.getServiceInstance(sessionID)?.setOptions(sessionID, message.options);
             break;
         case MessageType.dispose:
             manager.removeDocument(sessionID);

diff --git a/packages/ace-linters/webpack.config.js b/packages/ace-linters/webpack.config.js
@@ -1,5 +1,6 @@
 "use strict";
 module.exports = (env, argv) => {
+    const isProduction = argv.mode === 'production';
     let loader;
     loader = {
         test: /\.(t|j)sx?$/,
@@ -13,7 +14,7 @@ module.exports = (env, argv) => {
     };
     return {
         cache: false,
-        devtool: false,
+        devtool: isProduction ? false : 'inline-source-map',
         entry: {
             "ace-linters": './index.ts'
         },
@@ -24,7 +25,7 @@ module.exports = (env, argv) => {
                     test: /\.worker\.ts$/,
                     loader: 'worker-loader',
                     options: {
-                        inline: 'no-fallback',
+                        inline: 'no-fallback'
                     }
                 }, loader, {
                     test: /\.css$/,
@@ -52,7 +53,7 @@ module.exports = (env, argv) => {
             }
         },
         optimization: {
-            minimize: true,
+            minimize: isProduction,
             splitChunks: false
         }
     };