firefly-compiler 0.4.50 → 0.4.52

package/vscode/Prepublish.ff

@@ -1,15 +1,15 @@
-nodeMain(system: NodeSystem) {
-    if(!system.path(".").endsWith(["vscode"])) {
-        panic("Must stand in the Firefly vscode/ directory.")
-    }
-    let fireflyOutputPath = system.path("firefly")
-    if(fireflyOutputPath.exists()) {fireflyOutputPath.delete()}
-    fireflyOutputPath.createDirectory()
-    system.path("../output").copyTo(fireflyOutputPath.slash("output"))
-    system.path("../compiler").copyTo(fireflyOutputPath.slash("compiler"))
-    system.path("../core").copyTo(fireflyOutputPath.slash("core"))
-    system.path("../lsp").copyTo(fireflyOutputPath.slash("lsp"))
-    system.path("../.firefly-workspace").copyTo(fireflyOutputPath.slash(".firefly-workspace"))
-    system.path("../package.json").copyTo(fireflyOutputPath.slash("package.json"))
-    system.path("../node_modules").copyTo(fireflyOutputPath.slash("node_modules"))
-}
+nodeMain(system: NodeSystem) {
+    if(!system.path(".").endsWith(["vscode"])) {
+        panic("Must stand in the Firefly vscode/ directory.")
+    }
+    let fireflyOutputPath = system.path("firefly")
+    if(fireflyOutputPath.exists()) {fireflyOutputPath.delete()}
+    fireflyOutputPath.createDirectory()
+    system.path("../output").copyTo(fireflyOutputPath.slash("output"))
+    system.path("../compiler").copyTo(fireflyOutputPath.slash("compiler"))
+    system.path("../core").copyTo(fireflyOutputPath.slash("core"))
+    system.path("../lsp").copyTo(fireflyOutputPath.slash("lsp"))
+    system.path("../.firefly-workspace").copyTo(fireflyOutputPath.slash(".firefly-workspace"))
+    system.path("../package.json").copyTo(fireflyOutputPath.slash("package.json"))
+    system.path("../node_modules").copyTo(fireflyOutputPath.slash("node_modules"))
+}

package/vscode/README.md

@@ -1,16 +1,16 @@
-# Firefly language support
-
-This extension adds support for the Firefly programming language (`.ff` files). It should work out of the box with no configuration, and comes with the following features:
-
-- Autocompletion
-- Go to definition
-- Find references
-- Signature help
-- Symbol renaming
-- Document and workspace symbols
-- Show type on hover
-- Diagnostics
-- Run in terminal
-
-To install the Firefly compiler, run the following command in the terminal:  
-```npm install -g firefly-compiler```
+# Firefly language support
+
+This extension adds support for the Firefly programming language (`.ff` files). It should work out of the box with no configuration, and comes with the following features:
+
+- Autocompletion
+- Go to definition
+- Find references
+- Signature help
+- Symbol renaming
+- Document and workspace symbols
+- Show type on hover
+- Diagnostics
+- Run in terminal
+
+To install the Firefly compiler, run the following command in the terminal:  
+```npm install -g firefly-compiler```

package/vscode/client/package.json

@@ -1,22 +1,22 @@
-{
-	"name": "firefly-client",
-	"description": "Firefly language server client",
-	"author": "Firefly team",
-	"license": "MIT",
-	"version": "0.0.1",
-	"publisher": "Firefly team",
-	"repository": {
-		"type": "git",
-		"url": "https://github.com/Ahnfelt/firefly-boot"
-	},
-	"engines": {
-		"vscode": "^1.75.0"
-	},
-	"dependencies": {
-		"vscode-languageclient": "^8.1.0"
-	},
-	"devDependencies": {
-		"@types/vscode": "^1.75.1",
-		"@vscode/test-electron": "^2.2.3"
-	}
-}
+{
+	"name": "firefly-client",
+	"description": "Firefly language server client",
+	"author": "Firefly team",
+	"license": "MIT",
+	"version": "0.0.1",
+	"publisher": "Firefly team",
+	"repository": {
+		"type": "git",
+		"url": "https://github.com/Ahnfelt/firefly-boot"
+	},
+	"engines": {
+		"vscode": "^1.75.0"
+	},
+	"dependencies": {
+		"vscode-languageclient": "^8.1.0"
+	},
+	"devDependencies": {
+		"@types/vscode": "^1.75.1",
+		"@vscode/test-electron": "^2.2.3"
+	}
+}

package/vscode/client/src/extension.ts

@@ -1,104 +1,104 @@
-import * as fs from 'fs';
-import * as path from 'path';
-import * as vscode from 'vscode';
-
-import {
-    LanguageClient,
-    LanguageClientOptions,
-    ServerOptions,
-    TransportKind
-} from 'vscode-languageclient/node';
-
-let client: LanguageClient;
-
-export function activate(context: vscode.ExtensionContext) {
-
-    const fireflyPath = fs.existsSync(path.join(context.extensionPath, '.vsixmanifest'))
-        ? path.join(context.extensionPath, 'firefly')
-        : path.join(context.extensionPath, '..')
-        
-    const fireflyCompiler = fireflyPath + '/output/js/ff/compiler/Main.mjs';
-
-    context.subscriptions.push(vscode.commands.registerCommand('extension.firefly-lang.getFireflyPath', config => {
-        return fireflyPath;
-    }));
-
-    context.subscriptions.push(vscode.commands.registerCommand('extension.firefly-lang.getFireflyCompiler', config => {
-        return fireflyCompiler;
-    }));
-    
-    let runFireflyProgramCommand = vscode.commands.registerCommand(
-		"extension.firefly-lang.runFireflyProgram",
-		async () => {
-			const editor = vscode.window.activeTextEditor;
-			if(!editor) {
-				vscode.window.showErrorMessage("No active text editor.");
-				return;
-			}
-			const filePath = editor.document.fileName;
-            const fileDirectory = require('path').dirname(filePath);
-            const fileName = require('path').basename(filePath);
-			const terminal = vscode.window.createTerminal("firefly");
-            terminal.sendText(`cd "${fileDirectory}" # npm install -g firefly-compiler`);
-            terminal.sendText(`firefly "${fileName}"`);
-			terminal.show();
-		}
-	);
-    
-    context.subscriptions.push(runFireflyProgramCommand);
-    
-    let runFireflyProgramButton = vscode.window.createStatusBarItem(
-		vscode.StatusBarAlignment.Left
-	);
-	runFireflyProgramButton.text = "$(triangle-right) Run Firefly Program";
-	runFireflyProgramButton.command = "extension.firefly-lang.runFireflyProgram";
-
-    context.subscriptions.push(runFireflyProgramButton);
-    
-    const runOrDebug = {
-        module: fireflyCompiler,
-        args: ['LanguageServer.ff'],
-        options: {cwd: fireflyPath + '/lsp'},
-        transport: TransportKind.stdio // ipc
-    };
-
-    const serverOptions: ServerOptions = {
-        run: runOrDebug,
-        debug: runOrDebug
-    };  
-
-    const clientOptions: LanguageClientOptions = {
-        documentSelector: [{ scheme: 'file', language: 'firefly' }],
-        synchronize: {
-             // It would be more portable to send a client/registerCapability from the server for this
-            fileEvents: vscode.workspace.createFileSystemWatcher('**/*.ff')
-        }
-    };
-
-    client = new LanguageClient(
-        'firefly',
-        'Firefly Language Server',
-        serverOptions,
-        clientOptions
-    );
-
-    client.start();
-    
-    context.subscriptions.push(vscode.window.onDidChangeActiveTextEditor(editor => {
-        if(editor && editor.document.languageId === 'firefly') {
-            client.sendNotification('custom/focusDocument', {
-                "textDocument": {
-                    uri: editor.document.uri.toString(),
-                    version: editor.document.version,
-                }
-            });
-        }
-    }));
-}
-
-export function deactivate(): Thenable<void> | undefined {
-    if (!client) {
-        return undefined;
-    }
-    return client.stop();
-}
+import * as fs from 'fs';
+import * as path from 'path';
+import * as vscode from 'vscode';
+
+import {
+    LanguageClient,
+    LanguageClientOptions,
+    ServerOptions,
+    TransportKind
+} from 'vscode-languageclient/node';
+
+let client: LanguageClient;
+
+export function activate(context: vscode.ExtensionContext) {
+
+    const fireflyPath = fs.existsSync(path.join(context.extensionPath, '.vsixmanifest'))
+        ? path.join(context.extensionPath, 'firefly')
+        : path.join(context.extensionPath, '..')
+        
+    const fireflyCompiler = fireflyPath + '/output/js/ff/compiler/Main.mjs';
+
+    context.subscriptions.push(vscode.commands.registerCommand('extension.firefly-lang.getFireflyPath', config => {
+        return fireflyPath;
+    }));
+
+    context.subscriptions.push(vscode.commands.registerCommand('extension.firefly-lang.getFireflyCompiler', config => {
+        return fireflyCompiler;
+    }));
+    
+    let runFireflyProgramCommand = vscode.commands.registerCommand(
+		"extension.firefly-lang.runFireflyProgram",
+		async () => {
+			const editor = vscode.window.activeTextEditor;
+			if(!editor) {
+				vscode.window.showErrorMessage("No active text editor.");
+				return;
+			}
+			const filePath = editor.document.fileName;
+            const fileDirectory = require('path').dirname(filePath);
+            const fileName = require('path').basename(filePath);
+			const terminal = vscode.window.createTerminal("firefly");
+            terminal.sendText(`cd "${fileDirectory}" # npm install -g firefly-compiler`);
+            terminal.sendText(`firefly "${fileName}"`);
+			terminal.show();
+		}
+	);
+    
+    context.subscriptions.push(runFireflyProgramCommand);
+    
+    let runFireflyProgramButton = vscode.window.createStatusBarItem(
+		vscode.StatusBarAlignment.Left
+	);
+	runFireflyProgramButton.text = "$(triangle-right) Run Firefly Program";
+	runFireflyProgramButton.command = "extension.firefly-lang.runFireflyProgram";
+
+    context.subscriptions.push(runFireflyProgramButton);
+    
+    const runOrDebug = {
+        module: fireflyCompiler,
+        args: ['LanguageServer.ff'],
+        options: {cwd: fireflyPath + '/lsp'},
+        transport: TransportKind.stdio // ipc
+    };
+
+    const serverOptions: ServerOptions = {
+        run: runOrDebug,
+        debug: runOrDebug
+    };  
+
+    const clientOptions: LanguageClientOptions = {
+        documentSelector: [{ scheme: 'file', language: 'firefly' }],
+        synchronize: {
+             // It would be more portable to send a client/registerCapability from the server for this
+            fileEvents: vscode.workspace.createFileSystemWatcher('**/*.ff')
+        }
+    };
+
+    client = new LanguageClient(
+        'firefly',
+        'Firefly Language Server',
+        serverOptions,
+        clientOptions
+    );
+
+    client.start();
+    
+    context.subscriptions.push(vscode.window.onDidChangeActiveTextEditor(editor => {
+        if(editor && editor.document.languageId === 'firefly') {
+            client.sendNotification('custom/focusDocument', {
+                "textDocument": {
+                    uri: editor.document.uri.toString(),
+                    version: editor.document.version,
+                }
+            });
+        }
+    }));
+}
+
+export function deactivate(): Thenable<void> | undefined {
+    if (!client) {
+        return undefined;
+    }
+    return client.stop();
+}

package/vscode/icons/firefly-icon.svg

@@ -1,10 +1,10 @@
-<svg width="19" height="19" viewBox="0 0 19 19" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_1_3)">
-<path d="M6.38484 13.7081V4.98083H11.9758V6.30611H7.96581V8.67543H11.5922V10.0007H7.96581V13.7081H6.38484ZM13.4161 13.7081V4.98083H19.007V6.30611H14.9971V8.67543H18.6235V10.0007H14.9971V13.7081H13.4161Z" fill="#D28E3D"/>
-</g>
-<defs>
-<clipPath id="clip0_1_3">
-<rect width="19" height="19" fill="white"/>
-</clipPath>
-</defs>
-</svg>
+<svg width="19" height="19" viewBox="0 0 19 19" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_1_3)">
+<path d="M6.38484 13.7081V4.98083H11.9758V6.30611H7.96581V8.67543H11.5922V10.0007H7.96581V13.7081H6.38484ZM13.4161 13.7081V4.98083H19.007V6.30611H14.9971V8.67543H18.6235V10.0007H14.9971V13.7081H13.4161Z" fill="#D28E3D"/>
+</g>
+<defs>
+<clipPath id="clip0_1_3">
+<rect width="19" height="19" fill="white"/>
+</clipPath>
+</defs>
+</svg>

package/vscode/language-configuration.json

@@ -1,62 +1,62 @@
-{
-    "comments": {
-        "lineComment": "//",
-        "blockComment": ["/*", "*/"]
-    },
-    "brackets": [
-        ["{", "}"],
-        ["[", "]"],
-        ["(", ")"]
-    ],
-    "autoClosingPairs": [
-        { "open": "{", "close": "}" },
-        { "open": "[", "close": "]" },
-        { "open": "(", "close": ")" },
-        { "open": "'", "close": "'", "notIn": ["string", "comment"] },
-        { "open": "\"", "close": "\"", "notIn": ["string"] },
-        { "open": "\"\"\"", "close": "\"\"\"", "notIn": ["string"] }
-    ],
-    "autoCloseBefore": ";:.,=}])>` \n\t",
-    "surroundingPairs": [
-        ["{", "}"],
-        ["[", "]"],
-        ["(", ")"],
-        ["'", "'"],
-        ["\"", "\""],
-        ["\"\"\"", "\"\"\""],
-    ],
-    "folding": {
-        "markers": {
-            "start": "^\\s*//\\s*#?region\\b",
-            "end": "^\\s*//\\s*#?endregion\\b"
-        }
-    },
-    "wordPattern": "([^\\`\\~\\!\\@\\#\\%\\^\\&\\*\\(\\)\\-\\=\\+\\[\\{\\]\\}\\\\\\|\\;\\:\\'\\\"\\,\\.\\<\\>\\/\\?\\s]+)",
-    "indentationRules": {
-        "increaseIndentPattern": "^((?!\\/\\/).)*(\\{[^}\"'`]*|\\([^)\"'`]*|\\[[^\\]\"'`]*|=>.*)$",
-        "decreaseIndentPattern": "^((?!.*?\\/\\*).*\\*/)?\\s*[\\)\\}\\]|].*$"
-    }, 
-    "onEnterRules": [
-        {
-            "beforeText": "\\.{\\s*$",
-            "action": {
-                "appendText": "| ",
-                "indent": "indent"
-            }
-        },
-        {
-            "beforeText": "^\\s*",
-            "afterText": "\\s*\\|",
-            "action": {
-                "indent": "none"
-            }
-        },
-        {
-            "beforeText": "({|=>)\\s*$",
-            "afterText": "^\\s*}",
-            "action": {
-                "indent": "indentOutdent"
-            }
-        }
-    ]
+{
+    "comments": {
+        "lineComment": "//",
+        "blockComment": ["/*", "*/"]
+    },
+    "brackets": [
+        ["{", "}"],
+        ["[", "]"],
+        ["(", ")"]
+    ],
+    "autoClosingPairs": [
+        { "open": "{", "close": "}" },
+        { "open": "[", "close": "]" },
+        { "open": "(", "close": ")" },
+        { "open": "'", "close": "'", "notIn": ["string", "comment"] },
+        { "open": "\"", "close": "\"", "notIn": ["string"] },
+        { "open": "\"\"\"", "close": "\"\"\"", "notIn": ["string"] }
+    ],
+    "autoCloseBefore": ";:.,=}])>` \n\t",
+    "surroundingPairs": [
+        ["{", "}"],
+        ["[", "]"],
+        ["(", ")"],
+        ["'", "'"],
+        ["\"", "\""],
+        ["\"\"\"", "\"\"\""],
+    ],
+    "folding": {
+        "markers": {
+            "start": "^\\s*//\\s*#?region\\b",
+            "end": "^\\s*//\\s*#?endregion\\b"
+        }
+    },
+    "wordPattern": "([^\\`\\~\\!\\@\\#\\%\\^\\&\\*\\(\\)\\-\\=\\+\\[\\{\\]\\}\\\\\\|\\;\\:\\'\\\"\\,\\.\\<\\>\\/\\?\\s]+)",
+    "indentationRules": {
+        "increaseIndentPattern": "^((?!\\/\\/).)*(\\{[^}\"'`]*|\\([^)\"'`]*|\\[[^\\]\"'`]*|=>.*)$",
+        "decreaseIndentPattern": "^((?!.*?\\/\\*).*\\*/)?\\s*[\\)\\}\\]|].*$"
+    }, 
+    "onEnterRules": [
+        {
+            "beforeText": "\\.{\\s*$",
+            "action": {
+                "appendText": "| ",
+                "indent": "indent"
+            }
+        },
+        {
+            "beforeText": "^\\s*",
+            "afterText": "\\s*\\|",
+            "action": {
+                "indent": "none"
+            }
+        },
+        {
+            "beforeText": "({|=>)\\s*$",
+            "afterText": "^\\s*}",
+            "action": {
+                "indent": "indentOutdent"
+            }
+        }
+    ]
 }