@zzzen/pyright-internal 1.2.0-dev.20231126 → 1.2.0-dev.20231210

package/dist/languageServerBase.js

@@ -26,9 +26,9 @@ const configOptions_1 = require("./common/configOptions");
 const console_1 = require("./common/console");
 const diagnostic_1 = require("./common/diagnostic");
 const lspUtils_1 = require("./common/lspUtils");
-const pathUtils_1 = require("./common/pathUtils");
 const progressReporter_1 = require("./common/progressReporter");
-const uriParser_1 = require("./common/uriParser");
+const uri_1 = require("./common/uri/uri");
+const uriUtils_1 = require("./common/uri/uriUtils");
 const analyzerServiceExecutor_1 = require("./languageService/analyzerServiceExecutor");
 const callHierarchyProvider_1 = require("./languageService/callHierarchyProvider");
 const completionProvider_1 = require("./languageService/completionProvider");
@@ -103,14 +103,14 @@ var VSDiagnosticRank;
     VSDiagnosticRank.Lowest = 500;
 })(VSDiagnosticRank || (exports.VSDiagnosticRank = VSDiagnosticRank = {}));
 class LanguageServerBase {
-    constructor(serverOptions, connection, uriParserFactory = (fs) => new uriParser_1.UriParser(fs)) {
+    constructor(serverOptions, connection) {
         var _a, _b;
         this.serverOptions = serverOptions;
         this.connection = connection;
         this._lastTriggerKind = vscode_languageserver_1.CompletionTriggerKind.Invoked;
         this._initialized = false;
         // Global root path - the basis for all global settings.
-        this.rootPath = '';
+        this.rootUri = uri_1.Uri.empty();
         this.client = {
             hasConfigurationCapability: false,
             hasVisualStudioExtensionsCapability: false,
@@ -139,13 +139,12 @@ class LanguageServerBase {
         this.documentsWithDiagnostics = new Set();
         // Stash the base directory into a global variable.
         // This must happen before fs.getModulePath().
-        global.__rootDirectory = serverOptions.rootDirectory;
+        global.__rootDirectory = serverOptions.rootDirectory.getFilePath();
         this.console.info(`${serverOptions.productName} language server ${serverOptions.version && serverOptions.version + ' '}starting`);
         this.console.info(`Server root directory: ${serverOptions.rootDirectory}`);
         this.fs = this.serverOptions.serviceProvider.fs();
-        this.uriParser = uriParserFactory(this.fs);
-        this.workspaceFactory = new workspaceFactory_1.WorkspaceFactory(this.console, this.uriParser, 
-        /* isWeb */ false, this.createAnalyzerServiceForWorkspace.bind(this), this.isPythonPathImmutable.bind(this), this.onWorkspaceCreated.bind(this), this.onWorkspaceRemoved.bind(this));
+        this.workspaceFactory = new workspaceFactory_1.WorkspaceFactory(this.console, 
+        /* isWeb */ false, this.createAnalyzerServiceForWorkspace.bind(this), this.isPythonPathImmutable.bind(this), this.onWorkspaceCreated.bind(this), this.onWorkspaceRemoved.bind(this), this.fs.isCaseSensitive);
         // Set the working directory to a known location within
         // the extension directory. Otherwise the execution of
         // python can have unintended and surprising results.
@@ -175,10 +174,6 @@ class LanguageServerBase {
         this.openFileMap.clear();
         (_a = this._workspaceFoldersChangedDisposable) === null || _a === void 0 ? void 0 : _a.dispose();
     }
-    // Convert uri to path
-    decodeTextDocumentUri(uriString) {
-        return this.uriParser.decodeTextDocumentUri(uriString);
-    }
     // Creates a service instance that's used for analyzing a
     // program within a workspace.
     createAnalyzerService(name, services, libraryReanalysisTimeProvider) {
@@ -207,11 +202,11 @@ class LanguageServerBase {
         }
         return workspaces;
     }
-    async getWorkspaceForFile(filePath, pythonPath) {
-        return this.workspaceFactory.getWorkspaceForFile(filePath, pythonPath);
+    async getWorkspaceForFile(fileUri, pythonPath) {
+        return this.workspaceFactory.getWorkspaceForFile(fileUri, pythonPath);
     }
-    async getContainingWorkspacesForFile(filePath) {
-        return this.workspaceFactory.getContainingWorkspacesForFile(filePath);
+    async getContainingWorkspacesForFile(fileUri) {
+        return this.workspaceFactory.getContainingWorkspacesForFile(fileUri);
     }
     reanalyze() {
         this.workspaceFactory.items().forEach((workspace) => {
@@ -244,7 +239,7 @@ class LanguageServerBase {
         // Set logging level first.
         this.console.level = (_a = serverSettings.logLevel) !== null && _a !== void 0 ? _a : console_1.LogLevel.Info;
         // Apply the new path to the workspace (before restarting the service).
-        serverSettings.pythonPath = this.workspaceFactory.applyPythonPath(workspace, serverSettings.pythonPath);
+        serverSettings.pythonPath = this.workspaceFactory.applyPythonPath(workspace, serverSettings.pythonPath ? serverSettings.pythonPath : undefined);
         // Then use the updated settings to restart the service.
         this.updateOptionsAndRestartService(workspace, serverSettings);
         workspace.disableLanguageServices = !!serverSettings.disableLanguageServices;
@@ -256,10 +251,10 @@ class LanguageServerBase {
     }
     updateOptionsAndRestartService(workspace, serverSettings, typeStubTargetImportName) {
         var _a;
-        analyzerServiceExecutor_1.AnalyzerServiceExecutor.runWithOptions(this.rootPath, workspace, serverSettings, typeStubTargetImportName);
-        workspace.searchPathsToWatch = (_a = workspace.service.librarySearchPathsToWatch) !== null && _a !== void 0 ? _a : [];
+        analyzerServiceExecutor_1.AnalyzerServiceExecutor.runWithOptions(this.rootUri, workspace, serverSettings, typeStubTargetImportName);
+        workspace.searchPathsToWatch = (_a = workspace.service.librarySearchUrisToWatch) !== null && _a !== void 0 ? _a : [];
     }
-    isPythonPathImmutable(filePath) {
+    isPythonPathImmutable(fileUri) {
         // This function is called to determine if the file is using
         // a special pythonPath separate from a workspace or not.
         // The default is no.
@@ -269,7 +264,7 @@ class LanguageServerBase {
         if (this.client.hasConfigurationCapability) {
             const item = {};
             if (scopeUri !== undefined) {
-                item.scopeUri = scopeUri;
+                item.scopeUri = scopeUri.toString();
             }
             if (section !== undefined) {
                 item.section = section;
@@ -341,7 +336,7 @@ class LanguageServerBase {
         if (params.locale) {
             (0, localize_1.setLocaleOverride)(params.locale);
         }
-        this.rootPath = params.rootPath || '';
+        this.rootUri = params.rootUri ? uri_1.Uri.parse(params.rootUri, this.fs.isCaseSensitive) : uri_1.Uri.empty();
         const capabilities = params.capabilities;
         this.client.hasConfigurationCapability = !!((_a = capabilities.workspace) === null || _a === void 0 ? void 0 : _a.configuration);
         this.client.hasWatchFileCapability = !!((_c = (_b = capabilities.workspace) === null || _b === void 0 ? void 0 : _b.didChangeWatchedFiles) === null || _c === void 0 ? void 0 : _c.dynamicRegistration);
@@ -461,18 +456,18 @@ class LanguageServerBase {
     }
     async getDefinitions(params, token, filter, getDefinitionsFunc) {
         this.recordUserInteractionTime();
-        const { filePath, position } = this.uriParser.decodeTextDocumentPosition(params.textDocument, params.position);
-        const workspace = await this.getWorkspaceForFile(filePath);
+        const uri = uri_1.Uri.parse(params.textDocument.uri, this.fs.isCaseSensitive);
+        const workspace = await this.getWorkspaceForFile(uri);
         if (workspace.disableLanguageServices) {
             return undefined;
         }
-        const locations = getDefinitionsFunc(workspace, filePath, position, filter, token);
+        const locations = getDefinitionsFunc(workspace, uri, params.position, filter, token);
         if (!locations) {
             return undefined;
         }
         return locations
-            .filter((loc) => this.canNavigateToFile(loc.path, workspace.service.fs))
-            .map((loc) => vscode_languageserver_1.Location.create((0, pathUtils_1.convertPathToUri)(workspace.service.fs, loc.path), loc.range));
+            .filter((loc) => this.canNavigateToFile(loc.uri, workspace.service.fs))
+            .map((loc) => vscode_languageserver_1.Location.create(loc.uri.toString(), loc.range));
     }
     async onReferences(params, token, workDoneReporter, resultReporter, createDocumentRange, convertToLocation) {
         if (this._pendingFindAllRefsCancellationSource) {
@@ -486,13 +481,13 @@ class LanguageServerBase {
         const source = progress.source;
         this._pendingFindAllRefsCancellationSource = source;
         try {
-            const { filePath, position } = this.uriParser.decodeTextDocumentPosition(params.textDocument, params.position);
-            const workspace = await this.getWorkspaceForFile(filePath);
+            const uri = uri_1.Uri.parse(params.textDocument.uri, this.fs.isCaseSensitive);
+            const workspace = await this.getWorkspaceForFile(uri);
             if (workspace.disableLanguageServices) {
                 return;
             }
             return workspace.service.run((program) => {
-                return new referencesProvider_1.ReferencesProvider(program, source.token, createDocumentRange, convertToLocation).reportReferences(filePath, position, params.context.includeDeclaration, resultReporter);
+                return new referencesProvider_1.ReferencesProvider(program, source.token, createDocumentRange, convertToLocation).reportReferences(uri, params.position, params.context.includeDeclaration, resultReporter);
             }, token);
         }
         finally {
@@ -502,13 +497,13 @@ class LanguageServerBase {
     }
     async onDocumentSymbol(params, token) {
         this.recordUserInteractionTime();
-        const filePath = this.uriParser.decodeTextDocumentUri(params.textDocument.uri);
-        const workspace = await this.getWorkspaceForFile(filePath);
+        const uri = uri_1.Uri.parse(params.textDocument.uri, this.fs.isCaseSensitive);
+        const workspace = await this.getWorkspaceForFile(uri);
         if (workspace.disableLanguageServices) {
             return undefined;
         }
         return workspace.service.run((program) => {
-            return new documentSymbolProvider_1.DocumentSymbolProvider(program, filePath, this.client.hasHierarchicalDocumentSymbolCapability, token).getSymbols();
+            return new documentSymbolProvider_1.DocumentSymbolProvider(program, uri, this.client.hasHierarchicalDocumentSymbolCapability, token).getSymbols();
         }, token);
     }
     onWorkspaceSymbol(params, token, resultReporter) {
@@ -516,27 +511,27 @@ class LanguageServerBase {
         return Promise.resolve(result);
     }
     async onHover(params, token) {
-        const { filePath, position } = this.uriParser.decodeTextDocumentPosition(params.textDocument, params.position);
-        const workspace = await this.getWorkspaceForFile(filePath);
+        const uri = uri_1.Uri.parse(params.textDocument.uri, this.fs.isCaseSensitive);
+        const workspace = await this.getWorkspaceForFile(uri);
         return workspace.service.run((program) => {
-            return new hoverProvider_1.HoverProvider(program, filePath, position, this.client.hoverContentFormat, token).getHover();
+            return new hoverProvider_1.HoverProvider(program, uri, params.position, this.client.hoverContentFormat, token).getHover();
         }, token);
     }
     async onDocumentHighlight(params, token) {
-        const { filePath, position } = this.uriParser.decodeTextDocumentPosition(params.textDocument, params.position);
-        const workspace = await this.getWorkspaceForFile(filePath);
+        const uri = uri_1.Uri.parse(params.textDocument.uri, this.fs.isCaseSensitive);
+        const workspace = await this.getWorkspaceForFile(uri);
         return workspace.service.run((program) => {
-            return new documentHighlightProvider_1.DocumentHighlightProvider(program, filePath, position, token).getDocumentHighlight();
+            return new documentHighlightProvider_1.DocumentHighlightProvider(program, uri, params.position, token).getDocumentHighlight();
         }, token);
     }
     async onSignatureHelp(params, token) {
-        const { filePath, position } = this.uriParser.decodeTextDocumentPosition(params.textDocument, params.position);
-        const workspace = await this.getWorkspaceForFile(filePath);
+        const uri = uri_1.Uri.parse(params.textDocument.uri, this.fs.isCaseSensitive);
+        const workspace = await this.getWorkspaceForFile(uri);
         if (workspace.disableLanguageServices) {
             return;
         }
         return workspace.service.run((program) => {
-            return new signatureHelpProvider_1.SignatureHelpProvider(program, filePath, position, this.client.signatureDocFormat, this.client.hasSignatureLabelOffsetCapability, this.client.hasActiveParameterCapability, params.context, token).getSignatureHelp();
+            return new signatureHelpProvider_1.SignatureHelpProvider(program, uri, params.position, this.client.signatureDocFormat, this.client.hasSignatureLabelOffsetCapability, this.client.hasActiveParameterCapability, params.context, token).getSignatureHelp();
         }, token);
     }
     setCompletionIncomplete(params, completions) {
@@ -557,14 +552,14 @@ class LanguageServerBase {
         }
     }
     async onCompletion(params, token) {
-        const { filePath, position } = this.uriParser.decodeTextDocumentPosition(params.textDocument, params.position);
-        const workspace = await this.getWorkspaceForFile(filePath);
+        const uri = uri_1.Uri.parse(params.textDocument.uri, this.fs.isCaseSensitive);
+        const workspace = await this.getWorkspaceForFile(uri);
         if (workspace.disableLanguageServices) {
             return null;
         }
         return workspace.service.run((program) => {
             var _a;
-            const completions = new completionProvider_1.CompletionProvider(program, workspace.rootPath, filePath, position, {
+            const completions = new completionProvider_1.CompletionProvider(program, workspace.rootUri, uri, params.position, {
                 format: this.client.completionDocFormat,
                 snippet: this.client.completionSupportsSnippet,
                 lazyEdit: false,
@@ -582,10 +577,11 @@ class LanguageServerBase {
     // cache that result and never call us back.
     async onCompletionResolve(params, token) {
         const completionItemData = (0, lspUtils_1.fromLSPAny)(params.data);
-        if (completionItemData && completionItemData.filePath) {
-            const workspace = await this.getWorkspaceForFile(completionItemData.filePath);
+        if (completionItemData && completionItemData.uri) {
+            const uri = uri_1.Uri.parse(completionItemData.uri, this.fs.isCaseSensitive);
+            const workspace = await this.getWorkspaceForFile(uri);
             workspace.service.run((program) => {
-                return new completionProvider_1.CompletionProvider(program, workspace.rootPath, completionItemData.filePath, completionItemData.position, {
+                return new completionProvider_1.CompletionProvider(program, workspace.rootUri, uri, completionItemData.position, {
                     format: this.client.completionDocFormat,
                     snippet: this.client.completionSupportsSnippet,
                     lazyEdit: false,
@@ -595,104 +591,104 @@ class LanguageServerBase {
         return params;
     }
     async onPrepareRenameRequest(params, token) {
-        const { filePath, position } = this.uriParser.decodeTextDocumentPosition(params.textDocument, params.position);
-        const isUntitled = this.uriParser.isUntitled(params.textDocument.uri);
-        const workspace = await this.getWorkspaceForFile(filePath);
+        const uri = uri_1.Uri.parse(params.textDocument.uri, this.fs.isCaseSensitive);
+        const isUntitled = uri.isUntitled();
+        const workspace = await this.getWorkspaceForFile(uri);
         if (workspace.disableLanguageServices) {
             return null;
         }
         return workspace.service.run((program) => {
-            return new renameProvider_1.RenameProvider(program, filePath, position, token).canRenameSymbol(workspace.kinds.includes(workspaceFactory_1.WellKnownWorkspaceKinds.Default), isUntitled);
+            return new renameProvider_1.RenameProvider(program, uri, params.position, token).canRenameSymbol(workspace.kinds.includes(workspaceFactory_1.WellKnownWorkspaceKinds.Default), isUntitled);
         }, token);
     }
     async onRenameRequest(params, token) {
-        const { filePath, position } = this.uriParser.decodeTextDocumentPosition(params.textDocument, params.position);
-        const isUntitled = this.uriParser.isUntitled(params.textDocument.uri);
-        const workspace = await this.getWorkspaceForFile(filePath);
+        const uri = uri_1.Uri.parse(params.textDocument.uri, this.fs.isCaseSensitive);
+        const isUntitled = uri.isUntitled();
+        const workspace = await this.getWorkspaceForFile(uri);
         if (workspace.disableLanguageServices) {
             return;
         }
         return workspace.service.run((program) => {
-            return new renameProvider_1.RenameProvider(program, filePath, position, token).renameSymbol(params.newName, workspace.kinds.includes(workspaceFactory_1.WellKnownWorkspaceKinds.Default), isUntitled);
+            return new renameProvider_1.RenameProvider(program, uri, params.position, token).renameSymbol(params.newName, workspace.kinds.includes(workspaceFactory_1.WellKnownWorkspaceKinds.Default), isUntitled);
         }, token);
     }
     async onCallHierarchyPrepare(params, token) {
-        const { filePath, position } = this.uriParser.decodeTextDocumentPosition(params.textDocument, params.position);
-        const workspace = await this.getWorkspaceForFile(filePath);
+        const uri = uri_1.Uri.parse(params.textDocument.uri, this.fs.isCaseSensitive);
+        const workspace = await this.getWorkspaceForFile(uri);
         if (workspace.disableLanguageServices) {
             return null;
         }
         return workspace.service.run((program) => {
-            return new callHierarchyProvider_1.CallHierarchyProvider(program, filePath, position, token).onPrepare();
+            return new callHierarchyProvider_1.CallHierarchyProvider(program, uri, params.position, token).onPrepare();
         }, token);
     }
     async onCallHierarchyIncomingCalls(params, token) {
-        const { filePath, position } = this.uriParser.decodeTextDocumentPosition(params.item, params.item.range.start);
-        const workspace = await this.getWorkspaceForFile(filePath);
+        const uri = uri_1.Uri.parse(params.item.uri, this.fs.isCaseSensitive);
+        const workspace = await this.getWorkspaceForFile(uri);
         if (workspace.disableLanguageServices) {
             return null;
         }
         return workspace.service.run((program) => {
-            return new callHierarchyProvider_1.CallHierarchyProvider(program, filePath, position, token).getIncomingCalls();
+            return new callHierarchyProvider_1.CallHierarchyProvider(program, uri, params.item.range.start, token).getIncomingCalls();
         }, token);
     }
     async onCallHierarchyOutgoingCalls(params, token) {
-        const { filePath, position } = this.uriParser.decodeTextDocumentPosition(params.item, params.item.range.start);
-        const workspace = await this.getWorkspaceForFile(filePath);
+        const uri = uri_1.Uri.parse(params.item.uri, this.fs.isCaseSensitive);
+        const workspace = await this.getWorkspaceForFile(uri);
         if (workspace.disableLanguageServices) {
             return null;
         }
         return workspace.service.run((program) => {
-            return new callHierarchyProvider_1.CallHierarchyProvider(program, filePath, position, token).getOutgoingCalls();
+            return new callHierarchyProvider_1.CallHierarchyProvider(program, uri, params.item.range.start, token).getOutgoingCalls();
         }, token);
     }
     async onDidOpenTextDocument(params, ipythonMode = sourceFile_1.IPythonMode.None) {
-        const filePath = this.uriParser.decodeTextDocumentUri(params.textDocument.uri);
-        let doc = this.openFileMap.get(filePath);
+        const uri = uri_1.Uri.parse(params.textDocument.uri, this.fs.isCaseSensitive);
+        let doc = this.openFileMap.get(uri.key);
         if (doc) {
             // We shouldn't get an open text document request for an already-opened doc.
-            this.console.error(`Received redundant open text document command for ${filePath}`);
+            this.console.error(`Received redundant open text document command for ${uri}`);
             vscode_languageserver_textdocument_1.TextDocument.update(doc, [{ text: params.textDocument.text }], params.textDocument.version);
         }
         else {
-            doc = vscode_languageserver_textdocument_1.TextDocument.create(filePath, 'python', params.textDocument.version, params.textDocument.text);
+            doc = vscode_languageserver_textdocument_1.TextDocument.create(params.textDocument.uri, 'python', params.textDocument.version, params.textDocument.text);
         }
-        this.openFileMap.set(filePath, doc);
+        this.openFileMap.set(uri.key, doc);
         // Send this open to all the workspaces that might contain this file.
-        const workspaces = await this.getContainingWorkspacesForFile(filePath);
+        const workspaces = await this.getContainingWorkspacesForFile(uri);
         workspaces.forEach((w) => {
-            w.service.setFileOpened(filePath, params.textDocument.version, params.textDocument.text, ipythonMode);
+            w.service.setFileOpened(uri, params.textDocument.version, params.textDocument.text, ipythonMode);
         });
     }
     async onDidChangeTextDocument(params, ipythonMode = sourceFile_1.IPythonMode.None) {
         this.recordUserInteractionTime();
-        const filePath = this.uriParser.decodeTextDocumentUri(params.textDocument.uri);
-        const doc = this.openFileMap.get(filePath);
+        const uri = uri_1.Uri.parse(params.textDocument.uri, this.fs.isCaseSensitive);
+        const doc = this.openFileMap.get(uri.key);
         if (!doc) {
             // We shouldn't get a change text request for a closed doc.
-            this.console.error(`Received change text document command for closed file ${filePath}`);
+            this.console.error(`Received change text document command for closed file ${uri}`);
             return;
         }
         vscode_languageserver_textdocument_1.TextDocument.update(doc, params.contentChanges, params.textDocument.version);
         const newContents = doc.getText();
         // Send this change to all the workspaces that might contain this file.
-        const workspaces = await this.getContainingWorkspacesForFile(filePath);
+        const workspaces = await this.getContainingWorkspacesForFile(uri);
         workspaces.forEach((w) => {
-            w.service.updateOpenFileContents(filePath, params.textDocument.version, newContents, ipythonMode);
+            w.service.updateOpenFileContents(uri, params.textDocument.version, newContents, ipythonMode);
         });
     }
     async onDidCloseTextDocument(params) {
-        const filePath = this.uriParser.decodeTextDocumentUri(params.textDocument.uri);
+        const uri = uri_1.Uri.parse(params.textDocument.uri, this.fs.isCaseSensitive);
         // Send this close to all the workspaces that might contain this file.
-        const workspaces = await this.getContainingWorkspacesForFile(filePath);
+        const workspaces = await this.getContainingWorkspacesForFile(uri);
         workspaces.forEach((w) => {
-            w.service.setFileClosed(filePath);
+            w.service.setFileClosed(uri);
         });
-        this.openFileMap.delete(filePath);
+        this.openFileMap.delete(uri.key);
     }
     onDidChangeWatchedFiles(params) {
         params.changes.forEach((change) => {
-            const filePath = this.fs.realCasePath(this.uriParser.decodeTextDocumentUri(change.uri));
+            const filePath = this.fs.realCasePath(uri_1.Uri.parse(change.uri, this.fs.isCaseSensitive));
             const eventType = change.type === 1 ? 'add' : 'change';
             this.serverOptions.fileWatcherHandler.onFileChange(eventType, filePath);
         });
@@ -746,7 +742,7 @@ class LanguageServerBase {
     convertDiagnostics(fs, fileDiagnostics) {
         return [
             {
-                uri: (0, pathUtils_1.convertPathToUri)(fs, fileDiagnostics.filePath),
+                uri: fileDiagnostics.fileUri.toString(),
                 version: fileDiagnostics.version,
                 diagnostics: this._convertDiagnostics(fs, fileDiagnostics.diagnostics),
             },
@@ -758,7 +754,7 @@ class LanguageServerBase {
     onAnalysisCompletedHandler(fs, results) {
         // Send the computed diagnostics to the client.
         results.diagnostics.forEach((fileDiag) => {
-            if (!this.canNavigateToFile(fileDiag.filePath, fs)) {
+            if (!this.canNavigateToFile(fileDiag.fileUri, fs)) {
                 return;
             }
             this.sendDiagnostics(this.convertDiagnostics(fs, fileDiag));
@@ -796,10 +792,10 @@ class LanguageServerBase {
         const documentsWithDiagnosticsList = [...this.documentsWithDiagnostics];
         const otherWorkspaces = this.workspaceFactory.items().filter((w) => w !== workspace);
         for (const uri of documentsWithDiagnosticsList) {
-            const filePath = (0, pathUtils_1.convertUriToPath)(workspace.service.fs, uri);
-            if (workspace.service.isTracked(filePath)) {
+            const fileUri = uri_1.Uri.parse(uri, this.fs.isCaseSensitive);
+            if (workspace.service.isTracked(fileUri)) {
                 // Do not clean up diagnostics for files tracked by multiple workspaces
-                if (otherWorkspaces.some((w) => w.service.isTracked(filePath))) {
+                if (otherWorkspaces.some((w) => w.service.isTracked(fileUri))) {
                     continue;
                 }
                 this.sendDiagnostics([
@@ -811,7 +807,7 @@ class LanguageServerBase {
             }
         }
     }
-    createAnalyzerServiceForWorkspace(name, _rootPath, _uri, kinds, services) {
+    createAnalyzerServiceForWorkspace(name, uri, kinds, services) {
         // 5 seconds default
         const defaultBackOffTime = 5 * 1000;
         // 10 seconds back off for multi workspace.
@@ -886,13 +882,13 @@ class LanguageServerBase {
             // Dedup search paths from all workspaces.
             // Get rid of any search path under workspace root since it is already watched by
             // "**" above.
-            const foldersToWatch = (0, pathUtils_1.deduplicateFolders)(this.workspaceFactory
+            const foldersToWatch = (0, uriUtils_1.deduplicateFolders)(this.workspaceFactory
                 .getNonDefaultWorkspaces()
-                .map((w) => w.searchPathsToWatch.filter((p) => !p.startsWith(w.rootPath))));
+                .map((w) => w.searchPathsToWatch.filter((p) => !p.startsWith(w.rootUri))));
             foldersToWatch.forEach((p) => {
-                const globPattern = (0, pathUtils_1.isFile)(this.fs, p, /* treatZipDirectoryAsFile */ true)
-                    ? { baseUri: (0, pathUtils_1.convertPathToUri)(this.fs, (0, pathUtils_1.getDirectoryPath)(p)), pattern: (0, pathUtils_1.getFileName)(p) }
-                    : { baseUri: (0, pathUtils_1.convertPathToUri)(this.fs, p), pattern: '**' };
+                const globPattern = (0, uriUtils_1.isFile)(this.fs, p, /* treatZipDirectoryAsFile */ true)
+                    ? { baseUri: p.getDirectory().toString(), pattern: p.fileName }
+                    : { baseUri: p.toString(), pattern: '**' };
                 watchers.push({ globPattern, kind: watchKind });
             });
         }
@@ -971,8 +967,8 @@ class LanguageServerBase {
             const relatedInfo = diag.getRelatedInfo();
             if (relatedInfo.length > 0) {
                 vsDiag.relatedInformation = relatedInfo
-                    .filter((info) => this.canNavigateToFile(info.filePath, fs))
-                    .map((info) => vscode_languageserver_1.DiagnosticRelatedInformation.create(vscode_languageserver_1.Location.create((0, pathUtils_1.convertPathToUri)(fs, info.filePath), info.range), info.message));
+                    .filter((info) => this.canNavigateToFile(uri_1.Uri.fromJsonObj(info.uri), fs))
+                    .map((info) => vscode_languageserver_1.DiagnosticRelatedInformation.create(vscode_languageserver_1.Location.create(uri_1.Uri.fromJsonObj(info.uri).toString(), info.range), info.message));
             }
             convertedDiags.push(vsDiag);
         });