firefly-compiler 0.5.73 → 0.5.75

package/core/BuildSystem.ff

@@ -53,27 +53,6 @@ extend self: BuildSystem {
         
 }
 
-// TODO: Remove
-internalCallEsBuild(
-    self: NodeSystem
-    mainJsFile: String
-    outputPath: String
-    minify: Bool
-    sourceMap: Bool
-): Unit {
-    let esbuild = Js.import("esbuild")
-    esbuild->build(Js->(
-        stdin = Js->(contents = "import {$run$} from './" + mainJsFile + "';", resolveDir = ".")
-        bundle = True
-        minify = minify
-        sourcemap = sourceMap
-        platform = "browser"
-        target = "es2017"
-        external = ["../../../node_modules/*"] // TODO
-        outfile = outputPath
-    ))
-}
-
 internalBrowserCallEsBuild(
     self: BuildSystem
     mainJsFiles: List[String]

package/output/js/ff/core/BuildSystem.mjs

@@ -101,11 +101,6 @@ import * as ff_core_Unit from "../../ff/core/Unit.mjs"
 
 
 
-export function internalCallEsBuild_(self_, mainJsFile_, outputPath_, minify_, sourceMap_) {
-const esbuild_ = import$0;
-esbuild_.build({stdin: {contents: (("import {$run$} from './" + mainJsFile_) + "';"), resolveDir: "."}, bundle: true, minify: minify_, sourcemap: sourceMap_, platform: "browser", target: "es2017", external: ["../../../node_modules/*"], outfile: outputPath_})
-}
-
 export function internalBrowserCallEsBuild_(self_, mainJsFiles_, outputPath_, minify_, sourceMap_) {
 const esbuild_ = import$0;
 esbuild_.build({entryPoints: mainJsFiles_, bundle: true, minify: minify_, sourcemap: sourceMap_, platform: "browser", target: "es2017", outdir: outputPath_, outExtension: {[".js"]: ".bundle.js"}})
@@ -156,11 +151,6 @@ export function internalMainPackagePair_(buildSystem_) {
 return ff_core_Pair.Pair(buildSystem_["mainPackagePair_"]["group_"], buildSystem_["mainPackagePair_"]["name_"])
 }
 
-export async function internalCallEsBuild_$(self_, mainJsFile_, outputPath_, minify_, sourceMap_, $task) {
-const esbuild_ = import$0;
-esbuild_.build({stdin: {contents: (("import {$run$} from './" + mainJsFile_) + "';"), resolveDir: "."}, bundle: true, minify: minify_, sourcemap: sourceMap_, platform: "browser", target: "es2017", external: ["../../../node_modules/*"], outfile: outputPath_})
-}
-
 export async function internalBrowserCallEsBuild_$(self_, mainJsFiles_, outputPath_, minify_, sourceMap_, $task) {
 const esbuild_ = import$0;
 (await esbuild_.build({entryPoints: mainJsFiles_, bundle: true, minify: minify_, sourcemap: sourceMap_, platform: "browser", target: "es2017", outdir: outputPath_, outExtension: {[".js"]: ".bundle.js"}}))

package/package.json

@@ -4,7 +4,7 @@
     "description": "Firefly compiler",
     "author": "Firefly team",
     "license": "MIT",
-    "version": "0.5.73",
+    "version": "0.5.75",
     "repository": {
         "type": "git",
         "url": "https://github.com/Ahnfelt/firefly-boot"

package/vscode/client/src/extension.ts

@@ -94,6 +94,36 @@ export function activate(context: vscode.ExtensionContext) {
             });
         }
     }));
+
+    class FireflyDecorationProvider implements vscode.FileDecorationProvider {
+        private _onDidChangeFileDecorations = new vscode.EventEmitter<vscode.Uri | vscode.Uri[]>();
+        readonly onDidChangeFileDecorations = this._onDidChangeFileDecorations.event;
+    
+        provideFileDecoration(uri: vscode.Uri): vscode.FileDecoration | undefined {
+            if(fs.existsSync(path.join(uri.fsPath, '.firefly/package.ff'))) {
+                const config = vscode.workspace.getConfiguration('firefly');
+                const decorationColor = config.get<string>('packageFolderColor', 'charts.blue'); // Default to 'charts.blue'
+                return {
+                    tooltip: 'Contains .firefly folder',
+                    color: new vscode.ThemeColor(decorationColor),
+                };
+            }
+            return undefined;
+        }
+    
+        refresh(uri: vscode.Uri): void {
+            this._onDidChangeFileDecorations.fire(uri);
+        }
+    }
+    
+    const decorationProvider = new FireflyDecorationProvider();
+    context.subscriptions.push(vscode.window.registerFileDecorationProvider(decorationProvider));
+    
+    const watcher = vscode.workspace.createFileSystemWatcher('**/.firefly/package.ff');
+    watcher.onDidCreate(uri => decorationProvider.refresh(vscode.Uri.file(path.dirname(path.dirname(uri.fsPath)))));
+    watcher.onDidDelete(uri => decorationProvider.refresh(vscode.Uri.file(path.dirname(path.dirname(uri.fsPath)))));
+    watcher.onDidChange(uri => decorationProvider.refresh(vscode.Uri.file(path.dirname(path.dirname(uri.fsPath)))));
+    context.subscriptions.push(watcher);
 }
 
 export function deactivate(): Thenable<void> | undefined {

package/vscode/package.json

@@ -4,7 +4,7 @@
     "description": "Firefly language support",
     "author": "Firefly team",
     "license": "MIT",
-    "version": "0.5.73",
+    "version": "0.5.75",
     "repository": {
         "type": "git",
         "url": "https://github.com/Ahnfelt/firefly-boot"
@@ -128,6 +128,11 @@
                     ],
                     "default": "verbose",
                     "description": "Traces the communication between VS Code and the language server."
+                },
+                "firefly.packageFolderColor": {
+                    "type": "string",
+                    "default": "charts.blue",
+                    "description": "The color used for Firefly folder decorations."
                 }
             }
         },

package/vscode/syntaxes/firefly.tmLanguage.json

@@ -31,7 +31,7 @@
         ]},
         "keyword": {
             "name": "keyword.declaration.firefly",
-            "match": "\\b(data|class|capability|import|from|dependency|package|include|extend|tailcall|function|let|mutable|firefly|trait|instance|newtype|private|safe|unsafe|trust|target)\\b(?=[ ]*[A-Za-z0-9\"'])"
+            "match": "\\b(data|class|capability|import|from|dependency|package|include|extend|tailcall|function|let|mutable|firefly|trait|instance|newtype|safe|unsafe|trust|target|private|protected|public|export|local|internal|opaque)\\b(?=[ ]*[A-Za-z0-9\"'])"
         },
         "spread": {
             "name": "punctuation.spread.firefly",

package/experimental/browser/BrowserMain.ff

@@ -1,3 +0,0 @@
-browserMain(system: BrowserSystem) {
-    system.js()->document->title = "Hello!"
-}