Merge pull request #3829 from savpek/feature/directory-removal-fix

Fix for directory remove/move/rename
dotnet · Jun 6, 2020 · 7e8bd2b · 7e8bd2b
2 parents c6cb69e + 7e1208e
commit 7e8bd2b
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 14 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -7,6 +7,7 @@
             "request": "launch",
             "runtimeExecutable": "${execPath}",
             "args": [
+                "--disable-extensions",
                 "--extensionDevelopmentPath=${workspaceRoot}"
             ],
             "stopOnEntry": false,

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -96,6 +96,7 @@
     "yauzl": "2.10.0"
   },
   "devDependencies": {
+    "@types/vscode": "1.33.0",
     "@types/archiver": "2.1.2",
     "@types/chai": "4.1.7",
     "@types/chai-arrays": "1.0.2",
@@ -3475,4 +3476,4 @@
       ]
     }
   }
-}
+}
diff --git a/src/features/changeForwarding.ts b/src/features/changeForwarding.ts
@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import {Uri, workspace} from 'vscode';
-import {OmniSharpServer} from '../omnisharp/server';
+import { Uri, workspace } from 'vscode';
+import { OmniSharpServer } from '../omnisharp/server';
 import * as serverUtils from '../omnisharp/utils';
 import { FileChangeType } from '../omnisharp/protocol';
 import { IDisposable } from '../Disposable';
@@ -14,7 +14,7 @@ function forwardDocumentChanges(server: OmniSharpServer): IDisposable {
 
     return workspace.onDidChangeTextDocument(event => {
 
-        let {document} = event;
+        let { document } = event;
         if (document.isUntitled || document.languageId !== 'csharp' || document.uri.scheme !== 'file') {
             return;
         }
@@ -23,7 +23,7 @@ function forwardDocumentChanges(server: OmniSharpServer): IDisposable {
             return;
         }
 
-        serverUtils.updateBuffer(server, {Buffer: document.getText(), FileName: document.fileName}).catch(err => {
+        serverUtils.updateBuffer(server, { Buffer: document.getText(), FileName: document.fileName }).catch(err => {
             console.error(err);
             return err;
         });
@@ -33,27 +33,46 @@ function forwardDocumentChanges(server: OmniSharpServer): IDisposable {
 function forwardFileChanges(server: OmniSharpServer): IDisposable {
 
     function onFileSystemEvent(changeType: FileChangeType): (uri: Uri) => void {
-        return function(uri: Uri) 
-        {
+        return function (uri: Uri) {
             if (!server.isRunning()) {
                 return;
             }
-            
-            let req = { FileName: uri.fsPath, changeType};
-            
+
+            let req = { FileName: uri.fsPath, changeType };
+
             serverUtils.filesChanged(server, [req]).catch(err => {
                 console.warn(`[o] failed to forward file change event for ${uri.fsPath}`, err);
                 return err;
             });
-        };  
+        };
+    }
+
+    function onFolderEvent(changeType: FileChangeType): (uri: Uri) => void {
+        return async function (uri: Uri) {
+            if (!server.isRunning()) {
+                return;
+            }
+
+            if (changeType === FileChangeType.Delete) {
+                let requests = [{ FileName: uri.fsPath, changeType: FileChangeType.DirectoryDelete }];
+
+                serverUtils.filesChanged(server, requests).catch(err => {
+                    console.warn(`[o] failed to forward file change event for ${uri.fsPath}`, err);
+                    return err;
+                });
+            }
+        };
     }
 
     const watcher = workspace.createFileSystemWatcher('**/*.*');
     let d1 = watcher.onDidCreate(onFileSystemEvent(FileChangeType.Create));
     let d2 = watcher.onDidDelete(onFileSystemEvent(FileChangeType.Delete));
     let d3 = watcher.onDidChange(onFileSystemEvent(FileChangeType.Change));
 
-    return new CompositeDisposable(watcher, d1, d2, d3);
+    const watcherForFolders = workspace.createFileSystemWatcher('**/');
+    let d4 = watcherForFolders.onDidDelete(onFolderEvent(FileChangeType.Delete));
+
+    return new CompositeDisposable(watcher, d1, d2, d3, watcherForFolders, d4);
 }
 
 export default function forwardChanges(server: OmniSharpServer): IDisposable {

diff --git a/src/omnisharp/protocol.ts b/src/omnisharp/protocol.ts
@@ -465,7 +465,8 @@ export interface FilesChangedRequest extends Request {
 export enum FileChangeType {
     Change = "Change",
     Create = "Create",
-    Delete = "Delete"
+    Delete = "Delete",
+    DirectoryDelete = "DirectoryDelete"
 }
 
 export namespace V2 {