Fix package reset on Windows (#1614)

* Fix package reset on Windows

For versions of sourcekit-lsp prior to 6.1, the .build
folder cannot be removed for package reset on Windows.
To make this work stop the server and then restart it
after the reset is done

Issue: #1210

* Remove .only

* Always stop on windows

Author: award999

src/commands/resetPackage.ts

@@ -47,6 +47,19 @@ export async function folderResetPackage(folderContext: FolderContext) {
         folderContext.toolchain
     );
 
+    const languageClientManager = () =>
+        folderContext.workspaceContext.languageClientManager.get(folderContext);
+    const shouldStop = process.platform === "win32";
+    if (shouldStop) {
+        await vscode.window.withProgress(
+            {
+                title: "Stopping the SourceKit-LSP server",
+                location: vscode.ProgressLocation.Window,
+            },
+            async () => await languageClientManager().stop(false)
+        );
+    }
+
     return await executeTaskWithUI(task, "Reset Package", folderContext).then(
         async success => {
             if (!success) {
@@ -69,6 +82,9 @@ export async function folderResetPackage(folderContext: FolderContext) {
                 "Resolving Dependencies",
                 folderContext
             );
+            if (shouldStop) {
+                await languageClientManager().restart();
+            }
             return result;
         },
         reason => {

src/sourcekit-lsp/LanguageClientManager.ts

@@ -176,9 +176,12 @@ export class LanguageClientManager implements vscode.Disposable {
 
     // The language client stops asnyhronously, so we need to wait for it to stop
     // instead of doing it in dispose, which must be synchronous.
-    async stop() {
+    async stop(dispose: boolean = true) {
         if (this.languageClient && this.languageClient.state === State.Running) {
-            await this.languageClient.dispose();
+            await this.languageClient.stop(15000);
+            if (dispose) {
+                await this.languageClient.dispose();
+            }
         }
     }
 

test/integration-tests/commands/dependency.test.ts

@@ -53,7 +53,7 @@ suite("Dependency Commmands Test Suite", function () {
     });
 
     // Skipping: https://github.com/swiftlang/vscode-swift/issues/1316
-    suite.skip("Swift: Use Local Dependency", function () {
+    suite("Swift: Use Local Dependency", function () {
         let treeProvider: ProjectPanelProvider;
 
         setup(async () => {
@@ -106,10 +106,6 @@ suite("Dependency Commmands Test Suite", function () {
         }
 
         test("Swift: Reset Package Dependencies", async function () {
-            // spm reset after using local dependency is broken on windows
-            if (process.platform === "win32") {
-                this.skip();
-            }
             await useLocalDependencyTest();
 
             // spm reset