Merge pull request #180 from mkslanc/fix-rename-doc

Fix: document renaming logic

Author: mkslanc

packages/ace-linters/src/language-provider.ts

@@ -54,12 +54,15 @@ export class LanguageProvider {
     private $hoverTooltip: HoverTooltip;
     $urisToSessionsIds: { [uri: string]: string } = {};
     workspaceUri: string;
-    requireFilePath: boolean = false;
     private $lightBulbWidgets: { [editorId: string]: LightbulbWidget } = {};
     private stylesEmbedded: boolean;
     private inlineCompleter?: any;
     private doLiveAutocomplete: (e) => void;
-    private completerAdapter?: { InlineCompleter: any; doLiveAutocomplete: (e) => void; validateAceInlineCompleterWithEditor: (editor: Ace.Editor) => void; };
+    private completerAdapter?: {
+        InlineCompleter: any;
+        doLiveAutocomplete: (e) => void;
+        validateAceInlineCompleterWithEditor: (editor: Ace.Editor) => void;
+    };
 
     private constructor(worker: Worker, options?: ProviderOptions) {
         this.$messageController = new MessageController(worker, this);
@@ -141,7 +144,6 @@ export class LanguageProvider {
         });
 
         this.options.markdownConverter ||= new showdown.Converter();
-        this.requireFilePath = this.options.requireFilePath ?? false;
         if (options?.workspacePath) {
             this.workspaceUri = convertToUri(options.workspacePath);
         }
@@ -621,7 +623,6 @@ class SessionLanguageProvider {
     private $isConnected = false;
     private $options?: ServiceOptions;
     private $filePath: string;
-    private $isFilePathRequired = false;
     private $servicesCapabilities?: { [serviceName: string]: lsp.ServerCapabilities };
     private $requestsQueue: Function[] = [];
 
@@ -655,7 +656,6 @@ class SessionLanguageProvider {
         this.$messageController = messageController;
         this.session = session;
         this.editor = editor;
-        this.$isFilePathRequired = provider.requireFilePath;
 
         session.doc.version = 1;
         session.doc.on("change", this.$changeListener, true);
@@ -689,8 +689,6 @@ class SessionLanguageProvider {
     setFilePath(filePath: string) {
         this.enqueueIfNotConnected(() => {
             this.session.doc.version++;
-            if (this.$filePath !== undefined)//TODO change file path
-                return;
             this.$filePath = filePath;
             const previousComboId = this.comboDocumentIdentifier;
             this.initDocumentUri(true);
@@ -699,8 +697,6 @@ class SessionLanguageProvider {
     };
 
     private $init() {
-        if (this.$isFilePathRequired && this.$filePath === undefined)
-            return;
         this.initDocumentUri();
         this.$messageController.init(this.comboDocumentIdentifier, this.session.doc, this.$mode, this.$options, this.$connected);
     }

packages/ace-linters/src/services/base-service.ts

@@ -131,7 +131,13 @@ export abstract class BaseService<OptionsType extends ServiceOptions = ServiceOp
     }
 
     renameDocument(document: lsp.TextDocumentIdentifier, newDocumentUri: string) {
-        this.documents[newDocumentUri] = this.documents[document.uri];
+        const previousDocument = this.getDocument(document.uri);
+        this.addDocument({
+            uri: newDocumentUri,
+            version: previousDocument.version,
+            languageId: previousDocument.languageId,
+            text: previousDocument.getText()
+        })
         this.options[newDocumentUri] = this.options[document.uri];
         this.removeDocument(document);
     }

packages/ace-linters/src/types/language-service.ts

@@ -255,7 +255,6 @@ export interface ProviderOptions {
         codeActions?: boolean
     },
     markdownConverter?: MarkDownConverter,
-    requireFilePath?: boolean,
     workspacePath?: string, // this would be transformed to workspaceUri
     aceComponents?: {
         "InlineAutocomplete"?: typeof InlineAutocomplete,

packages/demo/file-api-websockets/client.ts

@@ -30,6 +30,7 @@ new AceLayout(base);
 window["fileTreeWrapper"] = fileTree;
 let fileSystem = new FileSystemWeb();
 let aceTree = new AceTreeWrapper();
+aceTree.render();
 
 function renderFileTree() {
     let button = new Button({value: "Open Folder"});

packages/demo/file-api-websockets/webworker.ts

@@ -106,7 +106,7 @@ manager.registerServer("astro", {
 
 manager.registerServer("go", {
     module: () => import("ace-linters/build/language-client"),
-    modes: "golang",
+    modes: "golang|go",
     type: "socket",
     socket: new WebSocket("ws://127.0.0.1:3030/go")
 });