Remove workspace check for icons, update to v2.1.0

Author: Drizzy

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Change Log
 
+### [v2.1.0](https://github.com/drizzy/code-make/releases/tag/v2.1.0)
+
+> 04 November 2024
+
+### Features
+
+- Icons now display directly without requiring an active workspace.
+- Workspace warning only appears when attempting to create a project.
+- Optimized folder and file checks to avoid unnecessary errors when opening Visual Studio Code.
+- The project creation icon remains a heart, and the play icon now compiles and runs the project.
+- Improved status bar update logic, ensuring icons are always visible.
+
 ### [v2.0.0](https://github.com/drizzy/code-make/releases/tag/v2.0.0)
 
 > 25 December 2023

package-lock.json

@@ -2,7 +2,7 @@
   "name": "code-make",
   "displayName": "Code Make",
   "description": "Code Make is designed to make it easy to create and compile C++ projects using the Make tool.",
-  "version": "2.0.0",
+  "version": "2.2.0",
   "publisher": "drizzy",
   "license": "MIT",
   "icon": "icons/logo.png",
@@ -13,7 +13,7 @@
     "type": "git",
     "url": "https://github.com/drizzy/code-make.git"
   },
-  "homepage": "https://github.com/drizzy/code-make/README.md",
+  "homepage": "https://github.com/drizzy/code-make/blob/master/README.md",
   "bugs": {
     "url": "https://github.com/drizzy/code-make/issues"
   },

package.json

@@ -2,41 +2,45 @@ import * as vscode from 'vscode';
 import { StatusBarItems } from './interface';
 import { join, resolve } from 'path';
 import { platform } from 'os';
-import { existsSync, mkdirSync, readdirSync, writeFile, statSync, Stats } from 'fs';
+import { existsSync, mkdirSync, readdirSync, statSync, Stats } from 'fs';
 import { gitignore, maincpp, makefile, readme } from './templates';
+import { promises as fsPromises } from 'fs';
 
 export class CodeManage {
-
   private _terminal: vscode.Terminal;
   private _folderPath: string;
   private _items: StatusBarItems;
   private _watcher: vscode.FileSystemWatcher | null;
 
-  constructor(){
-
+  constructor() {
     this._terminal = vscode.window.createTerminal({
       name: 'Code Make',
-      hideFromUser: true
+      hideFromUser: true,
     });
-    this._folderPath = vscode.workspace?.workspaceFolders?.[0]?.uri?.fsPath as string;
+    this._folderPath = this.getFolderPath();
     this._items = {
       create: vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Right),
-      start:  vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Right),
+      start: vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Right),
     };
     this._watcher = null;
+
     this.setupFileSystemWatcher();
     this.updateStatusBar();
+  }
 
+  private getFolderPath(): string {
+    if (!vscode.workspace || !vscode.workspace.workspaceFolders) {
+      return '';
+    }
+    return vscode.workspace.workspaceFolders[0].uri.fsPath;
   }
 
-  public start(){
+  public start() {
+    if (!this._folderPath) return;
 
     const binPath: string = join(resolve(this._folderPath), 'bin');
-    
     try {
-    
       const binStats: Stats = statSync(binPath);
-
       if (!binStats.isDirectory()) {
         this.build();
       } else {
@@ -48,140 +52,118 @@ export class CodeManage {
           this.terminal('make run');
         }
       }
-  
     } catch (e) {
       this.build();
     }
+  }
 
+  private updateStatusBar() {
+    const isProjectValid =
+      this._folderPath &&
+      existsSync(join(this._folderPath, 'src')) &&
+      existsSync(join(this._folderPath, 'src', 'main.cpp')) &&
+      existsSync(join(this._folderPath, 'include')) &&
+      existsSync(join(this._folderPath, 'Makefile'));
+
+    this._items.create.text = `$(heart)`;
+    this._items.create.tooltip = 'Create C++ Project';
+    this._items.create.command = 'code-make-create.run';
+    this._items.create.color = '#FF79C6';
+
+    this._items.start.text = `$(debug-start)`;
+    this._items.start.tooltip = 'Start C++ Project';
+    this._items.start.command = 'code-make-start.run';
+    this._items.start.color = '#89D185';
+
+    !isProjectValid
+      ? (this._items.create.show(), this._items.start.hide())
+      : (this._items.start.show(), this._items.create.hide());
   }
 
-  public create(){
-   
+  public create() {
     try {
+      if (!this._folderPath) {
+        return vscode.window.showErrorMessage('Please open a project folder first');
+      }
 
-    if (!this._folderPath) return vscode.window.showErrorMessage('Please open a project folder first');
-  
-    const folders: string[] = [
-      'assets',
-      'doc',
-      'include',
-      'include/core',
-      'include/ui',
-      'include/utils',
-      'lib',
-      'src',
-      'src/core',
-      'src/ui',
-      'src/utils',
-      'tests'
-    ];
-  
-    folders.forEach((folder: string) => this.createFolder(this._folderPath, folder));
-  
-    this.createFile(join(this._folderPath, 'src', 'main.cpp'), maincpp);
-    this.createFile(join(this._folderPath, '.gitignore'), gitignore);
-    this.createFile(join(this._folderPath, 'Makefile'), makefile);
-    this.createFile(join(this._folderPath, 'README.md'), readme);
-    
+      const folders: string[] = [
+        'assets',
+        'doc',
+        'include',
+        'include/core',
+        'include/ui',
+        'include/utils',
+        'lib',
+        'src',
+        'src/core',
+        'src/ui',
+        'src/utils',
+        'tests',
+      ];
+
+      folders.forEach((folder: string) => this.createFolder(this._folderPath, folder));
+
+      this.createFile(join(this._folderPath, 'src', 'main.cpp'), maincpp);
+      this.createFile(join(this._folderPath, '.gitignore'), gitignore);
+      this.createFile(join(this._folderPath, 'Makefile'), makefile);
+      this.createFile(join(this._folderPath, 'README.md'), readme);
     } catch (e) {
       console.log('An error occurred.', e);
     }
-
   }
 
-  private build(){
-
+  private build() {
     try {
-
       const srcFolder: string = join(this._folderPath, 'src');
       const mainFile: string = join(this._folderPath, 'src', 'main.cpp');
 
-      if (!existsSync(srcFolder) && !existsSync(mainFile)) return vscode.window.showErrorMessage('No such file main.cpp or directory src');
-        
+      if (!existsSync(srcFolder) && !existsSync(mainFile)) {
+        return vscode.window.showErrorMessage('No such file main.cpp or directory src');
+      }
+
       this.terminal('make');
-  
     } catch (e) {
       console.log('An error occurred.', e);
     }
-
   }
 
-  private updateStatusBar(){
-
-    try {
-  
-      const srcPath: string = join(this._folderPath, 'src');
-      const maincpp: string = join(this._folderPath, 'src', 'main.cpp');
-      const includePath: string = join(this._folderPath, 'include');
-      const makefilePath: string = join(this._folderPath, 'Makefile');
-  
-      const isProjectValid: boolean = existsSync(srcPath) && existsSync(maincpp) && existsSync(includePath) && existsSync(makefilePath);
-  
-      this._items.create.text = `$(heart)`;
-      this._items.create.tooltip = 'Code Make (Create Project)';
-      this._items.create.command = 'code-make-create.run';
-      this._items.create.color = '#FF79C6';
-  
-      this._items.start.text = `$(debug-start)`;
-      this._items.start.tooltip = 'Code Make (Start Project)';
-      this._items.start.command = 'code-make-start.run';
-      this._items.start.color = '#89D185';
-
-      !isProjectValid 
-        ? (this._items.create.show(), this._items.start.hide())
-        : (this._items.start.show(), this._items.create.hide());
-
-    } catch (e: any) {
-      vscode.window.showErrorMessage(e.message || e.toString());
-    }
-
-  }
-  
   private terminal(command: string) {
-
     try {
+      if (this._terminal.exitStatus) {
+        this._terminal = vscode.window.createTerminal({
+          name: 'Code Make',
+          hideFromUser: true,
+        });
+      }
 
-      if (this._terminal.exitStatus) this._terminal = vscode.window.createTerminal({
-        name: 'Code Make',
-        hideFromUser: true
-      });
-  
       this._terminal.show();
-  
       platform() === 'win32' ? this._terminal.sendText('cls') : this._terminal.sendText('clear');
-  
       this._terminal.sendText(`${command}`);
-  
-    } catch (e: any) {
-      vscode.window.showErrorMessage(e.message || e.toString());
+    } catch (error) {
+      vscode.window.showErrorMessage(`Terminal error: ${error instanceof Error ? error.message : error}`);
     }
-
   }
 
   private createFolder(folderPath: string, folderName: string) {
-
     const fullPath: string = join(folderPath, folderName);
 
-    if(!existsSync(fullPath)){
+    if (!existsSync(fullPath)) {
       try {
         mkdirSync(fullPath, { recursive: true });
-      } catch (e) {
-        vscode.window.showErrorMessage('Failed to create folder');
+      } catch (error) {
+        vscode.window.showErrorMessage(`Failed to create folder: ${error instanceof Error ? error.message : error}`);
       }
     }
-
   }
 
-  private createFile(filePath: string, templatePath: string) {
-
-    if(!existsSync(filePath)){
-      writeFile(filePath, templatePath, 'utf8', (err: NodeJS.ErrnoException | null) => {
-        if(err){
-          vscode.window.showErrorMessage('Failed to create file');
-        }
-      });
+  private async createFile(filePath: string, templatePath: string) {
+    if (!existsSync(filePath)) {
+      try {
+        await fsPromises.writeFile(filePath, templatePath, 'utf8');
+      } catch (error) {
+        vscode.window.showErrorMessage(`Failed to create file: ${error instanceof Error ? error.message : error}`);
+      }
     }
-    
   }
 
   private setupFileSystemWatcher() {
@@ -190,5 +172,4 @@ export class CodeManage {
     this._watcher.onDidCreate(this.updateStatusBar.bind(this));
     this._watcher.onDidDelete(this.updateStatusBar.bind(this));
   }
-
-};
+}