firefly-compiler 0.4.19 → 0.4.20

package/compiler/LspHook.ff

@@ -66,11 +66,23 @@ data SymbolHook(
 
 class Box[T](mutable value: T)
 
+data DocumentSymbolKind {
+    SLet(mutable: Bool)
+    SFunction(member: Bool)
+    SExtend
+    STraitFunction
+    STrait
+    SInstance
+    SVariant
+    SType
+    SParameter
+}
+
 class ResultHook {
     ParseSymbolBegin
     ParseSymbolEnd(
         name: String
-        kind: Int
+        kind: DocumentSymbolKind
         selectionStart: Location
         selectionEnd: Location
         start: Location

package/compiler/Parser.ff

@@ -232,7 +232,7 @@ extend self: Parser {
         if(self.lspHook.trackSymbols) {
             self.lspHook.emit(ParseSymbolEnd(
                 name = nameToken.raw()
-                kind = 14
+                kind = SLet(mutable = False)
                 selectionStart = nameToken.at()
                 selectionEnd = nameToken.end()
                 start = nameToken.at()
@@ -254,10 +254,9 @@ extend self: Parser {
             bestTarget
         )
         if(self.lspHook.trackSymbols) {
-            let kind = if(member) {6} else {12}
             self.lspHook.emit(ParseSymbolEnd(
                 name = signature.name
-                kind = kind
+                kind = SFunction(member)
                 selectionStart = signature.at
                 selectionEnd = signature.at.Location(column = signature.at.column + signature.name.size())
                 start = signature.at
@@ -365,7 +364,7 @@ extend self: Parser {
             }
             self.lspHook.emit(ParseSymbolEnd(
                 name = name
-                kind = 3 // Namespace
+                kind = SExtend
                 selectionStart = nameToken.at()
                 selectionEnd = nameToken.end()
                 start = extendToken.at()
@@ -411,7 +410,7 @@ extend self: Parser {
                 if(self.lspHook.trackSymbols) {
                     self.lspHook.emit(ParseSymbolEnd(
                         name = signatureNameToken.raw() 
-                        kind = 12  // Function   
+                        kind = STraitFunction
                         selectionStart = signatureNameToken.at()
                         selectionEnd = signatureNameToken.end()
                         start = signatureNameToken.at()
@@ -436,7 +435,7 @@ extend self: Parser {
         if(self.lspHook.trackSymbols) {
             self.lspHook.emit(ParseSymbolEnd(
                 name = nameToken.raw() 
-                kind = 11 // Interface 
+                kind = STrait 
                 selectionStart = nameToken.at()
                 selectionEnd = nameToken.end()
                 start = traitToken.at()
@@ -487,7 +486,7 @@ extend self: Parser {
             let name = token.raw() + ": " + nameToken.raw()
             self.lspHook.emit(ParseSymbolEnd(
                 name = name
-                kind = 19 // Object  
+                kind = SInstance  
                 selectionStart = nameToken.at()
                 selectionEnd = nameToken.end()
                 start = instanceToken.at()
@@ -545,7 +544,7 @@ extend self: Parser {
                 if(self.lspHook.trackSymbols) {
                     self.lspHook.emit(ParseSymbolEnd(
                         name = variantNameToken.raw()
-                        kind = 10 // Enum
+                        kind = SVariant
                         selectionStart = variantNameToken.at()
                         selectionEnd = variantNameToken.end()
                         start = variantNameToken.at()
@@ -571,7 +570,7 @@ extend self: Parser {
         if(self.lspHook.trackSymbols) {
             self.lspHook.emit(ParseSymbolEnd(
                 name = nameToken.raw()
-                kind = 5
+                kind = SType
                 selectionStart = nameToken.at()
                 selectionEnd = nameToken.end()
                 start = kindToken.at()
@@ -770,7 +769,7 @@ extend self: Parser {
             if(lspTrackSymbols) {
                 self.lspHook.emit(ParseSymbolEnd(
                     name = parameterNameToken.raw()
-                    kind = 7 // Property
+                    kind = SParameter
                     selectionStart = parameterNameToken.at()
                     selectionEnd = parameterNameToken.end()
                     start = lspFirst.at()
@@ -1059,10 +1058,9 @@ extend self: Parser {
         self.skip(LAssign)
         let value = self.parseTerm()
         if(self.lspHook.trackSymbols) {
-            let kind = if(mutable) {13} else {14}
             self.lspHook.emit(ParseSymbolEnd(
                 name = nameToken.raw()
-                kind = kind
+                kind = SLet(mutable)
                 selectionStart = nameToken.at()
                 selectionEnd = nameToken.end()
                 start = mutableToken.at()
@@ -1095,7 +1093,7 @@ extend self: Parser {
             if(self.lspHook.trackSymbols) {
                 self.lspHook.emit(ParseSymbolEnd(
                     name = signature.name
-                    kind = 12
+                    kind = SFunction(member = False)
                     selectionStart = signature.at
                     selectionEnd = signature.at.Location(column = signature.at.column + signature.name.size())
                     start = functionAt

package/core/Json.ff

@@ -405,8 +405,8 @@ internalCompare(a: Json, b: Json): Int
         } else if (typeof a_ === 'number' || typeof b_ === 'number') {
             if(typeof b_ !== 'number') return -1;
             if(typeof a_ !== 'number') return 1;
-            if(isNaB(a_)) return isNaB(b_) ? 0 : -1;
-            if(isNaB(b_)) return 1;
+            if(isNaN(a_)) return isNaN(b_) ? 0 : -1;
+            if(isNaN(b_)) return 1;
             return a_ < b_ ? -1 : 1;
         } else if (typeof a_ === 'string' || typeof b_ === 'string') {
             if(typeof b_ !== 'string') return -1;

package/lsp/CompletionHandler.ff

@@ -748,8 +748,8 @@ toplevelCompletion(lspHook: LspHook): List[CompletionInfo] {
             label = "webapp", 
             extra = " with frontend and backend", 
             snippet = [
-                "dependency ff:httpserver:0.0.0"
-                "import HttpServer from ff:httpserver"
+                "dependency ff:webserver:0.0.0"
+                "import WebServer from ff:webserver"
                 ""
                 "browserMain(system: BrowserSystem): Unit {"
                 "    let response = system.httpClient().fetch(\"http://localhost:8080/hello\")"
@@ -758,19 +758,19 @@ toplevelCompletion(lspHook: LspHook): List[CompletionInfo] {
                 "}"
                 ""
                 "nodeMain(system: NodeSystem): Unit {"
-                "    HttpServer.listen(system, \"localhost\", 8080) {request, response =>"
-                "        if(request.path() == \"/\") {"
-                "            response.setHeader(\"Content-Type\", [\"text/html; charset=UTF-8\"])"
-                "            response.writeText(\"<!doctype html>\")"
-                "            response.writeText(\"<script type='module' src='/js/script/script/WebApp.mjs'></script>\")"
-                "        } elseIf {request.path() == \"/hello\"} {"
-                "            response.setHeader(\"Content-Type\", [\"text/plain; charset=UTF-8\"])"
-                "            response.writeText(\"Hello from server!\")"
-                "        } elseIf {request.path().startsWith(\"/js/\") && !request.path().contains(\"..\")} {"
-                "            response.setHeader(\"Content-Type\", [\"text/javascript; charset=UTF-8\"])"
-                "            response.writeText(system.assets().readText(request.path()))"
+                "    WebServer.make(system, \"localhost\", 8080).listen {request =>"
+                "        if(request.readPath() == \"/\") {"
+                "            request.writeHeader(\"Content-Type\", \"text/html; charset=UTF-8\")"
+                "            request.writeText(\"<!doctype html>\")"
+                "            request.writeText(\"<script type='module' src='/js/script/script/WebApp.mjs'></script>\")"
+                "        } elseIf {request.readPath() == \"/hello\"} {"
+                "            request.writeHeader(\"Content-Type\", \"text/plain; charset=UTF-8\")"
+                "            request.writeText(\"Hello from server!\")"
+                "        } elseIf {request.readPath().startsWith(\"/js/\") && !request.readPath().contains(\"..\")} {"
+                "            request.writeHeader(\"Content-Type\", \"text/javascript; charset=UTF-8\")"
+                "            request.writeText(system.assets().readText(request.readPath()))"
                 "        } else {"
-                "            response.writeStatus(404, Some(\"Not found\"))"
+                "            request.writeStatus(\"404 Not found\")"
                 "        }"
                 "    }"
                 "}"

package/lsp/Handler.ff

@@ -280,7 +280,7 @@ extend self: Handler {
             let documentSymbols = self.getDocumentSymbolsWithCache(system, file)
             let workspaceSymbols = documentSymbols.flatMap {SymbolHandler.documentToWorkspaceSymbols(_, None)}
             if(query == "") {
-                workspaceSymbols.filter {_.kind == 5} // Class
+                workspaceSymbols.filter {_.kind == SType}
             } else {
                 workspaceSymbols.filter {SymbolHandler.symbolFilter(_, query)}
             }

package/lsp/SymbolHandler.ff

@@ -3,7 +3,7 @@ import Syntax from ff:compiler
 
 data DocumentSymbol(
     name: String
-    kind: Int
+    kind: DocumentSymbolKind
     selectionStart: Location
     selectionEnd: Location
     start: Location
@@ -13,7 +13,7 @@ data DocumentSymbol(
 
 data WorkspaceSymbol(
     name: String
-    kind: Int
+    kind: DocumentSymbolKind
     containerName: Option[String]
     selectionStart: Location
     selectionEnd: Location
@@ -93,16 +93,30 @@ showPosition(at: Location): String {
 documentSymbolToLsp(symbol: DocumentSymbol): Json {
     Json.object()
         .with("name", symbol.name)
-        .with("kind", symbol.kind)
+        .with("kind", documentSymbolNumber(symbol.kind))
         .with("range", locationsToLspRange(symbol.start, symbol.end))
         .with("selectionRange", locationsToLspRange(symbol.selectionStart, symbol.selectionEnd))
         .with("children", symbol.children.map {documentSymbolToLsp(_)})
 }
 
+documentSymbolNumber(kind: DocumentSymbolKind): Int {
+    | SExtend => 3 // Namespace
+    | SFunction(True) => 6
+    | SFunction(False) => 12
+    | SInstance => 19 // Object
+    | SLet(True) => 13
+    | SLet(False) => 14
+    | SParameter => 7 // Property
+    | STrait => 11 // Interface
+    | STraitFunction => 12 // Function
+    | SType => 5
+    | SVariant => 10 // Enum
+}
+
 workspaceSymbolToLsp(rootPath: Path, symbol: WorkspaceSymbol): Json {
     let o = Json.object()
         .with("name", symbol.name)
-        .with("kind", symbol.kind)
+        .with("kind", documentSymbolNumber(symbol.kind))
         .with("location", Json.object()
             .with("uri", rootPath.path(symbol.selectionStart.file).url())
             .with("range", locationsToLspRange(symbol.selectionStart, symbol.selectionEnd))