From 3c22410f18562ca7eb2fabbf0e5d6333288cff2a Mon Sep 17 00:00:00 2001
From: hughess <hughess@users.noreply.github.com>
Date: Wed, 7 Jun 2023 19:52:29 -0400
Subject: [PATCH] Simpler fix for empty folder issue (#78)

* simpler fix for empty folder issue

* minor cleanup
---
 package.json            |  2 +-
 src/commands/project.ts | 11 +++++------
 src/views/prompts.ts    |  2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index 208db84..dfae3ec 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "evidence-vscode",
   "displayName": "Evidence",
   "description": "Evidence language support for VS Code",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "private": true,
   "engines": {
     "vscode": "^1.52.0"
diff --git a/src/commands/project.ts b/src/commands/project.ts
index 8856a72..a065e10 100644
--- a/src/commands/project.ts
+++ b/src/commands/project.ts
@@ -61,8 +61,7 @@ export async function createNewProject(projectFolder?: Uri) {
   }
 
   // get the list of files and folders in the selected new project folder
-  const projectFiles = await workspace.findFiles(
-    new RelativePattern(projectFolder.fsPath, '**/*'));
+  const projectFiles = await workspace.fs.readDirectory(projectFolder);
 
   console.log(projectFiles);
 
@@ -71,7 +70,7 @@ export async function createNewProject(projectFolder?: Uri) {
 
     // prompt to select an empty new project folder
     window.showErrorMessage(
-     'Select an empty folder to create a new Evidence project.');
+     'Selected folder must be empty to create a new Evidence project.', {modal: true});
 
     // display create new project dialog again
     createNewProject();
@@ -111,7 +110,7 @@ export async function createNewProject(projectFolder?: Uri) {
     else {
       // template folder specified in evidence.templateProjectUrl settings doesn't exist
       showInvalidTemplateProjectUrlErrorMessage(projectTemplateUrl);
-      outputChannel.appendLine(`✗ Ivalid Template Project Folder: ${projectTemplateUrl}`);
+      outputChannel.appendLine(`✗ Invalid Template Project Folder: ${projectTemplateUrl}`);
     }
   }
   else if (projectTemplateUrl === templateProjectUrlSetting) {
@@ -128,13 +127,13 @@ export async function createNewProject(projectFolder?: Uri) {
     else {
       // invalid built-in /template folder path
       showInvalidTemplateProjectUrlErrorMessage(templateFolder.fsPath);
-      outputChannel.appendLine(`✗ Ivalid Template Project Folder: ${templateFolder.fsPath}`);
+      outputChannel.appendLine(`✗ Invalid Template Project Folder: ${templateFolder.fsPath}`);
     }
   }
   else {
     // invalid template project Uri scheme
     showInvalidTemplateProjectUrlErrorMessage(projectTemplateUrl);
-    outputChannel.appendLine(`✗ Ivalid Template Project Folder: ${projectTemplateUrl}`);
+    outputChannel.appendLine(`✗ Invalid Template Project Folder: ${projectTemplateUrl}`);
   }
 }
 
diff --git a/src/views/prompts.ts b/src/views/prompts.ts
index aef9fbd..a4cefb5 100644
--- a/src/views/prompts.ts
+++ b/src/views/prompts.ts
@@ -34,7 +34,7 @@ export async function showSelectFolderDialog(): Promise<Uri[] | undefined> {
     canSelectFiles: false,
     canSelectFolders: true,
     canSelectMany: false,
-    openLabel: 'Select an empty folder to create new Evidence project.'
+    openLabel: 'Select folder'
   });
 }