(fix) normalize uris coming from client (#443)

Author: dummdidumm

packages/language-server/src/lib/documents/DocumentManager.ts

@@ -5,6 +5,7 @@ import {
     VersionedTextDocumentIdentifier,
 } from 'vscode-languageserver';
 import { Document } from './Document';
+import { normalizeUri } from '../../utils';
 
 export type DocumentEvent = 'documentOpen' | 'documentChange' | 'documentClose';
 
@@ -14,15 +15,17 @@ export type DocumentEvent = 'documentOpen' | 'documentChange' | 'documentClose';
 export class DocumentManager {
     private emitter = new EventEmitter();
     private openedInClient = new Set<string>();
-    public documents: Map<string, Document> = new Map();
-    public locked = new Set<string>();
-    public deleteCandidates = new Set<string>();
+    private documents: Map<string, Document> = new Map();
+    private locked = new Set<string>();
+    private deleteCandidates = new Set<string>();
 
     constructor(
         private createDocument: (textDocument: Pick<TextDocumentItem, 'text' | 'uri'>) => Document,
     ) {}
 
     openDocument(textDocument: Pick<TextDocumentItem, 'text' | 'uri'>): Document {
+        textDocument = { ...textDocument, uri: normalizeUri(textDocument.uri) };
+
         let document: Document;
         if (this.documents.has(textDocument.uri)) {
             document = this.documents.get(textDocument.uri)!;
@@ -39,11 +42,11 @@ export class DocumentManager {
     }
 
     lockDocument(uri: string): void {
-        this.locked.add(uri);
+        this.locked.add(normalizeUri(uri));
     }
 
     markAsOpenedInClient(uri: string): void {
-        this.openedInClient.add(uri);
+        this.openedInClient.add(normalizeUri(uri));
     }
 
     getAllOpenedByClient() {
@@ -53,6 +56,8 @@ export class DocumentManager {
     }
 
     releaseDocument(uri: string): void {
+        uri = normalizeUri(uri);
+
         this.locked.delete(uri);
         this.openedInClient.delete(uri);
         if (this.deleteCandidates.has(uri)) {
@@ -62,6 +67,8 @@ export class DocumentManager {
     }
 
     closeDocument(uri: string) {
+        uri = normalizeUri(uri);
+
         const document = this.documents.get(uri);
         if (!document) {
             throw new Error('Cannot call methods on an unopened document');
@@ -83,7 +90,7 @@ export class DocumentManager {
         textDocument: VersionedTextDocumentIdentifier,
         changes: TextDocumentContentChangeEvent[],
     ) {
-        const document = this.documents.get(textDocument.uri);
+        const document = this.documents.get(normalizeUri(textDocument.uri));
         if (!document) {
             throw new Error('Cannot call methods on an unopened document');
         }
@@ -108,6 +115,10 @@ export class DocumentManager {
         this.emitter.on(name, listener);
     }
 
+    get(uri: string) {
+        return this.documents.get(normalizeUri(uri));
+    }
+
     private notify(name: DocumentEvent, document: Document) {
         this.emitter.emit(name, document);
     }

packages/language-server/src/plugins/PluginHost.ts

@@ -314,7 +314,7 @@ export class PluginHost implements LSProvider, OnWatchFileChanges {
     }
 
     private getDocument(uri: string) {
-        return this.documentsManager.documents.get(uri);
+        return this.documentsManager.get(uri);
     }
 
     private execute<T>(

packages/language-server/src/server.ts

@@ -68,7 +68,9 @@ export function startServer(options?: LSOptions) {
             connection = createConnection(process.stdin, process.stdout);
         } else {
             connection = createConnection(
-                new IPCMessageReader(process), new IPCMessageWriter(process));
+                new IPCMessageReader(process),
+                new IPCMessageWriter(process),
+            );
         }
     }
 
@@ -276,7 +278,7 @@ export function startServer(options?: LSOptions) {
     );
 
     connection.onRequest('$/getCompiledCode', async (uri: DocumentUri) => {
-        const doc = docManager.documents.get(uri);
+        const doc = docManager.get(uri);
         if (!doc) return null;
 
         if (doc) {

packages/language-server/src/svelte-check.ts

@@ -65,7 +65,7 @@ export class SvelteCheck {
                 const diagnostics = await this.pluginHost.getDiagnostics({ uri });
                 return {
                     filePath: urlToPath(uri) || '',
-                    text: this.docManager.documents.get(uri)?.getText() || '',
+                    text: this.docManager.get(uri)?.getText() || '',
                     diagnostics,
                 };
             }),

packages/language-server/src/utils.ts

@@ -17,6 +17,15 @@ export function pathToUrl(path: string) {
     return URI.file(path).toString();
 }
 
+/**
+ * URIs coming from the client could be encoded in a different
+ * way than expected / than the internal services create them.
+ * This normalizes them to be the same as the internally generated ones.
+ */
+export function normalizeUri(uri: string): string {
+    return URI.parse(uri).toString();
+}
+
 export function flatten<T>(arr: T[][]): T[] {
     return arr.reduce((all, item) => [...all, ...item], []);
 }