Skip to content

Hotfix for instance collision issues #414

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ZILtoid1991 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Hotfix for instance collision issues #414

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions workspace-d/source/workspaced/backend.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module workspaced.backend;

import dparse.lexer : StringCache;

import std.algorithm : canFind, map, max, min, remove, startsWith;
import std.algorithm : canFind, map, max, min, remove, startsWith, countUntil;
import std.array : array;
import std.conv;
import std.file : exists, mkdir, mkdirRecurse, rmdirRecurse, tempDir, write;
Expand Down Expand Up @@ -641,13 +641,19 @@ class WorkspaceD
}

/// Creates a new workspace with the given cwd with optional config overrides and preload components for non-autoRegister components.
/// Throws: Exception if normalized cwd already exists as instance.
/// A fix has been administered to it, which returns the already existing instance instead of throwing an exception,
/// since said exception is not handled down the line, and some editors handle the LSP protocol in different ways.
Instance addInstance(string cwd, Configuration configOverrides = Configuration.none,
string[] preloadComponents = [])
{
cwd = buildNormalizedPath(cwd);
if (instances.canFind!(a => a.cwd == cwd))
throw new Exception("Instance with cwd '" ~ cwd ~ "' already exists!");
// HACK: Either some editors like KATE uses LSP in some undocumented ways or some prior check for existing instances
// are not done. This changes the behavior to return the existing instance if one exists with the same `cwd`.
const has = instances.countUntil!(a => a.cwd == cwd);
if (has != -1)
return instances[has];
// if (instances.canFind!(a => a.cwd == cwd))
// throw new Exception("Instance with cwd '" ~ cwd ~ "' already exists!");
configOverrides.loadBase(globalConfiguration);
auto inst = createInstance(cwd, configOverrides);
this.preloadComponents(inst, preloadComponents);
Expand Down