Skip to content

fix(local-replica): handle Windows paths when syncing saved documents #397

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
Rinfly wants to merge 1 commit into
base: master
Choose a base branch
from
+16 −3
Open

fix(local-replica): handle Windows paths when syncing saved documents #397

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
19 changes: 16 additions & 3 deletions src/scm/localReplicaSCM.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import * as vscode from 'vscode';
import * as DiffMatchPatch from 'diff-match-patch';
import * as path from 'path';
import { minimatch } from 'minimatch';
import { BaseSCM, CommitItem, SettingItem } from ".";
import { VirtualFileSystem, parseUri } from '../core/remoteFileSystemProvider';
Expand Down Expand Up @@ -346,9 +347,21 @@ export class LocalReplicaSCMProvider extends BaseSCM {
*/
private onDocumentSaved(doc: vscode.TextDocument) {
const docUri = doc.uri;
// Only sync files within our baseUri (ensure path separator boundary)
const basePath = this.baseUri.path.endsWith('/') ? this.baseUri.path : this.baseUri.path + '/';
if (!docUri.path.startsWith(basePath)) { return; }

if (docUri.scheme!=='file' || this.baseUri.scheme!=='file') { return; }

const basePath = path.resolve(this.baseUri.fsPath);
const docPath = path.resolve(docUri.fsPath);
const relativePath = path.relative(basePath, docPath);
if (
relativePath===''
|| relativePath==='..'
|| relativePath.startsWith(`..${path.sep}`)
|| path.isAbsolute(relativePath)
) {
return;
}

this.syncToVFS(docUri, 'update');
}

Expand Down