Skip to content
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

Use the same debounced restart for all watchers #2818

Merged
merged 1 commit into from
Nov 4, 2024
Merged

Use the same debounced restart for all watchers #2818

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
32 changes: 12 additions & 20 deletions vscode/src/workspace.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@ export class Workspace implements WorkspaceInterface {
#inhibitRestart = false;
#error = false;

private readonly debouncedRestart = debounce(async (reason: string) => {
this.outputChannel.info(`Restarting the Ruby LSP because ${reason}`);
await this.restart();
}, 5000);

constructor(
context: vscode.ExtensionContext,
workspaceFolder: vscode.WorkspaceFolder,
Expand Down Expand Up @@ -376,7 +381,7 @@ export class Workspace implements WorkspaceInterface {

// Handler for only triggering restart if the contents of the file have been modified. If the file was just touched,
// but the contents are the same, we don't want to restart
const debouncedRestartWithHashCheck = debounce(async (uri: vscode.Uri) => {
const debouncedRestartWithHashCheck = async (uri: vscode.Uri) => {
const fileContents = await vscode.workspace.fs.readFile(uri);
const fsPath = uri.fsPath;

Expand All @@ -385,21 +390,14 @@ export class Workspace implements WorkspaceInterface {
const currentSha = hash.digest("hex");

if (this.restartDocumentShas.get(fsPath) !== currentSha) {
this.outputChannel.info(
`Restarting the Ruby LSP because ${pattern} changed`,
);

this.restartDocumentShas.set(fsPath, currentSha);
await this.restart();
await this.debouncedRestart(`${pattern} changed`);
}
}, 5000);
};

const debouncedRestart = debounce(async () => {
this.outputChannel.info(
`Restarting the Ruby LSP because ${pattern} changed`,
);
await this.restart();
}, 5000);
const debouncedRestart = async () => {
await this.debouncedRestart(`${pattern} changed`);
};

context.subscriptions.push(
watcher,
Expand All @@ -417,16 +415,10 @@ export class Workspace implements WorkspaceInterface {
const start = () => {
this.#inhibitRestart = true;
};
const debouncedRestart = debounce(async () => {
this.outputChannel.info(
`Restarting the Ruby LSP because ${glob} changed`,
);
await this.restart();
}, 5000);

const stop = async () => {
this.#inhibitRestart = false;
await debouncedRestart();
await this.debouncedRestart(`${glob} changed`);
};

this.context.subscriptions.push(
Expand Down
Loading