Add buttons for adding template file

Author: vetlek

client/src/commands.ts

@@ -7,6 +7,7 @@ import * as vscode from "vscode";
 import * as protocol from "./protocol";
 import { LanguageClient } from "vscode-languageclient/node";
 import { generateCalc } from './lm';
+import { ScgNode, ScgTreeItemType } from './scgTreeProvider';
 
 export function registerCommandDetectCycles(context: vscode.ExtensionContext, client: LanguageClient) {
 	vscode.commands.registerCommand("septic.detectCycles", async () => {
@@ -129,17 +130,44 @@ export function registerCommandOpcTagList(context: vscode.ExtensionContext, clie
 	});
 }
 
+export function registerCommandAddTemplate() {
+	vscode.commands.registerCommand('septic.scgtree.addTemplate', async (node: ScgNode) => {
+		if (!node) {
+			return;
+		}
+		const template = await vscode.window.showInputBox({
+			placeHolder: "Enter template name"
+		});
+		const sources = (await node.config.getSources()).map(s => ({ label: s.id, value: s.id }));
+		const source = await vscode.window.showQuickPick([{ label: 'No source', value: undefined }, ...sources]);
+		if (!template || !source) {
+			return;
+		}
+		const elementToInsertAfter = node.type === ScgTreeItemType.Template ? node.label : undefined;
+		node.config.addTemplate(template, source.value, elementToInsertAfter);
+		await node.config.save()
+		const wsedit = new vscode.WorkspaceEdit();
+		const filePath = vscode.Uri.file(node.config.templatepath + "/" + template);
+		wsedit.createFile(filePath);
+		await vscode.workspace.applyEdit(wsedit);
+		await vscode.window.showTextDocument(filePath, {
+			preserveFocus: false,
+		});
+	});
+}
+
 export function registerCommandGenerateCalc(context: vscode.ExtensionContext, client: LanguageClient) {
 	vscode.commands.registerCommand("septic.generateCalc", async (description: string, start: vscode.Position, end: vscode.Position) => {
 		generateCalc(client, description, start, end);
 	});
 }
 
-export function registerAllCommands(context: vscode.ExtensionContext, client: LanguageClient) {
+export function registerCommands(context: vscode.ExtensionContext, client: LanguageClient) {
 	registerCommandDetectCycles(context, client);
 	registerCommandCompareCnfg(context, client);
 	registerCommandOpcTagList(context, client);
 	registerCommandGenerateCalc(context, client);
+	registerCommandAddTemplate();
 }
 
 

client/src/extension.ts

@@ -11,7 +11,7 @@ import {
     ServerOptions,
     TransportKind,
 } from "vscode-languageclient/node";
-import { registerAllCommands } from './commands';
+import { registerCommands } from './commands';
 import { registerRequestHandlers } from "./requests";
 import { registerChatTools } from './tools';
 import { registerSepticChatParticipant } from './chatParticipant';
@@ -64,9 +64,8 @@ export function activate(context: vscode.ExtensionContext) {
         }
         scgProjectProvider.refresh();
     })
-    vscode.commands.registerCommand('septic.refreshEntry', () => scgProjectProvider.refresh());
     registerChatTools(context, client)
-    registerAllCommands(context, client);
+    registerCommands(context, client);
     registerRequestHandlers(client);
     registerSepticChatParticipant(context, client)
     client.start();

client/src/scg.ts

@@ -68,6 +68,28 @@ export class ScgConfig {
 		return sources;
 	}
 
+	public addTemplate(name: string, source: string | undefined, elementToInsertAfter: string | undefined = undefined): void {
+		if (elementToInsertAfter) {
+			const index = this.config.layout.findIndex(item => item.name === elementToInsertAfter);
+			if (index !== -1) {
+				this.config.layout.splice(index + 1, 0, {
+					name,
+					source: source,
+				});
+			} else {
+				this.config.layout.push({
+					name,
+					source: source,
+				});
+			}
+		} else {
+			this.config.layout.push({
+				name,
+				source: source,
+			});
+		}
+	}
+
 	get name(): string {
 		return path.basename(this.path);
 	}

client/src/scgTreeProvider.ts

@@ -24,13 +24,13 @@ export class ScgTreeProvider implements vscode.TreeDataProvider<ScgNode> {
 			return Promise.resolve(this.getScgConfigs());
 		}
 		if (element.type === ScgTreeItemType.Config && element.config) {
-			const layout = new ScgNode("Layout", ScgTreeItemType.Layout, vscode.TreeItemCollapsibleState.Expanded, element.config, element.file);
-			const sources = new ScgNode("Sources", ScgTreeItemType.Sources, vscode.TreeItemCollapsibleState.Collapsed, element.config, element.file);
+			const layout = new ScgNode("Layout", ScgTreeItemType.Layout, vscode.TreeItemCollapsibleState.Expanded, element.config);
+			const sources = new ScgNode("Sources", ScgTreeItemType.Sources, vscode.TreeItemCollapsibleState.Collapsed, element.config);
 			return Promise.resolve([layout, sources]);
 		} else if (element.type === ScgTreeItemType.Layout) {
 			const items: ScgNode[] = [];
 			for (const layout of element.config.layout) {
-				items.push(new ScgNode(layout.name, ScgTreeItemType.Template, vscode.TreeItemCollapsibleState.None, undefined, undefined, {
+				items.push(new ScgNode(layout.name, ScgTreeItemType.Template, vscode.TreeItemCollapsibleState.None, element.config, {
 					command: 'vscode.open',
 					title: 'Open Template',
 					arguments: [vscode.Uri.file(element.config.templatepath + "/" + layout.name || '')]
@@ -41,7 +41,7 @@ export class ScgTreeProvider implements vscode.TreeDataProvider<ScgNode> {
 			const items: ScgNode[] = [];
 			const sources = await element.config.getSources();
 			for (const source of sources) {
-				items.push(new ScgNode(source.id, ScgTreeItemType.Source, vscode.TreeItemCollapsibleState.Collapsed, element.config, element.file, {
+				items.push(new ScgNode(source.id, ScgTreeItemType.Source, vscode.TreeItemCollapsibleState.Collapsed, element.config, {
 					command: 'vscode.open',
 					title: 'Open Source',
 					arguments: [vscode.Uri.file(source.filename)]
@@ -71,29 +71,17 @@ export class ScgTreeProvider implements vscode.TreeDataProvider<ScgNode> {
 		const treeItems: ScgNode[] = [];
 		scgConfigs.sort((a, b) => a.name.localeCompare(b.name));
 		for (const config of scgConfigs) {
-			treeItems.push(new ScgNode(config.name, ScgTreeItemType.Config, vscode.TreeItemCollapsibleState.Expanded, config, config.path, {
+			treeItems.push(new ScgNode(config.name, ScgTreeItemType.Config, vscode.TreeItemCollapsibleState.Expanded, config, {
 				command: 'vscode.open',
 				title: 'Open Config',
 				arguments: [vscode.Uri.file(config.path)]
 			}));
 		}
 		return treeItems;
 	}
-
-	private async getScgSourceColumns(file: string, delimiter: string): Promise<string[]> {
-		try {
-			const content = await vscode.workspace.fs.readFile(vscode.Uri.file(file));
-			const lines = content.toString().split('\n');
-			const headers = lines[0].split(delimiter);
-			return headers.map(header => header.trim());
-		} catch (error) {
-			console.error('Error reading source columns:', error);
-			return [];
-		}
-	}
 }
 
-enum ScgTreeItemType {
+export enum ScgTreeItemType {
 	Config = "Config",
 	Template = "Template",
 	Layout = "Layout",
@@ -108,16 +96,15 @@ export class ScgNode extends vscode.TreeItem {
 		public readonly label: string,
 		public readonly type: ScgTreeItemType,
 		public readonly collapsibleState: vscode.TreeItemCollapsibleState,
-		public readonly config?: ScgConfig,
-		public readonly file?: string,
+		public readonly config: ScgConfig,
 		public readonly command?: vscode.Command
 	) {
 		super(label, collapsibleState);
 
 		this.tooltip = `${this.label}`;
 		this.description = this.type;
 		this.contextValue = this.type;
-		if (type === ScgTreeItemType.Config && file) {
+		if (type === ScgTreeItemType.Config) {
 			this.iconPath = new vscode.ThemeIcon("settings-view-bar-icon");
 		} else if (type === ScgTreeItemType.Layout) {
 			this.iconPath = new vscode.ThemeIcon("folder");

package.json

@@ -42,6 +42,11 @@
       {
         "command": "septic.generateCalc",
         "title": "Septic: Generate Calc"
+      },
+      {
+        "command": "septic.scgtree.addTemplate",
+        "title": "Septic: Insert template below",
+        "icon": "$(add)"
       }
     ],
     "configuration": {
@@ -201,6 +206,15 @@
         }
       ]
     },
+    "menus": {
+      "view/item/context": [
+        {
+          "command": "septic.scgtree.addTemplate",
+          "when": "view == septic-scg && (viewItem == Template || viewItem == Layout)",
+          "group": "inline"
+        }
+      ]
+    },
     "chatParticipants": [
       {
         "id": "septic.chat",