hexedtech/codemp-vscode
3
0
Fork 0
mirror of https://github.com/hexedtech/codemp-vscode.git synced 2024-10-22 18:09:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: autoresync

Browse source
This commit is contained in:
frelodev 2024-09-28 12:42:58 +02:00
parent 28f611ad86
commit d7736c0add
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
package.json
View file

@ -201,7 +201,12 @@
"codemp.tls": { "codemp.tls": {
"type": "boolean", "type": "boolean",
"default": false, "default": false,
"description": "Wether to use TLS for connection, temporarily disabled by default" "description": "Whether to use TLS for connection, temporarily disabled by default"
},
"codemp.autoResync": {
"type": "boolean",
"default": false,
"description": "Whether to auto resync current buffer or not when out of sync"
} }
} }
} }

12
src/commands/buffers.ts
View file

@ -7,7 +7,7 @@ import {workspace} from "./workspaces";
import { LOGGER, provider } from '../extension'; import { LOGGER, provider } from '../extension';
let locks : Map<string, boolean> = new Map(); let locks : Map<string, boolean> = new Map();
let autoResync = vscode.workspace.getConfiguration('codemp').get<string>("autoResync");
export async function apply_changes_to_buffer(path: string, controller: codemp.BufferController | undefined | null, force?: boolean) { export async function apply_changes_to_buffer(path: string, controller: codemp.BufferController | undefined | null, force?: boolean) {
@ -36,7 +36,8 @@ export async function apply_changes_to_buffer(path: string, controller: codemp.B
if (event.hash !== undefined) { if (event.hash !== undefined) {
if (codemp.hash(editor.document.getText()) !== event.hash) if (codemp.hash(editor.document.getText()) !== event.hash)
vscode.window.showErrorMessage("Client out of sync"); if(autoResync) await resync(path,workspace,editor);
else vscode.window.showErrorMessage("Client out of sync");
} }
} }
locks.set(path, false); locks.set(path, false);
@ -209,6 +210,11 @@ export async function sync(selected: vscode.TreeItem | undefined) {
buffer_name = mapping.bufferMapper.by_editor(editor.document.uri); buffer_name = mapping.bufferMapper.by_editor(editor.document.uri);
if (buffer_name === undefined) throw "No such buffer managed by codemp" if (buffer_name === undefined) throw "No such buffer managed by codemp"
} }
resync(buffer_name,workspace,editor);
}
export async function resync(buffer_name : string, workspace : codemp.Workspace, editor : vscode.TextEditor){
let controller = workspace.buffer_by_name(buffer_name); let controller = workspace.buffer_by_name(buffer_name);
if (controller === null) throw "No such buffer controller" if (controller === null) throw "No such buffer controller"
@ -221,6 +227,6 @@ export async function sync(selected: vscode.TreeItem | undefined) {
locks.set(buffer_name, true); locks.set(buffer_name, true);
await editor.edit(editBuilder => editBuilder.replace(range, content)); await editor.edit(editBuilder => editBuilder.replace(range, content));
locks.set(buffer_name, false); locks.set(buffer_name, false);
} }