Add PDE file setup and enhance command functionality

- Implement setupPDEFiles to open .pde and .java files in the workspace.
- Update setupCommands to include autosave and new window options.
- Modify setupSelectedVersion error message for Processing version requirement.
- Clean up console logs in setupSidebar.
- Update package.json to include new activation events and configuration options.

Author: Stefterv

client/src/extension.ts

@@ -9,6 +9,7 @@ import { setupCommands } from './setupCommands';
 import { setupLanguageServer } from './setupLanguageServer';
 import { setupSidebar } from './setupSidebar';
 import { setupDecorators } from './setupDecorators';
+import { setupPDEFiles } from './setupPDEFiles';
 
 
 export interface ProcessingVersion {
@@ -30,6 +31,7 @@ export async function activate(context: ExtensionContext) {
 	setupLanguageServer();
 	setupSidebar();
 	setupDecorators(context);
+	setupPDEFiles();
 }
 
 

client/src/setupCommands.ts

@@ -3,7 +3,21 @@ import { ExtensionContext, commands, Uri, window, workspace } from 'vscode';
 import { state } from './extension';
 
 export function setupCommands(context: ExtensionContext) {
+	const config = workspace.getConfiguration('processing');
+
 	const runSketch = commands.registerCommand('processing.sketch.run', (resource: Uri) => {
+		const autosave = config.get<boolean>('autosave');
+		if (autosave === true) {
+			// Save all files before running the sketch
+			commands.executeCommand('workbench.action.files.saveAll');
+		}
+		if (resource == undefined) {
+			const editor = window.activeTextEditor;
+			if (editor) {
+				resource = editor.document.uri;
+			}
+		}
+
 		// TODO: If the command is run from a keyboard shortcut, find the current file
 		if (!resource) {
 			return;
@@ -53,29 +67,16 @@ export function setupCommands(context: ExtensionContext) {
 			return;
 		}
 
-		workspace.updateWorkspaceFolders(
-			workspace.workspaceFolders ? workspace.workspaceFolders.length : 0,
-			null,
-			{ uri: Uri.file(folder) }
-		);
-		await commands.executeCommand('workbench.view.explorer');
-		const folderName = folder.split('/').pop();
-		const sketchFile = Uri.file(`${folder}/${folderName}.pde`);
-		try {
-			if (!workspace.fs.stat(sketchFile)) {
-				return;
-			}
 
-			const doc = await workspace.openTextDocument(sketchFile);
-			if (!doc) {
-				window.showErrorMessage(`Could not open sketch file: ${sketchFile.fsPath}`);
-				return;
-			}
-			await window.showTextDocument(doc, { preview: false });
-			window.activeTextEditor?.revealRange(doc.lineAt(0).range);
-		} catch (error) {
-			window.showErrorMessage(`Could not open sketch file: ${sketchFile.fsPath}`);
-			console.error(error);
+		const newWindow = config.get<boolean>('newWindow');
+		if (newWindow === true) {
+			await commands.executeCommand('vscode.openFolder', Uri.file(folder), true);
+		} else {
+			workspace.updateWorkspaceFolders(
+				workspace.workspaceFolders ? workspace.workspaceFolders.length : 0,
+				null,
+				{ uri: Uri.file(folder) }
+			);
 		}
 	});
 
@@ -85,7 +86,9 @@ export function setupCommands(context: ExtensionContext) {
 			canSelectFolders: true,
 			canSelectMany: false,
 			title: "Select a folder to create a new sketch in",
-			defaultUri: workspace.workspaceFolders ? workspace.workspaceFolders[0].uri : undefined,
+			defaultUri: workspace.workspaceFolders && workspace.workspaceFolders[0]
+				? Uri.joinPath(workspace.workspaceFolders[0].uri, '..')
+				: undefined,
 		});
 		if (!folder || folder.length === 0) {
 			return;

client/src/setupPDEFiles.ts

@@ -0,0 +1,24 @@
+import { RelativePattern, window, workspace, WorkspaceFolder } from 'vscode';
+
+export function setupPDEFiles() {
+	workspace.onDidChangeWorkspaceFolders(event => {
+		event.added.forEach(OpenSketchFiles);
+	});
+
+
+	workspace.workspaceFolders?.forEach(OpenSketchFiles);
+}
+
+async function OpenSketchFiles(folder: WorkspaceFolder) {
+	// find all the .pde files in the folder
+	const files = await workspace.findFiles(new RelativePattern(folder, '*.{pde,java}'));
+
+	for (const file of files) {
+		const doc = await workspace.openTextDocument(file);
+		if (!doc) {
+			window.showErrorMessage(`Could not open sketch file: ${file.fsPath}`);
+			return;
+		}
+		await window.showTextDocument(doc, { preview: false });
+	}
+}

client/src/setupSelectedVersion.ts

@@ -77,7 +77,7 @@ export async function setupSelectedVersion(context: ExtensionContext) {
 
 	if (!versions || versions.length === 0) {
 		await window.showErrorMessage(
-			`Processing not found, please install Processing 4.4.5 or higher and open it at least once.`
+			`Processing not found, please install Processing 4.4.6 or higher and open it at least once.`
 		);
 		return;
 	}

client/src/setupSidebar.ts

@@ -33,7 +33,6 @@ async function setupExamples() {
 				console.error(`exec error: ${error}`);
 				return;
 			}
-			console.log(`stdout: ${stdout}`);
 			resolve(JSON.parse(stdout));
 		});
 	});
@@ -49,7 +48,6 @@ async function setupSketchbook() {
 				console.error(`exec error: ${error}`);
 				return;
 			}
-			console.log(`stdout: ${stdout}`);
 			resolve(JSON.parse(stdout));
 		});
 	});
@@ -100,7 +98,7 @@ class ProcessingWindowDataProvider implements TreeDataProvider<FolderTreeItem |
 	}
 	getChildren(element?: FolderTreeItem): ProviderResult<(FolderTreeItem | SketchTreeItem)[]> {
 		if (element === undefined) {
-			return this.folders.flatMap((folder) => folder.children?.map(child => new FolderTreeItem(child)) ?? []);
+			return this.folders.map((folder) => new FolderTreeItem(folder)) ?? [];
 		} else {
 			const sketches = element.folder.sketches?.map((sketch) => {
 				return new SketchTreeItem(sketch);

client/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"root":["./src/compareversions.ts","./src/extension.ts","./src/setupcommands.ts","./src/setupdecorators.ts","./src/setuplanguageserver.ts","./src/setupselectedversion.ts","./src/setupsidebar.ts"],"version":"5.8.3"}
+{"root":["./src/compareversions.ts","./src/extension.ts","./src/setupcommands.ts","./src/setupdecorators.ts","./src/setuplanguageserver.ts","./src/setuppdefiles.ts","./src/setupselectedversion.ts","./src/setupsidebar.ts"],"version":"5.8.3"}

package.json

@@ -18,7 +18,8 @@
 		"vscode": "^1.75.0"
 	},
 	"activationEvents": [
-		"onLanguage:plaintext"
+		"onStartupFinished",
+		"workspaceContains:**/*.pde"
 	],
 	"main": "./client/out/extension",
 	"contributes": {
@@ -102,8 +103,14 @@
 				"processing.autosave": {
 					"scope": "window",
 					"type": "boolean",
-					"default": false,
+					"default": true,
 					"description": "Automatically save the sketch before running it."
+				},
+				"processing.newWindow": {
+					"scope": "window",
+					"type": "boolean",
+					"default": true,
+					"description": "Open sketches in a new window. If disabled, the current window will be reused."
 				}
 			}
 		},