From 3900a2d97ff15c7ca2daabae1907e0ed37c53864 Mon Sep 17 00:00:00 2001
From: sockmaster27 <61235930+sockmaster27@users.noreply.github.com>
Date: Sun, 12 May 2024 12:22:19 +0200
Subject: [PATCH 1/6] refector: make test independant

---
 .vscode-test.js                               |   2 +-
 test/activeWorkspace/.gitkeep                 |   1 +
 test/src/codeActions.test.ts                  |  11 ++-
 test/src/codeLenses.test.ts                   |   7 +-
 test/src/completions.test.ts                  |   9 ++-
 test/src/diagnostics.test.ts                  |   7 +-
 test/src/disconnect.test.ts                   |   7 +-
 test/src/files.test.ts                        |  16 ++---
 test/src/findReferences.test.ts               |   7 +-
 test/src/hover.test.ts                        |   7 +-
 test/src/util.ts                              |  64 ++++++++++++++++--
 .../testWorkspace/lib/external/SquareArea.jar | Bin 659 -> 0 bytes
 .../lib/external/SquareArea.jar.txt           |  12 ----
 .../codeActions}/flix.toml                    |   6 --
 .../codeActions/src}/UnusedFunction.flix      |   0
 test/testWorkspaces/codeLenses/flix.toml      |   6 ++
 test/testWorkspaces/codeLenses/src/Area.flix  |  13 ++++
 .../codeLenses}/src/Main.flix                 |   0
 test/testWorkspaces/completions/flix.toml     |   6 ++
 test/testWorkspaces/diagnostics/flix.toml     |   6 ++
 .../diagnostics}/latent/NameError.flix        |   0
 .../diagnostics}/latent/RedundancyError.flix  |   0
 .../diagnostics}/latent/ResolutionError.flix  |   0
 .../diagnostics}/latent/SafetyError.flix      |   0
 .../diagnostics}/latent/TypeError.flix        |   0
 .../diagnostics/latent/UnusedFunction.flix    |  39 +++++++++++
 .../diagnostics}/latent/WeederError.flix      |   0
 test/testWorkspaces/disconnect/flix.toml      |   6 ++
 test/testWorkspaces/disconnect/src/Area.flix  |  13 ++++
 test/testWorkspaces/disconnect/src/Main.flix  |  11 +++
 test/testWorkspaces/files/flix.toml           |   6 ++
 .../files}/lib/circleArea.fpkg                | Bin
 .../files}/lib/circleArea.fpkg.txt            |   0
 .../files}/src/Area.flix                      |   3 +-
 test/testWorkspaces/files/src/Main.flix       |  11 +++
 test/testWorkspaces/findReferences/flix.toml  |   6 ++
 .../findReferences/lib/circleArea.fpkg        | Bin 0 -> 488 bytes
 .../findReferences/lib/circleArea.fpkg.txt    |   6 ++
 .../findReferences/src/Area.flix              |  13 ++++
 .../findReferences/src/Main.flix              |  11 +++
 test/testWorkspaces/hover/flix.toml           |   6 ++
 .../hover}/latent/Broken.flix                 |   0
 test/testWorkspaces/hover/src/Area.flix       |  13 ++++
 test/testWorkspaces/hover/src/Main.flix       |  11 +++
 44 files changed, 283 insertions(+), 59 deletions(-)
 create mode 100644 test/activeWorkspace/.gitkeep
 delete mode 100644 test/testWorkspace/lib/external/SquareArea.jar
 delete mode 100644 test/testWorkspace/lib/external/SquareArea.jar.txt
 rename test/{testWorkspace => testWorkspaces/codeActions}/flix.toml (57%)
 rename test/{testWorkspace/latent => testWorkspaces/codeActions/src}/UnusedFunction.flix (100%)
 create mode 100644 test/testWorkspaces/codeLenses/flix.toml
 create mode 100644 test/testWorkspaces/codeLenses/src/Area.flix
 rename test/{testWorkspace => testWorkspaces/codeLenses}/src/Main.flix (100%)
 create mode 100644 test/testWorkspaces/completions/flix.toml
 create mode 100644 test/testWorkspaces/diagnostics/flix.toml
 rename test/{testWorkspace => testWorkspaces/diagnostics}/latent/NameError.flix (100%)
 rename test/{testWorkspace => testWorkspaces/diagnostics}/latent/RedundancyError.flix (100%)
 rename test/{testWorkspace => testWorkspaces/diagnostics}/latent/ResolutionError.flix (100%)
 rename test/{testWorkspace => testWorkspaces/diagnostics}/latent/SafetyError.flix (100%)
 rename test/{testWorkspace => testWorkspaces/diagnostics}/latent/TypeError.flix (100%)
 create mode 100644 test/testWorkspaces/diagnostics/latent/UnusedFunction.flix
 rename test/{testWorkspace => testWorkspaces/diagnostics}/latent/WeederError.flix (100%)
 create mode 100644 test/testWorkspaces/disconnect/flix.toml
 create mode 100644 test/testWorkspaces/disconnect/src/Area.flix
 create mode 100644 test/testWorkspaces/disconnect/src/Main.flix
 create mode 100644 test/testWorkspaces/files/flix.toml
 rename test/{testWorkspace => testWorkspaces/files}/lib/circleArea.fpkg (100%)
 rename test/{testWorkspace => testWorkspaces/files}/lib/circleArea.fpkg.txt (100%)
 rename test/{testWorkspace => testWorkspaces/files}/src/Area.flix (72%)
 create mode 100644 test/testWorkspaces/files/src/Main.flix
 create mode 100644 test/testWorkspaces/findReferences/flix.toml
 create mode 100644 test/testWorkspaces/findReferences/lib/circleArea.fpkg
 create mode 100644 test/testWorkspaces/findReferences/lib/circleArea.fpkg.txt
 create mode 100644 test/testWorkspaces/findReferences/src/Area.flix
 create mode 100644 test/testWorkspaces/findReferences/src/Main.flix
 create mode 100644 test/testWorkspaces/hover/flix.toml
 rename test/{testWorkspace => testWorkspaces/hover}/latent/Broken.flix (100%)
 create mode 100644 test/testWorkspaces/hover/src/Area.flix
 create mode 100644 test/testWorkspaces/hover/src/Main.flix

diff --git a/.vscode-test.js b/.vscode-test.js
index e22a1505..9acbc9cf 100644
--- a/.vscode-test.js
+++ b/.vscode-test.js
@@ -10,7 +10,7 @@ const version = process.env.VSCODE_VERSION
 module.exports = defineConfig({
   version,
   files: ['test/out/**/*.test.js'],
-  workspaceFolder: 'test/testWorkspace',
+  workspaceFolder: 'test/activeWorkspace/',
 
   mocha: {
     // Downloading compiler takes a long time
diff --git a/test/activeWorkspace/.gitkeep b/test/activeWorkspace/.gitkeep
new file mode 100644
index 00000000..68934213
--- /dev/null
+++ b/test/activeWorkspace/.gitkeep
@@ -0,0 +1 @@
+# Ensure that this empty directory is checked in
diff --git a/test/src/codeActions.test.ts b/test/src/codeActions.test.ts
index a5e42039..d58ac3e9 100644
--- a/test/src/codeActions.test.ts
+++ b/test/src/codeActions.test.ts
@@ -16,23 +16,20 @@
 
 import * as assert from 'assert'
 import * as vscode from 'vscode'
-import { getTestDocUri, activate, open, copyFile, tryDeleteFile } from './util'
+import { getTestDocUri, activate, open, clearWorkspace } from './util'
 
 suite('Code actions', () => {
-  const docUriLatent = getTestDocUri('latent/UnusedFunction.flix')
   const docUri = getTestDocUri('src/UnusedFunction.flix')
 
   suiteSetup(async () => {
-    await activate()
+    await activate('codeActions')
+    await open(docUri)
   })
   teardown(async () => {
-    await tryDeleteFile(docUri)
+    await clearWorkspace()
   })
 
   test('Should propose prefixing unused def with underscore', async () => {
-    await copyFile(docUriLatent, docUri)
-    await open(docUri)
-
     const position = new vscode.Position(1, 8)
     const range = new vscode.Range(position, position)
     const r = (await vscode.commands.executeCommand(
diff --git a/test/src/codeLenses.test.ts b/test/src/codeLenses.test.ts
index b91462d7..89a98d98 100644
--- a/test/src/codeLenses.test.ts
+++ b/test/src/codeLenses.test.ts
@@ -16,14 +16,17 @@
 
 import * as assert from 'assert'
 import * as vscode from 'vscode'
-import { getTestDocUri, activate, open } from './util'
+import { getTestDocUri, activate, open, clearWorkspace } from './util'
 
 suite('Code lenses', () => {
   const mainDocUri = getTestDocUri('src/Main.flix')
   const areaDocUri = getTestDocUri('src/Area.flix')
 
   suiteSetup(async () => {
-    await activate()
+    await activate('codeLenses')
+  })
+  suiteTeardown(async () => {
+    await clearWorkspace()
   })
 
   test('Should propose running main function', async () => {
diff --git a/test/src/completions.test.ts b/test/src/completions.test.ts
index 08d71000..bdff3042 100644
--- a/test/src/completions.test.ts
+++ b/test/src/completions.test.ts
@@ -16,16 +16,16 @@
 
 import * as assert from 'assert'
 import * as vscode from 'vscode'
-import { getTestDocUri, activate, open, tryDeleteFile, addFile, typeText } from './util'
+import { getTestDocUri, activate, open, clearWorkspace, typeText, addFile } from './util'
 
 suite('Completions', () => {
   const docUri = getTestDocUri('src/Temp.flix')
 
   suiteSetup(async () => {
-    await activate()
+    await activate('completions')
   })
-  teardown(async () => {
-    await tryDeleteFile(docUri)
+  suiteTeardown(async () => {
+    await clearWorkspace()
   })
 
   test('Should propose completing mod', async () => {
@@ -33,7 +33,6 @@ suite('Completions', () => {
     await open(docUri)
     await typeText('mo')
 
-    // TODO: Figure out why this returns all possible keywords, which is not what is shown in the editor
     const position = new vscode.Position(0, 2)
     const r = (await vscode.commands.executeCommand(
       'vscode.executeCompletionItemProvider',
diff --git a/test/src/diagnostics.test.ts b/test/src/diagnostics.test.ts
index bf01672d..b85ed476 100644
--- a/test/src/diagnostics.test.ts
+++ b/test/src/diagnostics.test.ts
@@ -16,14 +16,17 @@
 
 import * as assert from 'assert'
 import * as vscode from 'vscode'
-import { getTestDocUri, activate, copyFile, deleteFile } from './util'
+import { getTestDocUri, activate, copyFile, deleteFile, clearWorkspace } from './util'
 
 suite('Diagnostics', () => {
   /** The optional URI of the document which should be deleted after each test. */
   let tempDocUri: vscode.Uri | null = null
 
   suiteSetup(async () => {
-    await activate()
+    await activate('diagnostics')
+  })
+  suiteTeardown(async () => {
+    await clearWorkspace()
   })
   teardown(async () => {
     if (tempDocUri !== null) {
diff --git a/test/src/disconnect.test.ts b/test/src/disconnect.test.ts
index db3e52e8..71272a6b 100644
--- a/test/src/disconnect.test.ts
+++ b/test/src/disconnect.test.ts
@@ -16,11 +16,14 @@
 
 import * as assert from 'assert'
 import * as vscode from 'vscode'
-import { activate, getTestDocUri, sleep } from './util'
+import { activate, clearWorkspace, getTestDocUri, sleep } from './util'
 
 suite('Server disconnect', () => {
   suiteSetup(async () => {
-    await activate()
+    await activate('disconnect')
+  })
+  suiteTeardown(async () => {
+    await clearWorkspace()
   })
 
   test('When server is disconnected a reconnection should happen automatically', async () => {
diff --git a/test/src/files.test.ts b/test/src/files.test.ts
index 560382ce..e32ba270 100644
--- a/test/src/files.test.ts
+++ b/test/src/files.test.ts
@@ -16,7 +16,7 @@
 
 import * as assert from 'assert'
 import * as vscode from 'vscode'
-import { activate, addFile, deleteFile, getTestDocUri } from './util'
+import { activate, addFile, clearWorkspace, deleteFile, getTestDocUri } from './util'
 
 suite('File manipulation', () => {
   const doc1Uri = getTestDocUri('src/Main.flix')
@@ -24,24 +24,22 @@ suite('File manipulation', () => {
   const doc2Uri = getTestDocUri('src/Area.flix')
   let doc2Content: Uint8Array
 
-  const jarUri = getTestDocUri('lib/external/SquareArea.jar')
-  let jarContent: Uint8Array
-
   const fpkgUri = getTestDocUri('lib/circleArea.fpkg')
   let fpkgContent: Uint8Array
 
   suiteSetup(async () => {
-    await activate()
+    await activate('files')
     doc2Content = await vscode.workspace.fs.readFile(doc2Uri)
-    jarContent = await vscode.workspace.fs.readFile(jarUri)
     fpkgContent = await vscode.workspace.fs.readFile(fpkgUri)
   })
-  teardown(async () => {
-    // Restore the original content of the file after each test
+  setup(async () => {
+    // Restore the original content of the files before each test
     await addFile(doc2Uri, doc2Content)
-    await addFile(jarUri, jarContent)
     await addFile(fpkgUri, fpkgContent)
   })
+  suiteTeardown(async () => {
+    await clearWorkspace()
+  })
 
   async function workspaceValid() {
     // If all files are not present in the compiler, then Main.flix will contain a resolution error
diff --git a/test/src/findReferences.test.ts b/test/src/findReferences.test.ts
index 8ba173bf..2ea24fb7 100644
--- a/test/src/findReferences.test.ts
+++ b/test/src/findReferences.test.ts
@@ -16,14 +16,17 @@
 
 import * as assert from 'assert'
 import * as vscode from 'vscode'
-import { getTestDocUri, activate } from './util'
+import { getTestDocUri, activate, clearWorkspace } from './util'
 
 suite('Find references', () => {
   const mainDocUri = getTestDocUri('src/Main.flix')
   const areaDocUri = getTestDocUri('src/Area.flix')
 
   suiteSetup(async () => {
-    await activate()
+    await activate('findReferences')
+  })
+  suiteTeardown(async () => {
+    await clearWorkspace()
   })
 
   test('Should find references to enum case', async () => {
diff --git a/test/src/hover.test.ts b/test/src/hover.test.ts
index 4e9e9ad3..693efaf8 100644
--- a/test/src/hover.test.ts
+++ b/test/src/hover.test.ts
@@ -16,7 +16,7 @@
 
 import * as assert from 'assert'
 import * as vscode from 'vscode'
-import { getTestDocUri, activate, open, copyFile, tryDeleteFile } from './util'
+import { getTestDocUri, activate, open, copyFile, tryDeleteFile, clearWorkspace } from './util'
 
 suite('Hover info', () => {
   const docUri = getTestDocUri('src/Main.flix')
@@ -25,9 +25,12 @@ suite('Hover info', () => {
   const brokenDocUri = getTestDocUri('src/Broken.flix')
 
   suiteSetup(async () => {
-    await activate()
+    await activate('hover')
     await open(docUri)
   })
+  suiteTeardown(async () => {
+    await clearWorkspace()
+  })
   teardown(async () => {
     await tryDeleteFile(brokenDocUri)
   })
diff --git a/test/src/util.ts b/test/src/util.ts
index 1001b7ed..d5323ad9 100644
--- a/test/src/util.ts
+++ b/test/src/util.ts
@@ -18,18 +18,51 @@ import * as path from 'path'
 import * as vscode from 'vscode'
 
 /**
- * Activates the extension in the `testWorkspace` directory.
+ * Activates the extension and copies the contents of the given workspace directory into the test workspace.
+ *
+ * @param testWorkspaceName The name of the workspace directory to copy, e.g. `codeActions`.
  */
-export async function activate() {
+export async function activate(testWorkspaceName: string) {
+  console.log('=======================1')
   // The extensionId is `publisher.name` from package.json
   const ext = vscode.extensions.getExtension('flix.flix')
   if (ext === undefined) {
     throw new Error('Failed to activate extension')
   }
 
+  console.log('=======================2')
   // This includes the time it takes for the compiler to download
   // The time it takes for the compiler to start will be awaited in the first command sent to the extension
   await ext.activate()
+
+  console.log('=======================3')
+  // Copy the contents of the given workspace directory into the test workspace
+  const testWorkspacePath = path.resolve(__dirname, '../testWorkspaces', testWorkspaceName)
+  const activeWorkspacePath = path.resolve(__dirname, '../activeWorkspace')
+  await copyDirContents(vscode.Uri.file(testWorkspacePath), vscode.Uri.file(activeWorkspacePath))
+
+  console.log('=======================4')
+}
+
+/**
+ * Clears the test workspace.
+ */
+export async function clearWorkspace() {
+  vscode.commands.executeCommand('workbench.action.closeAllEditors')
+
+  const activeWorkspaceUri = vscode.workspace.workspaceFolders![0].uri
+  const contents = await vscode.workspace.fs.readDirectory(activeWorkspaceUri)
+  const names = contents.map(([name, _]) => name)
+
+  // Delete all files except .gitkeep and flix.jar
+  const namesToDelete = names.filter(name => name !== '.gitkeep' && name !== 'flix.jar')
+  const urisToDelete = namesToDelete.map(name => vscode.Uri.joinPath(activeWorkspaceUri, name))
+
+  await Promise.allSettled(urisToDelete.map(deleteFile))
+
+  // Restart the compiler to clear diagnostics
+  // TODO: Find out why this doesn't work when files are removed
+  await vscode.commands.executeCommand('flix.internalRestart')
 }
 
 /**
@@ -48,7 +81,7 @@ export async function typeText(text: string) {
 }
 
 function getTestDocPath(p: string) {
-  return path.resolve(__dirname, '../testWorkspace', p)
+  return path.resolve(__dirname, '../activeWorkspace', p)
 }
 export function getTestDocUri(p: string) {
   return vscode.Uri.file(getTestDocPath(p))
@@ -68,8 +101,12 @@ async function processFileChange() {
   // Wait for the file system watcher to pick up the change
   await sleep(1000)
 
-  // Wait for the compiler to process the change
-  await vscode.commands.executeCommand('flix.allJobsFinished')
+  try {
+    // Wait for the compiler to process the change
+    await vscode.commands.executeCommand('flix.allJobsFinished')
+  } catch {
+    // Compiler is not running
+  }
 
   // Wait for the diagnostics to be updated
   await sleep(1000)
@@ -83,11 +120,24 @@ export async function addFile(uri: vscode.Uri, content: string | Uint8Array) {
   await processFileChange()
 }
 
+/**
+ * Copies the contents of the given folder `from` to the folder `to`, leaving non-overlapping files intact.
+ */
+export async function copyDirContents(from: vscode.Uri, to: vscode.Uri) {
+  const contents = await vscode.workspace.fs.readDirectory(from)
+  const names = contents.map(([name, _]) => name)
+
+  const uris = names.map(name => ({ from: vscode.Uri.joinPath(from, name), to: vscode.Uri.joinPath(to, name) }))
+
+  await Promise.allSettled(uris.map(({ from, to }) => copyFile(from, to)))
+  await processFileChange()
+}
+
 /**
  * Copy the file from `from` to `to`, and wait for the compiler to process this.
  */
 export async function copyFile(from: vscode.Uri, to: vscode.Uri) {
-  await vscode.workspace.fs.copy(from, to)
+  await vscode.workspace.fs.copy(from, to, { overwrite: true })
   await processFileChange()
 }
 
@@ -97,7 +147,7 @@ export async function copyFile(from: vscode.Uri, to: vscode.Uri) {
  * Throws if the file does not exist.
  */
 export async function deleteFile(uri: vscode.Uri) {
-  await vscode.workspace.fs.delete(uri, { useTrash: true })
+  await vscode.workspace.fs.delete(uri, { recursive: true, useTrash: true })
   await processFileChange()
 }
 
diff --git a/test/testWorkspace/lib/external/SquareArea.jar b/test/testWorkspace/lib/external/SquareArea.jar
deleted file mode 100644
index ce157cdf478ffe50ed2cb629ef7eca0042eea1c2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 659
zcmWIWW@h1HVBlb2Sm`q%f&mF|GO#fCx`sIFdiuHP|2xIN5CBvv!ob17fuU3cs12^v
z*U`_@%{4eg&)4m<@0rs+-nx1hdA)VD&Yd~GImqCO@q?#DdS1Rdp1v1LS8WM0VCs4y
zshPndk~)o%RdkM*adD7I<<5$oK-<_kmWeGfu>qQG3&aT9cXoE6I8+iSo03|lpO%wZ
zp&wjWnpl+TSd^Nmmz<MWTx|U{|GFI;8=E^@ogSMSTUr^Lm>gReo0%J1<C-IzT>j2E
zvZti>|B^LVo(Q?Inaw`4=ZuiG8(SLhS%We*J~y_9Q?3~O-7@D4*WU++E*)7Ea(vMh
z7dJMs=YOVzxUtpEKeH!f|D`)it}L2xWQoiIj&Q?GTD<<g{tF@s>M{e1Rz<6MFxnrI
zu$}Oir;F!}LwX~FFthTBM2AVjCnmFA>T#GAnr+Se*iC^sLtsJ*Gq(}*)B@uV4pUDx
zY&A02;Nh9N#xeLLpGxJyw$F^<@HlOpvFjwzx15Zi@L*)(V!$1BKxIe(9y^eTWMmRy
zKtv^SFoU8J0knZkxK^Zy1z8R=0Tdm`4g*C80;~iwaYjynH!B-RDKiir0n$5x{$gMN
E0D{M|q5uE@

diff --git a/test/testWorkspace/lib/external/SquareArea.jar.txt b/test/testWorkspace/lib/external/SquareArea.jar.txt
deleted file mode 100644
index 7d42979e..00000000
--- a/test/testWorkspace/lib/external/SquareArea.jar.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-SquareArea.jar contains the compiled class file for the following Java code:
-
-```
-package dev.flix;
-
-public class SquareArea {
-  /**
-   * Compute the area of a square given its side length.
-   */
-  public static int squareArea(int w) { return w * w; }
-}
-```
diff --git a/test/testWorkspace/flix.toml b/test/testWorkspaces/codeActions/flix.toml
similarity index 57%
rename from test/testWorkspace/flix.toml
rename to test/testWorkspaces/codeActions/flix.toml
index ea478ce3..16cfc76b 100644
--- a/test/testWorkspace/flix.toml
+++ b/test/testWorkspaces/codeActions/flix.toml
@@ -4,9 +4,3 @@ description = "test"
 version     = "0.1.0"
 flix        = "0.44.0"
 authors     = ["John Doe <john@example.com>"]
-
-[dependencies]
-"github:flix/museum" = "1.4.0"
-
-[mvn-dependencies]
-"org.apache.commons:commons-lang3" = "3.12.0"
diff --git a/test/testWorkspace/latent/UnusedFunction.flix b/test/testWorkspaces/codeActions/src/UnusedFunction.flix
similarity index 100%
rename from test/testWorkspace/latent/UnusedFunction.flix
rename to test/testWorkspaces/codeActions/src/UnusedFunction.flix
diff --git a/test/testWorkspaces/codeLenses/flix.toml b/test/testWorkspaces/codeLenses/flix.toml
new file mode 100644
index 00000000..16cfc76b
--- /dev/null
+++ b/test/testWorkspaces/codeLenses/flix.toml
@@ -0,0 +1,6 @@
+[package]
+name        = "vscode-flix-test"
+description = "test"
+version     = "0.1.0"
+flix        = "0.44.0"
+authors     = ["John Doe <john@example.com>"]
diff --git a/test/testWorkspaces/codeLenses/src/Area.flix b/test/testWorkspaces/codeLenses/src/Area.flix
new file mode 100644
index 00000000..d033174d
--- /dev/null
+++ b/test/testWorkspaces/codeLenses/src/Area.flix
@@ -0,0 +1,13 @@
+
+/// Computes the area of the given shape using
+/// pattern matching and basic arithmetic.
+def area(s: Shape): Int32 = {
+    match s {
+        case Shape.Circle(r)       => 3 * r * r
+        case Shape.Square(w)       => w * w
+        case Shape.Rectangle(h, w) => h * w
+    }
+}
+
+@Test
+def testSquareArea(): Bool = Assert.eq(area(Shape.Square(5)), 25)
diff --git a/test/testWorkspace/src/Main.flix b/test/testWorkspaces/codeLenses/src/Main.flix
similarity index 100%
rename from test/testWorkspace/src/Main.flix
rename to test/testWorkspaces/codeLenses/src/Main.flix
diff --git a/test/testWorkspaces/completions/flix.toml b/test/testWorkspaces/completions/flix.toml
new file mode 100644
index 00000000..16cfc76b
--- /dev/null
+++ b/test/testWorkspaces/completions/flix.toml
@@ -0,0 +1,6 @@
+[package]
+name        = "vscode-flix-test"
+description = "test"
+version     = "0.1.0"
+flix        = "0.44.0"
+authors     = ["John Doe <john@example.com>"]
diff --git a/test/testWorkspaces/diagnostics/flix.toml b/test/testWorkspaces/diagnostics/flix.toml
new file mode 100644
index 00000000..16cfc76b
--- /dev/null
+++ b/test/testWorkspaces/diagnostics/flix.toml
@@ -0,0 +1,6 @@
+[package]
+name        = "vscode-flix-test"
+description = "test"
+version     = "0.1.0"
+flix        = "0.44.0"
+authors     = ["John Doe <john@example.com>"]
diff --git a/test/testWorkspace/latent/NameError.flix b/test/testWorkspaces/diagnostics/latent/NameError.flix
similarity index 100%
rename from test/testWorkspace/latent/NameError.flix
rename to test/testWorkspaces/diagnostics/latent/NameError.flix
diff --git a/test/testWorkspace/latent/RedundancyError.flix b/test/testWorkspaces/diagnostics/latent/RedundancyError.flix
similarity index 100%
rename from test/testWorkspace/latent/RedundancyError.flix
rename to test/testWorkspaces/diagnostics/latent/RedundancyError.flix
diff --git a/test/testWorkspace/latent/ResolutionError.flix b/test/testWorkspaces/diagnostics/latent/ResolutionError.flix
similarity index 100%
rename from test/testWorkspace/latent/ResolutionError.flix
rename to test/testWorkspaces/diagnostics/latent/ResolutionError.flix
diff --git a/test/testWorkspace/latent/SafetyError.flix b/test/testWorkspaces/diagnostics/latent/SafetyError.flix
similarity index 100%
rename from test/testWorkspace/latent/SafetyError.flix
rename to test/testWorkspaces/diagnostics/latent/SafetyError.flix
diff --git a/test/testWorkspace/latent/TypeError.flix b/test/testWorkspaces/diagnostics/latent/TypeError.flix
similarity index 100%
rename from test/testWorkspace/latent/TypeError.flix
rename to test/testWorkspaces/diagnostics/latent/TypeError.flix
diff --git a/test/testWorkspaces/diagnostics/latent/UnusedFunction.flix b/test/testWorkspaces/diagnostics/latent/UnusedFunction.flix
new file mode 100644
index 00000000..6be7ebe4
--- /dev/null
+++ b/test/testWorkspaces/diagnostics/latent/UnusedFunction.flix
@@ -0,0 +1,39 @@
+mod Reachable.Logic {
+    def reachable(origin: n, edges: f[(n, n)]): Set[n] with Foldable[f], Order[n] =
+        let edgeFacts = inject edges into Edge;
+        // origin is reachable and this set is expanded by the edge facts
+        let reachable = #{
+            Reachable(origin).
+            Reachable(end) :- Reachable(start), Edge(start, end).
+        };
+        query edgeFacts, reachable select x from Reachable(x) |> Vector.toSet
+}
+
+mod Graphs {
+    pub def graph1(): Set[(Int32, Int32)] = Set#{}
+
+    pub def graph2(): Set[(Int32, Int32)] = Set#{
+        (1, 2), (2, 3), (3, 4), (4, 1)
+    }
+
+    pub def graph3(): Set[(Int32, Int32)] = Set#{
+        (1, 2), (1, 3), (4, 5)
+    }
+
+    pub def graph4(): Set[(Int32, Int32)] = Set#{
+        (2, 3), (3, 4)
+    }
+
+    pub def graph5(): Set[(Int32, Int32)] = Set#{
+        (4, 5), (5, 6), (4, 3), (4, 2), (12, 13), (29, 4)
+    }
+
+    pub def validate(reachable: Int32 -> Set[(Int32, Int32)] -> Set[Int32]): Bool = {
+        let test1 = reachable(42, Graphs.graph1()) == Set#{42};
+        let test2 = reachable(1, Graphs.graph2()) == Set#{1, 2, 3, 4};
+        let test3 = reachable(1, Graphs.graph3()) == Set#{1, 2, 3};
+        let test4 = reachable(1, Graphs.graph4()) == Set#{1};
+        let test5 = reachable(4, Graphs.graph5()) == Set#{2, 3, 4, 5, 6};
+        test1 and test2 and test3 and test4 and test5
+    }
+}
diff --git a/test/testWorkspace/latent/WeederError.flix b/test/testWorkspaces/diagnostics/latent/WeederError.flix
similarity index 100%
rename from test/testWorkspace/latent/WeederError.flix
rename to test/testWorkspaces/diagnostics/latent/WeederError.flix
diff --git a/test/testWorkspaces/disconnect/flix.toml b/test/testWorkspaces/disconnect/flix.toml
new file mode 100644
index 00000000..16cfc76b
--- /dev/null
+++ b/test/testWorkspaces/disconnect/flix.toml
@@ -0,0 +1,6 @@
+[package]
+name        = "vscode-flix-test"
+description = "test"
+version     = "0.1.0"
+flix        = "0.44.0"
+authors     = ["John Doe <john@example.com>"]
diff --git a/test/testWorkspaces/disconnect/src/Area.flix b/test/testWorkspaces/disconnect/src/Area.flix
new file mode 100644
index 00000000..d033174d
--- /dev/null
+++ b/test/testWorkspaces/disconnect/src/Area.flix
@@ -0,0 +1,13 @@
+
+/// Computes the area of the given shape using
+/// pattern matching and basic arithmetic.
+def area(s: Shape): Int32 = {
+    match s {
+        case Shape.Circle(r)       => 3 * r * r
+        case Shape.Square(w)       => w * w
+        case Shape.Rectangle(h, w) => h * w
+    }
+}
+
+@Test
+def testSquareArea(): Bool = Assert.eq(area(Shape.Square(5)), 25)
diff --git a/test/testWorkspaces/disconnect/src/Main.flix b/test/testWorkspaces/disconnect/src/Main.flix
new file mode 100644
index 00000000..9e6a1e13
--- /dev/null
+++ b/test/testWorkspaces/disconnect/src/Main.flix
@@ -0,0 +1,11 @@
+
+/// An algebraic data type for shapes.
+enum Shape {
+    case Circle(Int32),          // circle radius
+    case Square(Int32),          // side length
+    case Rectangle(Int32, Int32) // height and width
+}
+
+// Computes the area of a 2 by 4.
+def main(): Unit \ IO =
+    println(area(Shape.Rectangle(2, 4)))
diff --git a/test/testWorkspaces/files/flix.toml b/test/testWorkspaces/files/flix.toml
new file mode 100644
index 00000000..16cfc76b
--- /dev/null
+++ b/test/testWorkspaces/files/flix.toml
@@ -0,0 +1,6 @@
+[package]
+name        = "vscode-flix-test"
+description = "test"
+version     = "0.1.0"
+flix        = "0.44.0"
+authors     = ["John Doe <john@example.com>"]
diff --git a/test/testWorkspace/lib/circleArea.fpkg b/test/testWorkspaces/files/lib/circleArea.fpkg
similarity index 100%
rename from test/testWorkspace/lib/circleArea.fpkg
rename to test/testWorkspaces/files/lib/circleArea.fpkg
diff --git a/test/testWorkspace/lib/circleArea.fpkg.txt b/test/testWorkspaces/files/lib/circleArea.fpkg.txt
similarity index 100%
rename from test/testWorkspace/lib/circleArea.fpkg.txt
rename to test/testWorkspaces/files/lib/circleArea.fpkg.txt
diff --git a/test/testWorkspace/src/Area.flix b/test/testWorkspaces/files/src/Area.flix
similarity index 72%
rename from test/testWorkspace/src/Area.flix
rename to test/testWorkspaces/files/src/Area.flix
index dff5c237..49c35061 100644
--- a/test/testWorkspace/src/Area.flix
+++ b/test/testWorkspaces/files/src/Area.flix
@@ -2,10 +2,9 @@
 /// Computes the area of the given shape using
 /// pattern matching and basic arithmetic.
 def area(s: Shape): Int32 = {
-    import static dev.flix.SquareArea.squareArea(Int32): Int32 \ {};
     match s {
         case Shape.Circle(r)       => circleArea(r)
-        case Shape.Square(w)       => squareArea(w)
+        case Shape.Square(w)       => w * w
         case Shape.Rectangle(h, w) => h * w
     }
 }
diff --git a/test/testWorkspaces/files/src/Main.flix b/test/testWorkspaces/files/src/Main.flix
new file mode 100644
index 00000000..9e6a1e13
--- /dev/null
+++ b/test/testWorkspaces/files/src/Main.flix
@@ -0,0 +1,11 @@
+
+/// An algebraic data type for shapes.
+enum Shape {
+    case Circle(Int32),          // circle radius
+    case Square(Int32),          // side length
+    case Rectangle(Int32, Int32) // height and width
+}
+
+// Computes the area of a 2 by 4.
+def main(): Unit \ IO =
+    println(area(Shape.Rectangle(2, 4)))
diff --git a/test/testWorkspaces/findReferences/flix.toml b/test/testWorkspaces/findReferences/flix.toml
new file mode 100644
index 00000000..16cfc76b
--- /dev/null
+++ b/test/testWorkspaces/findReferences/flix.toml
@@ -0,0 +1,6 @@
+[package]
+name        = "vscode-flix-test"
+description = "test"
+version     = "0.1.0"
+flix        = "0.44.0"
+authors     = ["John Doe <john@example.com>"]
diff --git a/test/testWorkspaces/findReferences/lib/circleArea.fpkg b/test/testWorkspaces/findReferences/lib/circleArea.fpkg
new file mode 100644
index 0000000000000000000000000000000000000000..d9c99e9b5b01b658d0b541f30f9e0141655e9c74
GIT binary patch
literal 488
zcmWIWW@Zs#U|`^2SlrYV@nqlqy_G=T93bWd;<TL13cZs2+#J_)2e}Rz@UT7jo$x-O
zYP-*kz@yFT@re~2hP$$EPuX%x?!JZDwBR3gbwAp9ezd9Iy`|=;viZ)%h%ZfzWeP0Y
za^Hmn)U2C#*?vvPs#nvOtXMPk+}qgYe>m!bZti%W-tI3OdFoN~-cK{mw4RiS`!zSS
zX$G_9lZs7NFW3XX?&IL#0J`S33y^>VVIZrxC|Tb*vnV+y)v+iwQ4i!?-7Z7E1_hC$
zWqu#s3MROi39~<bV%SkL#pPhlfzPK8T;f}MAu8GXd^GpM7?#s16K!<*4jlKjIP5OC
zFl9sO!e@aNpKRCVPP0kwKkBnenwy8sBQHU<F2I|eL*D9!N+{6IBp?p(W@NHwz!h#P
zP&X<-X?Q4dF+hYE86+5%%n%L=>b}Lu*(?I4CBmbvKzxwVB0!^IUPiVS<Yfd{0Aykb
UfB<h+HjpAFAOyvu86$`X0BhTxh5!Hn

literal 0
HcmV?d00001

diff --git a/test/testWorkspaces/findReferences/lib/circleArea.fpkg.txt b/test/testWorkspaces/findReferences/lib/circleArea.fpkg.txt
new file mode 100644
index 00000000..23fd7bfc
--- /dev/null
+++ b/test/testWorkspaces/findReferences/lib/circleArea.fpkg.txt
@@ -0,0 +1,6 @@
+circleArea.fpkg contains a single function that computes the area of a circle given its radius:
+
+```
+/// Compute the area of a circle given its radius.
+def circleArea(r: Int32): Int32 = 3 * (r * r)
+```
diff --git a/test/testWorkspaces/findReferences/src/Area.flix b/test/testWorkspaces/findReferences/src/Area.flix
new file mode 100644
index 00000000..49c35061
--- /dev/null
+++ b/test/testWorkspaces/findReferences/src/Area.flix
@@ -0,0 +1,13 @@
+
+/// Computes the area of the given shape using
+/// pattern matching and basic arithmetic.
+def area(s: Shape): Int32 = {
+    match s {
+        case Shape.Circle(r)       => circleArea(r)
+        case Shape.Square(w)       => w * w
+        case Shape.Rectangle(h, w) => h * w
+    }
+}
+
+@Test
+def testSquareArea(): Bool = Assert.eq(area(Shape.Square(5)), 25)
diff --git a/test/testWorkspaces/findReferences/src/Main.flix b/test/testWorkspaces/findReferences/src/Main.flix
new file mode 100644
index 00000000..9e6a1e13
--- /dev/null
+++ b/test/testWorkspaces/findReferences/src/Main.flix
@@ -0,0 +1,11 @@
+
+/// An algebraic data type for shapes.
+enum Shape {
+    case Circle(Int32),          // circle radius
+    case Square(Int32),          // side length
+    case Rectangle(Int32, Int32) // height and width
+}
+
+// Computes the area of a 2 by 4.
+def main(): Unit \ IO =
+    println(area(Shape.Rectangle(2, 4)))
diff --git a/test/testWorkspaces/hover/flix.toml b/test/testWorkspaces/hover/flix.toml
new file mode 100644
index 00000000..16cfc76b
--- /dev/null
+++ b/test/testWorkspaces/hover/flix.toml
@@ -0,0 +1,6 @@
+[package]
+name        = "vscode-flix-test"
+description = "test"
+version     = "0.1.0"
+flix        = "0.44.0"
+authors     = ["John Doe <john@example.com>"]
diff --git a/test/testWorkspace/latent/Broken.flix b/test/testWorkspaces/hover/latent/Broken.flix
similarity index 100%
rename from test/testWorkspace/latent/Broken.flix
rename to test/testWorkspaces/hover/latent/Broken.flix
diff --git a/test/testWorkspaces/hover/src/Area.flix b/test/testWorkspaces/hover/src/Area.flix
new file mode 100644
index 00000000..d033174d
--- /dev/null
+++ b/test/testWorkspaces/hover/src/Area.flix
@@ -0,0 +1,13 @@
+
+/// Computes the area of the given shape using
+/// pattern matching and basic arithmetic.
+def area(s: Shape): Int32 = {
+    match s {
+        case Shape.Circle(r)       => 3 * r * r
+        case Shape.Square(w)       => w * w
+        case Shape.Rectangle(h, w) => h * w
+    }
+}
+
+@Test
+def testSquareArea(): Bool = Assert.eq(area(Shape.Square(5)), 25)
diff --git a/test/testWorkspaces/hover/src/Main.flix b/test/testWorkspaces/hover/src/Main.flix
new file mode 100644
index 00000000..9e6a1e13
--- /dev/null
+++ b/test/testWorkspaces/hover/src/Main.flix
@@ -0,0 +1,11 @@
+
+/// An algebraic data type for shapes.
+enum Shape {
+    case Circle(Int32),          // circle radius
+    case Square(Int32),          // side length
+    case Rectangle(Int32, Int32) // height and width
+}
+
+// Computes the area of a 2 by 4.
+def main(): Unit \ IO =
+    println(area(Shape.Rectangle(2, 4)))

From 6e24afb6d160cd5797f20b200543a5149534940e Mon Sep 17 00:00:00 2001
From: sockmaster27 <61235930+sockmaster27@users.noreply.github.com>
Date: Sun, 12 May 2024 18:15:43 +0200
Subject: [PATCH 2/6] chore: add `activeWorkspace` to gitignore

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index ade669e7..2f0fcc96 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,5 +6,7 @@ client/server
 .vscode-test
 notes
 target
+test/activeWorkspace
+!test/activeWorkspace/.gitkeep
 flix.jar
 *.vsix

From 589dd280e8f7fa546a75ad1d25310c1c6af74826 Mon Sep 17 00:00:00 2001
From: sockmaster27 <61235930+sockmaster27@users.noreply.github.com>
Date: Sun, 12 May 2024 22:54:08 +0200
Subject: [PATCH 3/6] fix: hanging test

---
 test/src/codeActions.test.ts    |  5 +----
 test/src/codeLenses.test.ts     |  5 +----
 test/src/completions.test.ts    |  5 +----
 test/src/diagnostics.test.ts    |  5 +----
 test/src/disconnect.test.ts     |  5 +----
 test/src/files.test.ts          |  5 +----
 test/src/findReferences.test.ts | 15 ++++---------
 test/src/hover.test.ts          |  5 +----
 test/src/util.ts                | 39 ++++++++++++++++++---------------
 9 files changed, 32 insertions(+), 57 deletions(-)

diff --git a/test/src/codeActions.test.ts b/test/src/codeActions.test.ts
index d58ac3e9..e4ad518f 100644
--- a/test/src/codeActions.test.ts
+++ b/test/src/codeActions.test.ts
@@ -16,7 +16,7 @@
 
 import * as assert from 'assert'
 import * as vscode from 'vscode'
-import { getTestDocUri, activate, open, clearWorkspace } from './util'
+import { getTestDocUri, activate, open } from './util'
 
 suite('Code actions', () => {
   const docUri = getTestDocUri('src/UnusedFunction.flix')
@@ -25,9 +25,6 @@ suite('Code actions', () => {
     await activate('codeActions')
     await open(docUri)
   })
-  teardown(async () => {
-    await clearWorkspace()
-  })
 
   test('Should propose prefixing unused def with underscore', async () => {
     const position = new vscode.Position(1, 8)
diff --git a/test/src/codeLenses.test.ts b/test/src/codeLenses.test.ts
index 89a98d98..3ffe4598 100644
--- a/test/src/codeLenses.test.ts
+++ b/test/src/codeLenses.test.ts
@@ -16,7 +16,7 @@
 
 import * as assert from 'assert'
 import * as vscode from 'vscode'
-import { getTestDocUri, activate, open, clearWorkspace } from './util'
+import { getTestDocUri, activate, open } from './util'
 
 suite('Code lenses', () => {
   const mainDocUri = getTestDocUri('src/Main.flix')
@@ -25,9 +25,6 @@ suite('Code lenses', () => {
   suiteSetup(async () => {
     await activate('codeLenses')
   })
-  suiteTeardown(async () => {
-    await clearWorkspace()
-  })
 
   test('Should propose running main function', async () => {
     await open(mainDocUri)
diff --git a/test/src/completions.test.ts b/test/src/completions.test.ts
index bdff3042..66acfeae 100644
--- a/test/src/completions.test.ts
+++ b/test/src/completions.test.ts
@@ -16,7 +16,7 @@
 
 import * as assert from 'assert'
 import * as vscode from 'vscode'
-import { getTestDocUri, activate, open, clearWorkspace, typeText, addFile } from './util'
+import { getTestDocUri, activate, open, typeText, addFile } from './util'
 
 suite('Completions', () => {
   const docUri = getTestDocUri('src/Temp.flix')
@@ -24,9 +24,6 @@ suite('Completions', () => {
   suiteSetup(async () => {
     await activate('completions')
   })
-  suiteTeardown(async () => {
-    await clearWorkspace()
-  })
 
   test('Should propose completing mod', async () => {
     await addFile(docUri, '')
diff --git a/test/src/diagnostics.test.ts b/test/src/diagnostics.test.ts
index b85ed476..02678b21 100644
--- a/test/src/diagnostics.test.ts
+++ b/test/src/diagnostics.test.ts
@@ -16,7 +16,7 @@
 
 import * as assert from 'assert'
 import * as vscode from 'vscode'
-import { getTestDocUri, activate, copyFile, deleteFile, clearWorkspace } from './util'
+import { getTestDocUri, activate, copyFile, deleteFile } from './util'
 
 suite('Diagnostics', () => {
   /** The optional URI of the document which should be deleted after each test. */
@@ -25,9 +25,6 @@ suite('Diagnostics', () => {
   suiteSetup(async () => {
     await activate('diagnostics')
   })
-  suiteTeardown(async () => {
-    await clearWorkspace()
-  })
   teardown(async () => {
     if (tempDocUri !== null) {
       await deleteFile(tempDocUri)
diff --git a/test/src/disconnect.test.ts b/test/src/disconnect.test.ts
index 71272a6b..3f5af489 100644
--- a/test/src/disconnect.test.ts
+++ b/test/src/disconnect.test.ts
@@ -16,15 +16,12 @@
 
 import * as assert from 'assert'
 import * as vscode from 'vscode'
-import { activate, clearWorkspace, getTestDocUri, sleep } from './util'
+import { activate, getTestDocUri, sleep } from './util'
 
 suite('Server disconnect', () => {
   suiteSetup(async () => {
     await activate('disconnect')
   })
-  suiteTeardown(async () => {
-    await clearWorkspace()
-  })
 
   test('When server is disconnected a reconnection should happen automatically', async () => {
     await vscode.commands.executeCommand('flix.simulateDisconnect')
diff --git a/test/src/files.test.ts b/test/src/files.test.ts
index e32ba270..6fb004df 100644
--- a/test/src/files.test.ts
+++ b/test/src/files.test.ts
@@ -16,7 +16,7 @@
 
 import * as assert from 'assert'
 import * as vscode from 'vscode'
-import { activate, addFile, clearWorkspace, deleteFile, getTestDocUri } from './util'
+import { activate, addFile, deleteFile, getTestDocUri } from './util'
 
 suite('File manipulation', () => {
   const doc1Uri = getTestDocUri('src/Main.flix')
@@ -37,9 +37,6 @@ suite('File manipulation', () => {
     await addFile(doc2Uri, doc2Content)
     await addFile(fpkgUri, fpkgContent)
   })
-  suiteTeardown(async () => {
-    await clearWorkspace()
-  })
 
   async function workspaceValid() {
     // If all files are not present in the compiler, then Main.flix will contain a resolution error
diff --git a/test/src/findReferences.test.ts b/test/src/findReferences.test.ts
index 2ea24fb7..77870d12 100644
--- a/test/src/findReferences.test.ts
+++ b/test/src/findReferences.test.ts
@@ -16,7 +16,7 @@
 
 import * as assert from 'assert'
 import * as vscode from 'vscode'
-import { getTestDocUri, activate, clearWorkspace } from './util'
+import { getTestDocUri, activate } from './util'
 
 suite('Find references', () => {
   const mainDocUri = getTestDocUri('src/Main.flix')
@@ -25,9 +25,6 @@ suite('Find references', () => {
   suiteSetup(async () => {
     await activate('findReferences')
   })
-  suiteTeardown(async () => {
-    await clearWorkspace()
-  })
 
   test('Should find references to enum case', async () => {
     const position = new vscode.Position(3, 9)
@@ -46,7 +43,7 @@ suite('Find references', () => {
     assert.notStrictEqual(areaReference, undefined)
 
     assert.deepStrictEqual(mainReference?.range, new vscode.Range(3, 9, 3, 22))
-    assert.deepStrictEqual(areaReference?.range, new vscode.Range(6, 13, 6, 25))
+    assert.deepStrictEqual(areaReference?.range, new vscode.Range(5, 13, 5, 25))
   })
 
   test('Should find references to def', async () => {
@@ -60,15 +57,11 @@ suite('Find references', () => {
     assert.strictEqual(r.length, 3)
 
     const defReference = r.find(l => l.uri.path.endsWith(areaDocUri.path) && l.range.start.line === 3)
-    const testReference = r.find(l => l.uri.path.endsWith(areaDocUri.path) && l.range.start.line === 13)
+    const testReference = r.find(l => l.uri.path.endsWith(areaDocUri.path) && l.range.start.line === 12)
     const mainReference = r.find(l => l.uri.path.endsWith(mainDocUri.path))
 
-    assert.notStrictEqual(defReference, undefined)
-    assert.notStrictEqual(testReference, undefined)
-    assert.notStrictEqual(mainReference, undefined)
-
     assert.deepStrictEqual(defReference?.range, new vscode.Range(3, 4, 3, 8))
-    assert.deepStrictEqual(testReference?.range, new vscode.Range(13, 39, 13, 43))
+    assert.deepStrictEqual(testReference?.range, new vscode.Range(12, 39, 12, 43))
     assert.deepStrictEqual(mainReference?.range, new vscode.Range(10, 12, 10, 16))
   })
 })
diff --git a/test/src/hover.test.ts b/test/src/hover.test.ts
index 693efaf8..46c952af 100644
--- a/test/src/hover.test.ts
+++ b/test/src/hover.test.ts
@@ -16,7 +16,7 @@
 
 import * as assert from 'assert'
 import * as vscode from 'vscode'
-import { getTestDocUri, activate, open, copyFile, tryDeleteFile, clearWorkspace } from './util'
+import { getTestDocUri, activate, open, copyFile, tryDeleteFile } from './util'
 
 suite('Hover info', () => {
   const docUri = getTestDocUri('src/Main.flix')
@@ -28,9 +28,6 @@ suite('Hover info', () => {
     await activate('hover')
     await open(docUri)
   })
-  suiteTeardown(async () => {
-    await clearWorkspace()
-  })
   teardown(async () => {
     await tryDeleteFile(brokenDocUri)
   })
diff --git a/test/src/util.ts b/test/src/util.ts
index d5323ad9..c797743c 100644
--- a/test/src/util.ts
+++ b/test/src/util.ts
@@ -18,36 +18,30 @@ import * as path from 'path'
 import * as vscode from 'vscode'
 
 /**
- * Activates the extension and copies the contents of the given workspace directory into the test workspace.
+ * Activates the extension and copies the contents of the given test workspace directory into the extive workspace.
  *
  * @param testWorkspaceName The name of the workspace directory to copy, e.g. `codeActions`.
  */
 export async function activate(testWorkspaceName: string) {
-  console.log('=======================1')
   // The extensionId is `publisher.name` from package.json
   const ext = vscode.extensions.getExtension('flix.flix')
   if (ext === undefined) {
     throw new Error('Failed to activate extension')
   }
 
-  console.log('=======================2')
+  await copyWorkspace(testWorkspaceName)
+
   // This includes the time it takes for the compiler to download
   // The time it takes for the compiler to start will be awaited in the first command sent to the extension
   await ext.activate()
-
-  console.log('=======================3')
-  // Copy the contents of the given workspace directory into the test workspace
-  const testWorkspacePath = path.resolve(__dirname, '../testWorkspaces', testWorkspaceName)
-  const activeWorkspacePath = path.resolve(__dirname, '../activeWorkspace')
-  await copyDirContents(vscode.Uri.file(testWorkspacePath), vscode.Uri.file(activeWorkspacePath))
-
-  console.log('=======================4')
 }
 
 /**
- * Clears the test workspace.
+ * Clears the test workspace, and copies the contents of the given test workspace directory into the active workspace.
+ *
+ * @param testWorkspaceName The name of the workspace directory to copy, e.g. `codeActions`.
  */
-export async function clearWorkspace() {
+async function copyWorkspace(testWorkspaceName: string) {
   vscode.commands.executeCommand('workbench.action.closeAllEditors')
 
   const activeWorkspaceUri = vscode.workspace.workspaceFolders![0].uri
@@ -57,12 +51,10 @@ export async function clearWorkspace() {
   // Delete all files except .gitkeep and flix.jar
   const namesToDelete = names.filter(name => name !== '.gitkeep' && name !== 'flix.jar')
   const urisToDelete = namesToDelete.map(name => vscode.Uri.joinPath(activeWorkspaceUri, name))
-
   await Promise.allSettled(urisToDelete.map(deleteFile))
 
-  // Restart the compiler to clear diagnostics
-  // TODO: Find out why this doesn't work when files are removed
-  await vscode.commands.executeCommand('flix.internalRestart')
+  const testWorkspacePath = path.resolve(__dirname, '../testWorkspaces', testWorkspaceName)
+  await copyDirContents(vscode.Uri.file(testWorkspacePath), activeWorkspaceUri)
 }
 
 /**
@@ -147,7 +139,18 @@ export async function copyFile(from: vscode.Uri, to: vscode.Uri) {
  * Throws if the file does not exist.
  */
 export async function deleteFile(uri: vscode.Uri) {
-  await vscode.workspace.fs.delete(uri, { recursive: true, useTrash: true })
+  const stat = await vscode.workspace.fs.stat(uri)
+  if (stat.type === vscode.FileType.Directory) {
+    // If the file is a directory, then delete all files in the directory before deleting the directory itself,
+    // to trigger file-system events for each file individually.
+    // TODO: Make the extension aware that deleting a directory should result in deleting all files in the directory.
+    const contents = await vscode.workspace.fs.readDirectory(uri)
+    const names = contents.map(([name, _]) => name)
+    const uris = names.map(name => vscode.Uri.joinPath(uri, name))
+    await Promise.allSettled(uris.map(deleteFile))
+  }
+
+  await vscode.workspace.fs.delete(uri)
   await processFileChange()
 }
 

From 065d9111fcd9737727534d7804e8eede53158793 Mon Sep 17 00:00:00 2001
From: sockmaster27 <61235930+sockmaster27@users.noreply.github.com>
Date: Wed, 15 May 2024 22:06:07 +0200
Subject: [PATCH 4/6] test: only clear files with known extensions from
 workspace

---
 test/src/util.ts | 42 +++++++++++++++++++++++++-----------------
 1 file changed, 25 insertions(+), 17 deletions(-)

diff --git a/test/src/util.ts b/test/src/util.ts
index c797743c..3179377a 100644
--- a/test/src/util.ts
+++ b/test/src/util.ts
@@ -45,13 +45,32 @@ async function copyWorkspace(testWorkspaceName: string) {
   vscode.commands.executeCommand('workbench.action.closeAllEditors')
 
   const activeWorkspaceUri = vscode.workspace.workspaceFolders![0].uri
-  const contents = await vscode.workspace.fs.readDirectory(activeWorkspaceUri)
-  const names = contents.map(([name, _]) => name)
 
-  // Delete all files except .gitkeep and flix.jar
-  const namesToDelete = names.filter(name => name !== '.gitkeep' && name !== 'flix.jar')
-  const urisToDelete = namesToDelete.map(name => vscode.Uri.joinPath(activeWorkspaceUri, name))
-  await Promise.allSettled(urisToDelete.map(deleteFile))
+  /** Recursively clears all safe files from the given directory. */
+  async function clearDir(uri: vscode.Uri) {
+    const contents = await vscode.workspace.fs.readDirectory(uri)
+
+    // Recurse into subdirectories
+    const dirs = contents.filter(([_, type]) => type === vscode.FileType.Directory)
+    const dirUris = dirs.map(([name, _]) => vscode.Uri.joinPath(uri, name))
+    await Promise.allSettled(dirUris.map(clearDir))
+
+    const files = contents.filter(([_, type]) => type !== vscode.FileType.Directory)
+    const fileNames = files.map(([name, _]) => name)
+
+    // Delete all files except .gitkeep and flix.jar
+    const namesToKeep = ['.gitkeep', 'flix.jar']
+
+    // Be careful, and only delete files with known extensions
+    const extensionsToDelete = ['flix', 'toml', 'jar', 'fpkg', 'txt']
+
+    const namesToDelete = fileNames.filter(
+      name => namesToKeep.includes(name) || !extensionsToDelete.includes(name.split('.').at(-1)),
+    )
+    const urisToDelete = namesToDelete.map(name => vscode.Uri.joinPath(uri, name))
+    await Promise.allSettled(urisToDelete.map(deleteFile))
+  }
+  await clearDir(activeWorkspaceUri)
 
   const testWorkspacePath = path.resolve(__dirname, '../testWorkspaces', testWorkspaceName)
   await copyDirContents(vscode.Uri.file(testWorkspacePath), activeWorkspaceUri)
@@ -139,17 +158,6 @@ export async function copyFile(from: vscode.Uri, to: vscode.Uri) {
  * Throws if the file does not exist.
  */
 export async function deleteFile(uri: vscode.Uri) {
-  const stat = await vscode.workspace.fs.stat(uri)
-  if (stat.type === vscode.FileType.Directory) {
-    // If the file is a directory, then delete all files in the directory before deleting the directory itself,
-    // to trigger file-system events for each file individually.
-    // TODO: Make the extension aware that deleting a directory should result in deleting all files in the directory.
-    const contents = await vscode.workspace.fs.readDirectory(uri)
-    const names = contents.map(([name, _]) => name)
-    const uris = names.map(name => vscode.Uri.joinPath(uri, name))
-    await Promise.allSettled(uris.map(deleteFile))
-  }
-
   await vscode.workspace.fs.delete(uri)
   await processFileChange()
 }

From 223e7b2d04e6060fc0ce110e38f8fdf56d2b53e0 Mon Sep 17 00:00:00 2001
From: sockmaster27 <61235930+sockmaster27@users.noreply.github.com>
Date: Wed, 15 May 2024 22:51:40 +0200
Subject: [PATCH 5/6] test: skip enum referenece

---
 test/src/findReferences.test.ts | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/test/src/findReferences.test.ts b/test/src/findReferences.test.ts
index 77870d12..a65f2a43 100644
--- a/test/src/findReferences.test.ts
+++ b/test/src/findReferences.test.ts
@@ -26,7 +26,7 @@ suite('Find references', () => {
     await activate('findReferences')
   })
 
-  test('Should find references to enum case', async () => {
+  test.skip('Should find references to enum case', async () => {
     const position = new vscode.Position(3, 9)
     const r = (await vscode.commands.executeCommand(
       'vscode.executeReferenceProvider',
@@ -39,9 +39,6 @@ suite('Find references', () => {
     const mainReference = r.find(l => l.uri.path.endsWith(mainDocUri.path))
     const areaReference = r.find(l => l.uri.path.endsWith(areaDocUri.path))
 
-    assert.notStrictEqual(mainReference, undefined)
-    assert.notStrictEqual(areaReference, undefined)
-
     assert.deepStrictEqual(mainReference?.range, new vscode.Range(3, 9, 3, 22))
     assert.deepStrictEqual(areaReference?.range, new vscode.Range(5, 13, 5, 25))
   })

From 445aac644c61aef81efc8dc947a031dd04960a5a Mon Sep 17 00:00:00 2001
From: sockmaster27 <61235930+sockmaster27@users.noreply.github.com>
Date: Wed, 15 May 2024 22:53:40 +0200
Subject: [PATCH 6/6] test: fix inverted workspace clearing

---
 test/src/util.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/src/util.ts b/test/src/util.ts
index 3179377a..1889aaeb 100644
--- a/test/src/util.ts
+++ b/test/src/util.ts
@@ -65,7 +65,7 @@ async function copyWorkspace(testWorkspaceName: string) {
     const extensionsToDelete = ['flix', 'toml', 'jar', 'fpkg', 'txt']
 
     const namesToDelete = fileNames.filter(
-      name => namesToKeep.includes(name) || !extensionsToDelete.includes(name.split('.').at(-1)),
+      name => !namesToKeep.includes(name) && extensionsToDelete.includes(name.split('.').at(-1)),
     )
     const urisToDelete = namesToDelete.map(name => vscode.Uri.joinPath(uri, name))
     await Promise.allSettled(urisToDelete.map(deleteFile))