firefly-compiler 0.5.39 → 0.5.41

package/lsp/SymbolHandler.ff

@@ -1,181 +1,181 @@
-import LspHook from ff:compiler
-import Syntax from ff:compiler
-
-data DocumentSymbol(
-    name: String
-    kind: DocumentSymbolKind
-    selectionStart: Location
-    selectionEnd: Location
-    start: Location
-    end: Location
-    children: List[DocumentSymbol]
-)
-
-data WorkspaceSymbol(
-    name: String
-    kind: DocumentSymbolKind
-    containerName: Option[String]
-    selectionStart: Location
-    selectionEnd: Location
-)
-
-class Result[T](
-    result: T
-    remaining: List[ResultHook]
-)
-
-data ReadSymbolsError()
-
-readAllSymbols(hooks: List[ResultHook]): List[DocumentSymbol]  {
-    let result = readSymbols(hooks)
-    if(!result.remaining.isEmpty()) {throw(ReadSymbolsError())}
-    result.result
-}
-
-readSymbols(hooks: List[ResultHook]): Result[List[DocumentSymbol]]  {
-    | [ParseSymbolBegin, ...rest] => 
-        let symbol = readSymbol(rest)
-        let symbols = readSymbols(symbol.remaining)
-        Result([symbol.result, ...symbols.result], symbols.remaining)
-    | _ => Result([], hooks)
-}
-
-readSymbol(hooks: List[ResultHook]): Result[DocumentSymbol] {
-    let children = readSymbols(hooks)
-    children.remaining.{
-        | [ParseSymbolEnd(name, kind, selectionStart, selectionEnd, start, end), ...rest] => 
-            let symbol = DocumentSymbol(name, kind, selectionStart, selectionEnd, start, end, children.result)
-            Result(symbol, rest)
-        | _ => throw(ReadSymbolsError())
-        }
-}
-
-handleDocumentSymbol(system: NodeSystem, resultHooks: List[ResultHook]): List[Json] {
-    let symbols = readAllSymbols(resultHooks)
-    symbols.map {documentSymbolToLsp(_)}
-}
-
-handleWorkspaceSymbol(system: NodeSystem, resultHooks: List[ResultHook], query: String): List[Json] {
-    let documentSymbols = readAllSymbols(resultHooks)
-    let workspaceSymbols = documentSymbols.flatMap {documentToWorkspaceSymbols(_, None)}
-    let foundSymbols = workspaceSymbols.filter {_.name.startsWith(query)}
-    //Log.trace("handleWorkspaceSymbol")
-    //workspaceSymbols.each {Log.show(_)}
-    let jsSymbols = foundSymbols.map {workspaceSymbolToLsp(system.path("."), _)}
-    //workspaceSymbolsJs.each {Log.trace(_.write(None))}
-    jsSymbols
-}
-
-documentToWorkspaceSymbols(symbol: DocumentSymbol, parentName: Option[String]): List[WorkspaceSymbol] {
-    let s = WorkspaceSymbol(
-        symbol.name
-        kind = symbol.kind
-        containerName = parentName
-        selectionStart = symbol.selectionEnd
-        selectionEnd = symbol.selectionEnd
-    )
-    let children = symbol.children.flatMap {documentToWorkspaceSymbols(_, Some(symbol.name))}
-    [s, ... children]
-}
-
-showHook(lspHook: ResultHook): String {
-    | ParseSymbolBegin => "ParseSymbolBegin"
-    | ParseSymbolEnd(name, kind, _, _, _, _) => "ParseSymbolEnd("+Show.show(name)+", "+Show.show(kind)+")"
-    //| ParseSymbolBegin => "("
-    //| ParseSymbolEnd(name, kind, symbolStart, selectionStart, selectionEnd) => ") " + name + " " + showPosition(selectionStart) + " - " + showPosition(selectionEnd)
-    | _ => "other"
-}
-
-showPosition(at: Location): String {
-    at.line + ":" + at.column
-}
-
-documentSymbolToLsp(symbol: DocumentSymbol): Json {
-    Json.object()
-        .with("name", symbol.name)
-        .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", documentSymbolNumber(symbol.kind))
-        .with("location", Json.object()
-            .with("uri", rootPath.path(symbol.selectionStart.file).url())
-            .with("range", locationsToLspRange(symbol.selectionStart, symbol.selectionEnd))
-        )
-    symbol.containerName.{
-        | Some(n) => o.with("containerName", n)
-        | None => o
-    }   
-}
-
-locationsToLspRange(start: Location, end: Location): Json {
-    Json.object()
-        .with("start", Json.object()
-            .with("line", start.line - 1)
-            .with("character", start.column - 1)
-        )
-        .with("end", Json.object()
-            .with("line", end.line - 1)
-            .with("character", end.column - 1)
-        )
-}
-
-symbolFilter(symbol: WorkspaceSymbol, query: String): Bool {
-    let symbolWords = splitCamelCased(symbol.name.takeWhile {_.isAsciiLetterOrDigit()})
-    matchSymbol(symbolWords, query)
-}
-
-matchSymbol(symbolWords: List[String], query: String): Bool {
-    let memo = IntMap.new()
-    function go(wordIndex: Int, queryOffset: Int): Bool {
-        memo.getOrSet(wordIndex) {IntMap.new()}.getOrSet(queryOffset):
-        if(queryOffset >= query.size()) {True} else:
-        if(wordIndex >= symbolWords.size()) {False} else:
-        prefixes(query.dropFirst(queryOffset)).any {prefix => 
-            symbolWords.grab(wordIndex).startsWith(prefix) && 
-            go(wordIndex + 1, queryOffset + prefix.size())
-        }
-    }
-    go(0, 0)
-}
-
-prefixes(string: String): List[String] {
-    if(string == "") {[""]} else:
-    function go(rest: String): List[String] {
-        if(rest == "") {
-            [""]
-        } else {
-            [rest, ...go(rest.dropLast())]
-        }
-    }
-    go(string.grab(0).toString().lower() + string.dropFirst().takeWhile {!_.isAsciiUpper()})
-}
-
-splitCamelCased(name: String): List[String] {
-    name.first().{
-        | None => []
-        | Some(c) => 
-            let word = c.toString().lower() + name.dropFirst().takeWhile {_.isAsciiLower()}
-            let rest = name.dropFirst(word.size())
-            [word, ...splitCamelCased(rest)]
-    }
-}
+import LspHook from ff:compiler
+import Syntax from ff:compiler
+
+data DocumentSymbol(
+    name: String
+    kind: DocumentSymbolKind
+    selectionStart: Location
+    selectionEnd: Location
+    start: Location
+    end: Location
+    children: List[DocumentSymbol]
+)
+
+data WorkspaceSymbol(
+    name: String
+    kind: DocumentSymbolKind
+    containerName: Option[String]
+    selectionStart: Location
+    selectionEnd: Location
+)
+
+class Result[T](
+    result: T
+    remaining: List[ResultHook]
+)
+
+data ReadSymbolsError()
+
+readAllSymbols(hooks: List[ResultHook]): List[DocumentSymbol]  {
+    let result = readSymbols(hooks)
+    if(!result.remaining.isEmpty()) {throw(ReadSymbolsError())}
+    result.result
+}
+
+readSymbols(hooks: List[ResultHook]): Result[List[DocumentSymbol]]  {
+    | [ParseSymbolBegin, ...rest] => 
+        let symbol = readSymbol(rest)
+        let symbols = readSymbols(symbol.remaining)
+        Result([symbol.result, ...symbols.result], symbols.remaining)
+    | _ => Result([], hooks)
+}
+
+readSymbol(hooks: List[ResultHook]): Result[DocumentSymbol] {
+    let children = readSymbols(hooks)
+    children.remaining.{
+        | [ParseSymbolEnd(name, kind, selectionStart, selectionEnd, start, end), ...rest] => 
+            let symbol = DocumentSymbol(name, kind, selectionStart, selectionEnd, start, end, children.result)
+            Result(symbol, rest)
+        | _ => throw(ReadSymbolsError())
+        }
+}
+
+handleDocumentSymbol(system: NodeSystem, resultHooks: List[ResultHook]): List[Json] {
+    let symbols = readAllSymbols(resultHooks)
+    symbols.map {documentSymbolToLsp(_)}
+}
+
+handleWorkspaceSymbol(system: NodeSystem, resultHooks: List[ResultHook], query: String): List[Json] {
+    let documentSymbols = readAllSymbols(resultHooks)
+    let workspaceSymbols = documentSymbols.flatMap {documentToWorkspaceSymbols(_, None)}
+    let foundSymbols = workspaceSymbols.filter {_.name.startsWith(query)}
+    //Log.trace("handleWorkspaceSymbol")
+    //workspaceSymbols.each {Log.show(_)}
+    let jsSymbols = foundSymbols.map {workspaceSymbolToLsp(system.path("."), _)}
+    //workspaceSymbolsJs.each {Log.trace(_.write(None))}
+    jsSymbols
+}
+
+documentToWorkspaceSymbols(symbol: DocumentSymbol, parentName: Option[String]): List[WorkspaceSymbol] {
+    let s = WorkspaceSymbol(
+        symbol.name
+        kind = symbol.kind
+        containerName = parentName
+        selectionStart = symbol.selectionEnd
+        selectionEnd = symbol.selectionEnd
+    )
+    let children = symbol.children.flatMap {documentToWorkspaceSymbols(_, Some(symbol.name))}
+    [s, ... children]
+}
+
+showHook(lspHook: ResultHook): String {
+    | ParseSymbolBegin => "ParseSymbolBegin"
+    | ParseSymbolEnd(name, kind, _, _, _, _) => "ParseSymbolEnd("+Show.show(name)+", "+Show.show(kind)+")"
+    //| ParseSymbolBegin => "("
+    //| ParseSymbolEnd(name, kind, symbolStart, selectionStart, selectionEnd) => ") " + name + " " + showPosition(selectionStart) + " - " + showPosition(selectionEnd)
+    | _ => "other"
+}
+
+showPosition(at: Location): String {
+    at.line + ":" + at.column
+}
+
+documentSymbolToLsp(symbol: DocumentSymbol): Json {
+    Json.object()
+        .with("name", symbol.name)
+        .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", documentSymbolNumber(symbol.kind))
+        .with("location", Json.object()
+            .with("uri", rootPath.path(symbol.selectionStart.file).url())
+            .with("range", locationsToLspRange(symbol.selectionStart, symbol.selectionEnd))
+        )
+    symbol.containerName.{
+        | Some(n) => o.with("containerName", n)
+        | None => o
+    }   
+}
+
+locationsToLspRange(start: Location, end: Location): Json {
+    Json.object()
+        .with("start", Json.object()
+            .with("line", start.line - 1)
+            .with("character", start.column - 1)
+        )
+        .with("end", Json.object()
+            .with("line", end.line - 1)
+            .with("character", end.column - 1)
+        )
+}
+
+symbolFilter(symbol: WorkspaceSymbol, query: String): Bool {
+    let symbolWords = splitCamelCased(symbol.name.takeWhile {_.isAsciiLetterOrDigit()})
+    matchSymbol(symbolWords, query)
+}
+
+matchSymbol(symbolWords: List[String], query: String): Bool {
+    let memo = IntMap.new()
+    function go(wordIndex: Int, queryOffset: Int): Bool {
+        memo.getOrSet(wordIndex) {IntMap.new()}.getOrSet(queryOffset):
+        if(queryOffset >= query.size()) {True} else:
+        if(wordIndex >= symbolWords.size()) {False} else:
+        prefixes(query.dropFirst(queryOffset)).any {prefix => 
+            symbolWords.grab(wordIndex).startsWith(prefix) && 
+            go(wordIndex + 1, queryOffset + prefix.size())
+        }
+    }
+    go(0, 0)
+}
+
+prefixes(string: String): List[String] {
+    if(string == "") {[""]} else:
+    function go(rest: String): List[String] {
+        if(rest == "") {
+            [""]
+        } else {
+            [rest, ...go(rest.dropLast())]
+        }
+    }
+    go(string.grab(0).toString().lower() + string.dropFirst().takeWhile {!_.isAsciiUpper()})
+}
+
+splitCamelCased(name: String): List[String] {
+    name.first().{
+        | None => []
+        | Some(c) => 
+            let word = c.toString().lower() + name.dropFirst().takeWhile {_.isAsciiLower()}
+            let rest = name.dropFirst(word.size())
+            [word, ...splitCamelCased(rest)]
+    }
+}

package/lsp/TestReferences.ff

@@ -1,18 +1,18 @@
-import Handler
-import DependencyLock from ff:compiler
-import Syntax from ff:compiler
-import ModuleCache from ff:compiler
-
-nodeMain(system: NodeSystem) {
-    Log.debug("Hello")
-    let fireflyPath = system.path(".")
-    Log.debug(fireflyPath.absolute())
-    let cache = ModuleCache.new(0)
-    let handler = Handler(fireflyPath, None, Map.new(), [].toSet(), Map.new(), Map.new(), cache, DependencyLock.new(system.mainTask()))
-    let targetAt = Location("/home/werk/projects/firefly-boot/lsp/TestReferencesCase.ff", 7, 5)
-    let references = handler.findReferences(system, targetAt, local = False, includeDeclaration = True, version = 0)
-    Log.show(references)
-    references.each {_.each {r => 
-        Log.show(r)
-    }}
+import Handler
+import DependencyLock from ff:compiler
+import Syntax from ff:compiler
+import ModuleCache from ff:compiler
+
+nodeMain(system: NodeSystem) {
+    Log.debug("Hello")
+    let fireflyPath = system.path(".")
+    Log.debug(fireflyPath.absolute())
+    let cache = ModuleCache.new(0)
+    let handler = Handler(fireflyPath, None, Map.new(), [].toSet(), Map.new(), Map.new(), cache, DependencyLock.new(system.mainTask()))
+    let targetAt = Location("/home/werk/projects/firefly-boot/lsp/TestReferencesCase.ff", 7, 5)
+    let references = handler.findReferences(system, targetAt, local = False, includeDeclaration = True, version = 0)
+    Log.show(references)
+    references.each {_.each {r => 
+        Log.show(r)
+    }}
 }

package/lsp/TestReferencesCase.ff

@@ -1,8 +1,8 @@
-foo(a: Int): Int {
-    a + a
-}
-
-nodeMain(system: NodeSystem) {
-    foo(13)
-    foo(37)
+foo(a: Int): Int {
+    a + a
+}
+
+nodeMain(system: NodeSystem) {
+    foo(13)
+    foo(37)
 }

package/lsp/stderr.txt

@@ -1 +1 @@
-End of input while parsing request headers
+End of input while parsing request headers

package/lsp/stdout.txt

@@ -1,41 +1,41 @@
 Content-Length: 500
 
-{
-    "jsonrpc": "2.0",
-    "id": 0,
-    "result": {
-        "capabilities": {
-            "textDocumentSync": {
-                "openClose": true,
-                "change": 1
-            },
-            "hoverProvider": false,
-            "diagnosticProvider": {
-                "interFileDependencies": true,
-                "workspaceDiagnostics": false
-            }
-        },
-        "serverInfo": {
-            "name": "Firefly Language Server",
-            "version": "0.0.0"
-        }
-    }
+{
+    "jsonrpc": "2.0",
+    "id": 0,
+    "result": {
+        "capabilities": {
+            "textDocumentSync": {
+                "openClose": true,
+                "change": 1
+            },
+            "hoverProvider": false,
+            "diagnosticProvider": {
+                "interFileDependencies": true,
+                "workspaceDiagnostics": false
+            }
+        },
+        "serverInfo": {
+            "name": "Firefly Language Server",
+            "version": "0.0.0"
+        }
+    }
 }Content-Length: 104
 
-{
-    "jsonrpc": "2.0",
-    "id": 1,
-    "result": {
-        "kind": "full",
-        "items": []
-    }
+{
+    "jsonrpc": "2.0",
+    "id": 1,
+    "result": {
+        "kind": "full",
+        "items": []
+    }
 }Content-Length: 121
 
-{
-    "jsonrpc": "2.0",
-    "id": 2,
-    "error": {
-        "code": 1234,
-        "message": "Unsupported method"
-    }
+{
+    "jsonrpc": "2.0",
+    "id": 2,
+    "error": {
+        "code": 1234,
+        "message": "Unsupported method"
+    }
 }

package/lux/.firefly/package.ff

@@ -1 +1 @@
-package ff:lux:0.0.0
+package ff:lux:0.0.0