firefly-compiler 0.4.15 → 0.4.16

package/guide/Main.ff

@@ -1,3 +1,3 @@
 nodeMain(system: NodeSystem) {
-    system.writeLine("Hello, World!")
+    Json.object()
 }

package/lsp/Handler.ff

@@ -46,21 +46,33 @@ data TokenLocation(
 
 extend self: Handler {
 
-    handleNotification(system: NodeSystem, method: String, parameters: Map[String, Json]): Unit {
+    handleNotification(system: NodeSystem, method: String, parameters: Map[String, Json]): Option[Pair[String, Json]] {
         method.{
             | "initialized" =>
+                None
             | "textDocument/didChange" => 
                 self.handleDidChange(system, parameters)
-            | "textDocument/didClose" => self.handleDidClose(system, parameters)
-            | "exit" => system.exit(0)
+                let diagnostics = self.handleFocusDiagnostic(system, parameters)
+                Some(Pair("textDocument/publishDiagnostics", diagnostics))
+            | "textDocument/didClose" => 
+                self.handleDidClose(system, parameters)
+                let diagnostics = self.handleFocusDiagnostic(system, parameters)
+                Some(Pair("textDocument/publishDiagnostics", diagnostics))
+            | "custom/focusDocument" => 
+                let diagnostics = self.handleFocusDiagnostic(system, parameters)
+                Some(Pair("textDocument/publishDiagnostics", diagnostics))
+            | "exit" => 
+                system.exit(0)
+                None
             | _ =>
+                None
         }
     }
 
     handleRequest(system: NodeSystem, method: String, parameters: Map[String, Json]): ResultOrError {
         method.{
             | "initialize" => self.handleInitialize(system, parameters)
-            | "textDocument/diagnostic" => self.handleDiagnostic(system, parameters)
+            //| "textDocument/diagnostic" => self.handleDiagnostic(system, parameters)
             | "textDocument/documentSymbol" => self.handleDocumentSymbol(system, parameters)
             | "textDocument/completion" => self.handleCompletion(system, parameters)
             | "textDocument/signatureHelp" => self.handleSignatureHelp(system, parameters)
@@ -81,7 +93,10 @@ extend self: Handler {
                 self.handleTokenRequestWithCache(system, method, parameters) {targetAt => 
                     self.handleReferences(system, targetAt, local = True)
                 }
-            | "workspace/symbol" => self.printTime(system.mainTask(), "handleWorkspaceSymbol") {self.handleWorkspaceSymbol(system, parameters)}
+            | "workspace/symbol" => 
+                self.printTime(system.mainTask(), "handleWorkspaceSymbol") {
+                    self.handleWorkspaceSymbol(system, parameters)
+                }
             | "shutdown" => Result(Json.null().write())
             | _ => self.handleUnsupported()
         }
@@ -129,10 +144,10 @@ extend self: Handler {
                 .with("hoverProvider", True)
                 .with("definitionProvider", True)
                 .with("documentHighlightProvider", True)
-                .with("diagnosticProvider", Json.object()
+                /*.with("diagnosticProvider", Json.object()
                     .with("interFileDependencies", False)
                     .with("workspaceDiagnostics", False)
-                )
+                )*/
                 .with("documentSymbolProvider", True)
                 .with("completionProvider", Json.object()
                     .with("triggerCharacters", [".", " ", "("])
@@ -187,6 +202,29 @@ extend self: Handler {
         Result(o.write())
     }
 
+    handleFocusDiagnostic(system: NodeSystem, parameters: Map[String, Json]): Json {
+        let js = system.js()
+        let uri = parameters.grab("textDocument").field("uri").grabString()
+        let path = system.pathFromUrl(uri)
+        let fireflyPath = system.path(".")
+        let diagnostics = try {
+            Builder.check(system, fireflyPath, path, self.virtualFiles, LspHook.disabled(), True)
+            []
+        } catch {| CompileError(at, message), error =>
+            let tokenLocation = self.findToken(system, at)
+            let diagnostic = Json.object()
+                .with("range", self.tokenLocationToLspRange(tokenLocation))
+                .with("severity", 1)
+                .with("message", message)
+            [diagnostic]
+        } grab()
+
+        Json.object()
+            .with("uri", uri)
+            .with("version", parameters.grab("textDocument").field("version"))
+            .with("diagnostics", diagnostics)
+    }
+    
     handleDocumentSymbol(system: NodeSystem, parameters: Map[String, Json]): ResultOrError {
         let uri = parameters.grab("textDocument").field("uri").grabString()
         let path = system.pathFromUrl(uri)
@@ -326,7 +364,9 @@ extend self: Handler {
                     Log.trace("handleSignatureHelp check 2 error: " + message)
                 } grab()
                 let help = SignatureHelpHandler.handleSignatureHelp(system, callLspHook)
-                Some(SignatureHelpHandler.pickActiveParameter(help, h.argumentIndex, h.parameterName))
+                if(!help.isNull()) {
+                    SignatureHelpHandler.pickActiveParameter(help, h.argumentIndex, h.parameterName)
+                }
             | _ => 
                 None
         }

package/lsp/LanguageServer.ff

@@ -203,8 +203,8 @@ handleRequestMessage(system: NodeSystem, handler: Handler, message: RequestMessa
                 )
                 None
             | None => 
-                handler.handleNotification(system, message.method, message.parameters)
-                None
+                let notification = handler.handleNotification(system, message.method, message.parameters)
+                notification.map {| Pair(method, params) => makeNotificationMessage(method, params)}
             | Some(id) {handler.cancelledRequests.contains(id)} =>
                 handler.cancelledRequests = handler.cancelledRequests.remove(id)
                 Some(makeResponseMessage(id, Error(-32800, "Request cancelled")))
@@ -236,6 +236,13 @@ makeResponseMessage(id: MessageId, result: ResultOrError): Json {
     o
 }
 
+makeNotificationMessage(method: String, params: Json): Json {
+    Json.object()
+        .with("jsonrpc", "2.0")
+        .with("method", method)
+        .with("params", params)
+}
+
 logMessage(directory: Path, messageType: String, body: Json, method: String) {
     let id = if(method == "$/cancelRequest") {
         Some(body.field("params").field("id").grabInt())

package/package.json

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

package/vscode/README.md

@@ -9,9 +9,6 @@ This extension adds support for the Firefly programming language (`.ff` files).
 - Symbol renaming
 - Document and workspace symbols
 - Show type on hover
-- Diagnostics`*`
-
-`*` Diagnostics don't currently update automatically when included files have been edited. It's disabled for performance reasons, and we're working on a solution.
+- Diagnostics
 
 You can run `.ff` main files via the usual *Run and Debug* side panel - just choose *create a launch.json file*. After that you can also press *F5* to run the currently open file.
-

package/vscode/client/src/extension.ts

@@ -26,7 +26,7 @@ export function activate(context: vscode.ExtensionContext) {
     context.subscriptions.push(vscode.commands.registerCommand('extension.firefly-lang.getFireflyCompiler', config => {
         return fireflyCompiler;
     }));
-
+    
     const runOrDebug = {
         module: fireflyCompiler,
         args: ['LanguageServer.ff'],
@@ -54,6 +54,17 @@ export function activate(context: vscode.ExtensionContext) {
     );
 
     client.start();
+    
+    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 {

package/vscode/package.json

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