fix(server): correctly handle deleted files

mrmlnc · Nov 21, 2019 · 3788844 · 3788844
1 parent 2326886
commit 3788844
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/server.ts b/src/server.ts
@@ -86,11 +86,15 @@ connection.onDidChangeConfiguration(params => {
 });
 
 connection.onDidChangeWatchedFiles(event => {
-	const files = event.changes
+	const changedFiles = event.changes
 		.filter(file => file.type === FileChangeType.Changed || file.type === FileChangeType.Created)
 		.map(file => Files.uriToFilePath(file.uri));
 
-	return scannerService.scan(files, /* recursive */ false);
+	const deletedFiles = event.changes
+		.filter(file => file.type === FileChangeType.Deleted)
+		.map(file => Files.uriToFilePath(file.uri));
+
+	return Promise.all([scannerService.scan(changedFiles, /* recursive */ false), scannerService.scan(deletedFiles)]);
 });
 
 connection.onCompletion(textDocumentPosition => {

diff --git a/src/services/scanner.ts b/src/services/scanner.ts
@@ -30,7 +30,7 @@ export default class ScannerService {
 			}
 
 			if (!isExistFile) {
-				this._storage.delete(filepath);
+				this._storage.delete(originalFilepath);
 				this._storage.delete(partialFilepath);
 
 				continue;