v1.2.1 (#21)

* [[explicit-variables]] Adds command to toggle explicit variable checks (#17)

This patch adds a setting to allow the user to toggle variable checking 
for the linter to alert the user if variables have not been declared.

* [[indentation]] Adds support for custom indentaton (#15)

This patch adds support for custom indentation that allows you to choose 
between tabs or spaces, with custom indentation size for spaces. Tabs are 
locked at 1 indentation size.

Co-authored-by: William <[email protected]>

* [[live-server]] Edited code in vscode is displayed in livecode scripts (#16)

This patch adds the connection between vscode and livecode using TCP 
sockets to send code changes from vscode to the LiveCode script editor.

Co-authored-by: William <[email protected]>

* Version updated

* [[live-server]] Adds toast notifications for users (#19)

This patch adds toast notifications to indicate to the user what is 
happening in the connection between vscode and LiveCode. Also tidied up 
some functions.

* [[indentation]] Changed indentation to be same format as current code (#20)

This patch adds the indentation checks to be within the switch statement 
of the already existing code.

* Version updated

Co-authored-by: Ruaridh Bell <[email protected]>

Author: WilliamDelRey

CHANGELOG.md

@@ -4,13 +4,29 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
 
+
+# [1.2.1] - 2022-10-05
+
+### Changed
+- Indentation changed to be consistent with current code
+
+### Added
+- Use toasts to notify about the status of the connection with LC
+
+
+
+
+
 # [1.2.0] - 2022-10-05
 
 ### Added
 - Setting to toggle explicit variable checks
 - Edited code in vscode is displayed in livecode scripts
 - Support for custom indentation
 
+
+
+
 ## [1.1.7] - 2022-03-22
 
 ### Fixed

package.json

@@ -2,7 +2,7 @@
     "name": "livecodescript",
     "description": "This extension adds several features to handle livecodescript files",
     "displayName": "Livecode Language Support",
-    "version": "1.2.0",
+    "version": "1.2.1"
     "author": "FerrusLogic",
     "publisher": "Ferruslogic",
     "license": "SEE LICENSE IN LICENSE.md",

src/features/livecodescript/LCSformat.ts

@@ -42,8 +42,8 @@ export class LivecodescriptFormattingProvider implements vscode.DocumentRangeFor
                     .resolve(__dirname, "../../../tools/Formatter.lc")
                     .replace(/[\\]+/g, "/"),
                 "-scope=.source.livecodescript",
-                indentation,
-                indentationSize,
+                `-indentation=${indentation}`,
+                `-indentationSize=${indentationSize}`,
             ];
 
           /*  let container = config.get("perltidyContainer", "");

src/features/livecodescript/LCSserverProvider.ts

@@ -2,27 +2,25 @@ import * as vscode from "vscode";
 import { TextDecoder } from "text-encoding";
 import { PromiseSocket } from "promise-socket";
 
-const enum Setting {
-	Enable = "livecodescript.server.enable",
-	Host = "livecodescript.server.host",
-	Port = "livecodescript.server.port",
-}
 
 export default class LivecodescriptServerProvider {
 	private enabled: boolean;
 	private host: string;
 	private port: number;
 
-	constructor() {}
+
+	constructor() {
+		this.loadConfiguration();
+	}
+
 
 	public activate(subscriptions: vscode.Disposable[]) {
 		subscriptions.push(this);
 		subscriptions.push(
 			vscode.workspace.onDidSaveTextDocument(
 				async ({ fileName, languageId, lineAt }) => {
-					if (this.enabled === undefined) {
-						await this.loadConfiguration();
-					}
+
+					console.log("DOCUMENT SAVED");
 
 					if (this.enabled && languageId === "livecodescript") {
 						const regex = '"([-.:a-zA-Z0-9_s?!]+)"';
@@ -32,78 +30,82 @@ export default class LivecodescriptServerProvider {
 							stack: scriptName,
 							filename: fileName,
 						};
-
-						let prms = new URLSearchParams(query);
-
-						const socket = new PromiseSocket();
-						socket.setTimeout(300);
-
-						try {
-							await socket.connect(this.port, this.host);
-							await socket.write(`${prms.toString()}\n`);
-
-							const data = await socket.read();
-							let result = new TextDecoder().decode(data);
-
-							if (result !== "success") {
-								if (result.includes("error: 360")) {
-									console.log(
-										"error: script is being executed within Livecode"
-									);
-								} else {
-									console.log(
-										`error running command in LiveCode: ${result}`
-									);
-								}
-							} else {
-								console.log(
-									"command successfully sent to LiveCode"
-								);
-							}
-							socket.destroy();
-						} catch (err) {
-							console.log(err);
-							socket.destroy();
-						}
+            
+						this.sendToLiveCode(query);
 					}
 				}
 			)
 		);
-	}
+
+		subscriptions.push(
+			vscode.workspace.onDidChangeConfiguration(() =>
+				this.loadConfiguration()
+			)
+		);
+ 
 
 	public dispose(): void {}
 
-	private async loadConfiguration(): Promise<void> {
-		const section = vscode.workspace.getConfiguration();
-		this.enabled = this.getSettingValue<boolean>(
-			section,
-			Setting.Enable,
-			false
-		);
-		this.host = this.getSettingValue<string>(
-			section,
-			Setting.Host,
-			"localhost"
-		);
-		this.port = this.getSettingValue<number>(section, Setting.Port, 61373);
+
+	private loadConfiguration() {
+		console.log("CONFIG CHANGED");
+		const section = vscode.workspace.getConfiguration("livecodescript");
+		this.enabled = section.get("server.enable", false);
+		this.host = section.get("server.host", "localhost");
+		this.port = section.get("server.port", 61373);
 	}
 
-	private getSettingValue<T>(
-		section: vscode.WorkspaceConfiguration,
-		setting: Setting,
-		def: T
-	): T {
-		const value = section.inspect<T>(setting);
-		if (value === undefined) {
-			return def;
-		} else if (value.workspaceValue !== undefined) {
-			return value.workspaceValue;
-		} else if (value.globalValue !== undefined) {
-			return value.globalValue;
-		} else if (value.defaultValue !== undefined) {
-			return value.defaultValue;
-		} else {
-			return def;
+	private async sendToLiveCode(query) {
+		let prms = new URLSearchParams(query);
+		const socket = new PromiseSocket();
+		socket.setTimeout(300);
+
+		try {
+			await socket.connect(this.port, this.host);
+			await socket.write(`${prms.toString()}\n`);
+
+			const data = await socket.read();
+			socket.destroy();
+			let result = new TextDecoder().decode(data);
+
+			if (result !== "success") {
+				if (result.includes("error: 360")) {
+					vscode.window.showInformationMessage(
+						"error: script is being executed within Livecode"
+					);
+				} else {
+					vscode.window
+						.showErrorMessage(
+							`error running command in LiveCode: ${result}`,
+							...["Retry"]
+						)
+						.then((selection) => {
+							console.log(selection);
+							if (selection === "Retry") {
+								this.sendToLiveCode(query);
+							}
+						});
+				}
+			} else {
+				vscode.window.showInformationMessage(
+					"command successfully sent to LiveCode"
+				);
+			}
+		} catch (err) {
+			socket.destroy();
+			console.log(err);
+			vscode.window
+				.showErrorMessage(
+					"An error occurred while updating LiveCode.",
+					...["Retry"]
+				)
+				.then((selection) => {
+					console.log(selection);
+					if (selection === "Retry") {
+						this.sendToLiveCode(query);
+					}
+				});
+
 		}
 	}
 }

tools/Formatter.lc

@@ -13,15 +13,18 @@ command FormatScript
 	local tIndentation, tIndentSize, tArgs
 
 	put the commandArguments into tArgs
-	put tArgs[3] into tIndentation
-	put tArgs[4] into tIndentSize
-
 	repeat for each element theArgument in tArgs
 		split theArgument with "="
 		switch theArgument[1]
 			case "-scope"
 				put theArgument[2] into tScope
 				break
+			case "-indentation"
+				put theArgument[2] into tIndentation
+				break
+			case "-indentationSize"
+				put theArgument[2] into tIndentSize
+				break
 		end switch
 	end repeat