Cleanup + fix file lookup in sourcemap

Fixes #88

Author: JohnnyMorganz

src/Workspace.cpp

@@ -2,22 +2,6 @@
 #include <limits.h>
 #include "LSP/Workspace.hpp"
 
-/// Checks whether a provided file is part of the workspace
-bool WorkspaceFolder::isInWorkspace(const lsp::DocumentUri& file)
-{
-    if (file == rootUri)
-        return true;
-
-    // Check if the root uri is a prefix of the file
-    auto prefixStr = rootUri.toString();
-    auto checkStr = file.toString();
-    if (checkStr.compare(0, prefixStr.size(), prefixStr) == 0)
-    {
-        return true;
-    }
-    return false;
-}
-
 void WorkspaceFolder::openTextDocument(const lsp::DocumentUri& uri, const lsp::DidOpenTextDocumentParams& params)
 {
     auto moduleName = fileResolver.getModuleName(uri);

src/WorkspaceFileResolver.cpp

@@ -288,7 +288,7 @@ void WorkspaceFileResolver::writePathsToMap(const SourceNodePtr& node, const std
     if (auto realPath = node->getScriptFilePath())
     {
         std::error_code ec;
-        auto canonicalName = std::filesystem::weakly_canonical(*realPath, ec);
+        auto canonicalName = std::filesystem::weakly_canonical(rootUri.fsPath() / *realPath, ec);
         if (ec.value() != 0)
             canonicalName = *realPath;
         realPathsToSourceNodes[canonicalName.generic_string()] = node;

src/include/LSP/Workspace.hpp

@@ -44,9 +44,6 @@ class WorkspaceFolder
     // Sets up the workspace folder after receiving configuration information
     void setupWithConfiguration(const ClientConfiguration& configuration);
 
-    /// Checks whether a provided file is part of the workspace
-    bool isInWorkspace(const lsp::DocumentUri& file);
-
     void openTextDocument(const lsp::DocumentUri& uri, const lsp::DidOpenTextDocumentParams& params);
     void updateTextDocument(
         const lsp::DocumentUri& uri, const lsp::DidChangeTextDocumentParams& params, std::vector<Luau::ModuleName>* markedDirty = nullptr);