firefly-compiler 0.4.19 → 0.4.21

package/lsp/SignatureHelpHandler.ff

@@ -44,10 +44,11 @@ handleSignatureHelp(system: NodeSystem, lspHook: LspHook): Json {
 
 pickActiveParameter(help: Json, argumentIndex: Int, parameterName: Option[String]): Json {
     parameterName.flatMap {name =>
-        let parameters = help.field("signatures").index(0).field("parameters").grabArray()
-        parameters.pairs().collectFirst {| Pair(i, p) => 
-            if(name == p.field("label").grabString().takeWhile {_.isAsciiLetterOrDigit()}) {
-                help.with("activeParameter", i)
+        help.field("signatures").index(0).field("parameters").getArray().flatMap {parameters =>
+            parameters.pairs().collectFirst {| Pair(i, p) => 
+                if(name == p.field("label").grabString().takeWhile {_.isAsciiLetterOrDigit()}) {
+                    help.with("activeParameter", i)
+                }
             }
         }
     }.else {help.with("activeParameter", argumentIndex)}

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))

package/lsp/TestReferences.ff

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

package/lsp/TestReferencesCase.ff

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

package/output/js/ff/compiler/Builder.mjs

@@ -166,30 +166,19 @@ return ff_compiler_Dependencies.ResolvedDependencies(_c.mainPackagePair_, _c.pac
 }))(resolvedDependencies_), ff_core_Option.None(), ff_core_NodeSystem.NodeSystem_path(system_, ".firefly/temporary"), ff_core_Path.Path_slash(ff_core_NodeSystem.NodeSystem_path(system_, ".firefly/output"), target_), false)
 }
 
-export function check_(system_, fireflyPath_, path_, virtualFiles_, lspHook_, infer_) {
+export function check_(system_, fireflyPath_, path_, mustContain_, virtualFiles_, lspHook_, infer_) {
 const packages_ = (((_1) => {
-{
 if(_1) {
-return ff_compiler_Builder.findPackageFiles_(path_)
-return
-}
+return ff_compiler_Builder.findPackageFiles_(path_, mustContain_)
 }
-{
-if(!_1) {
-const _guard1 = ff_core_Path.Path_endsWith(path_, [".firefly", "package.ff"]);
-if(_guard1) {
+if(!_1 && ff_core_Path.Path_endsWith(path_, [".firefly", "package.ff"])) {
 return [ff_compiler_Builder.PackageFiles(ff_core_Option.Option_grab(ff_core_Path.Path_parent(path_)), ff_core_Option.Some(path_), [])]
-return
-}
 }
-}
-{
 if(!_1) {
 return [ff_compiler_Builder.PackageFiles(ff_core_Option.Option_grab(ff_core_Path.Path_parent(path_)), ff_core_Option.None(), [path_])]
-return
-}
 }
 }))(ff_core_Path.Path_isDirectory(path_));
+const errors_ = ff_core_Array.make_();
 ff_core_List.List_each(ff_core_List.List_filter(packages_, ((_w1) => {
 return (!ff_core_List.List_isEmpty(_w1.files_))
 })), ((package_) => {
@@ -204,17 +193,29 @@ return ff_compiler_Dependencies.ResolvedDependencies(_c.mainPackagePair_, _c.pac
 const compiler_ = ff_compiler_Compiler.make_(ff_compiler_JsEmitter.EmitBuild(), ff_core_NodeSystem.NodeSystem_mainTask(system_), ff_core_Option.None(), ff_core_Path.Path_slash(ff_core_Path.Path_slash(package_.root_, ".firefly"), "temporary"), fixedResolvedDependencies_, virtualFiles_, lspHook_);
 ff_core_List.List_each(package_.files_, ((file_) => {
 const localFile_ = ff_core_Path.Path_base(file_);
+try {
 if(infer_) {
 ff_compiler_Compiler.Compiler_infer(compiler_, resolvedDependencies_.mainPackagePair_, ff_core_String.String_dropLast(localFile_, ff_core_String.String_size(".ff")))
 } else {
 ff_compiler_Compiler.Compiler_resolve(compiler_, resolvedDependencies_.mainPackagePair_, ff_core_String.String_dropLast(localFile_, ff_core_String.String_size(".ff")))
 }
+} catch(_error) {
+if(!_error.ffException) throw _error
+const _exception = ff_core_Any.fromAny_(_error.ffException, ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)
+if(!_exception.Some) throw _error
+{
+const c_ = _exception.value_;
+const error_ = _error;
+ff_core_Array.Array_push(errors_, c_)
+}
+}
 }))
-}))
+}));
+return ff_core_Array.Array_drain(errors_)
 }
 
-export function findPackageFiles_(path_) {
-const files_ = ff_compiler_Builder.findFireflyFiles_(path_);
+export function findPackageFiles_(path_, mustContain_) {
+const files_ = ff_compiler_Builder.findFireflyFiles_(path_, mustContain_);
 const split_ = ff_core_List.List_partition(files_, ((_w1) => {
 return ff_core_Path.Path_endsWith(_w1, [".firefly", "package.ff"])
 }));
@@ -235,7 +236,7 @@ return ff_compiler_Builder.PackageFiles(projectRoot_, ff_core_Option.None(), [fi
 return [...multiFileProjects_, ...singleFileProjects_]
 }
 
-export function findFireflyFiles_(path_) {
+export function findFireflyFiles_(path_, mustContain_) {
 const split_ = ff_core_List.List_partition(ff_core_Stream.Stream_toList(ff_core_Path.Path_entries(path_)), ((_w1) => {
 return ff_core_Path.PathEntry_isDirectory(_w1)
 }));
@@ -248,11 +249,13 @@ return (((c_ === 46) || ff_core_Char.Char_isAsciiLower(c_)) || ff_core_Char.Char
 }));
 const fireflyFiles_ = ff_core_List.List_filter(ff_core_List.List_map(split_.second_, ((_w1) => {
 return ff_core_Path.PathEntry_path(_w1)
-})), ((_w1) => {
-return (ff_core_Path.Path_extension(_w1) === ".ff")
+})), ((file_) => {
+return ((ff_core_Path.Path_extension(file_) === ".ff") && ff_core_Option.Option_all(mustContain_, ((s_) => {
+return ff_core_String.String_contains(ff_core_Path.Path_readText(file_), s_)
+})))
 }));
 return [...fireflyFiles_, ...ff_core_List.List_flatMap(directories_, ((_w1) => {
-return ff_compiler_Builder.findFireflyFiles_(_w1)
+return ff_compiler_Builder.findFireflyFiles_(_w1, mustContain_)
 }))]
 }
 
@@ -345,30 +348,19 @@ return ff_compiler_Dependencies.ResolvedDependencies(_c.mainPackagePair_, _c.pac
 }))(resolvedDependencies_), ff_core_Option.None(), (await ff_core_NodeSystem.NodeSystem_path$(system_, ".firefly/temporary", $task)), (await ff_core_Path.Path_slash$((await ff_core_NodeSystem.NodeSystem_path$(system_, ".firefly/output", $task)), target_, $task)), false, $task))
 }
 
-export async function check_$(system_, fireflyPath_, path_, virtualFiles_, lspHook_, infer_, $task) {
+export async function check_$(system_, fireflyPath_, path_, mustContain_, virtualFiles_, lspHook_, infer_, $task) {
 const packages_ = (await ((async (_1, $task) => {
-{
 if(_1) {
-return (await ff_compiler_Builder.findPackageFiles_$(path_, $task))
-return
-}
+return (await ff_compiler_Builder.findPackageFiles_$(path_, mustContain_, $task))
 }
-{
-if(!_1) {
-const _guard1 = (await ff_core_Path.Path_endsWith$(path_, [".firefly", "package.ff"], $task));
-if(_guard1) {
+if(!_1 && (await ff_core_Path.Path_endsWith$(path_, [".firefly", "package.ff"], $task))) {
 return [ff_compiler_Builder.PackageFiles(ff_core_Option.Option_grab((await ff_core_Path.Path_parent$(path_, $task))), ff_core_Option.Some(path_), [])]
-return
-}
 }
-}
-{
 if(!_1) {
 return [ff_compiler_Builder.PackageFiles(ff_core_Option.Option_grab((await ff_core_Path.Path_parent$(path_, $task))), ff_core_Option.None(), [path_])]
-return
-}
 }
 }))((await ff_core_Path.Path_isDirectory$(path_, $task)), $task));
+const errors_ = ff_core_Array.make_();
 (await ff_core_List.List_each$(ff_core_List.List_filter(packages_, ((_w1) => {
 return (!ff_core_List.List_isEmpty(_w1.files_))
 })), (async (package_, $task) => {
@@ -383,17 +375,29 @@ return ff_compiler_Dependencies.ResolvedDependencies(_c.mainPackagePair_, _c.pac
 const compiler_ = (await ff_compiler_Compiler.make_$(ff_compiler_JsEmitter.EmitBuild(), (await ff_core_NodeSystem.NodeSystem_mainTask$(system_, $task)), ff_core_Option.None(), (await ff_core_Path.Path_slash$((await ff_core_Path.Path_slash$(package_.root_, ".firefly", $task)), "temporary", $task)), fixedResolvedDependencies_, virtualFiles_, lspHook_, $task));
 (await ff_core_List.List_each$(package_.files_, (async (file_, $task) => {
 const localFile_ = (await ff_core_Path.Path_base$(file_, $task));
+try {
 if(infer_) {
 (await ff_compiler_Compiler.Compiler_infer$(compiler_, resolvedDependencies_.mainPackagePair_, ff_core_String.String_dropLast(localFile_, ff_core_String.String_size(".ff")), $task))
 } else {
 (await ff_compiler_Compiler.Compiler_resolve$(compiler_, resolvedDependencies_.mainPackagePair_, ff_core_String.String_dropLast(localFile_, ff_core_String.String_size(".ff")), $task))
 }
+} catch(_error) {
+if(!_error.ffException) throw _error
+const _exception = ff_core_Any.fromAny_(_error.ffException, ff_compiler_Syntax.ff_core_Any_HasAnyTag$ff_compiler_Syntax_CompileError)
+if(!_exception.Some) throw _error
+{
+const c_ = _exception.value_;
+const error_ = _error;
+ff_core_Array.Array_push(errors_, c_)
+}
+}
 }), $task))
-}), $task))
+}), $task));
+return ff_core_Array.Array_drain(errors_)
 }
 
-export async function findPackageFiles_$(path_, $task) {
-const files_ = (await ff_compiler_Builder.findFireflyFiles_$(path_, $task));
+export async function findPackageFiles_$(path_, mustContain_, $task) {
+const files_ = (await ff_compiler_Builder.findFireflyFiles_$(path_, mustContain_, $task));
 const split_ = (await ff_core_List.List_partition$(files_, (async (_w1, $task) => {
 return (await ff_core_Path.Path_endsWith$(_w1, [".firefly", "package.ff"], $task))
 }), $task));
@@ -414,7 +418,7 @@ return ff_compiler_Builder.PackageFiles(projectRoot_, ff_core_Option.None(), [fi
 return [...multiFileProjects_, ...singleFileProjects_]
 }
 
-export async function findFireflyFiles_$(path_, $task) {
+export async function findFireflyFiles_$(path_, mustContain_, $task) {
 const split_ = (await ff_core_List.List_partition$((await ff_core_Stream.Stream_toList$((await ff_core_Path.Path_entries$(path_, $task)), $task)), (async (_w1, $task) => {
 return (await ff_core_Path.PathEntry_isDirectory$(_w1, $task))
 }), $task));
@@ -427,11 +431,13 @@ return (((c_ === 46) || ff_core_Char.Char_isAsciiLower(c_)) || ff_core_Char.Char
 }), $task));
 const fireflyFiles_ = (await ff_core_List.List_filter$((await ff_core_List.List_map$(split_.second_, (async (_w1, $task) => {
 return (await ff_core_Path.PathEntry_path$(_w1, $task))
-}), $task)), (async (_w1, $task) => {
-return ((await ff_core_Path.Path_extension$(_w1, $task)) === ".ff")
+}), $task)), (async (file_, $task) => {
+return (((await ff_core_Path.Path_extension$(file_, $task)) === ".ff") && (await ff_core_Option.Option_all$(mustContain_, (async (s_, $task) => {
+return ff_core_String.String_contains((await ff_core_Path.Path_readText$(file_, $task)), s_)
+}), $task)))
 }), $task));
 return [...fireflyFiles_, ...(await ff_core_List.List_flatMap$(directories_, (async (_w1, $task) => {
-return (await ff_compiler_Builder.findFireflyFiles_$(_w1, $task))
+return (await ff_compiler_Builder.findFireflyFiles_$(_w1, mustContain_, $task))
 }), $task))]
 }
 

package/output/js/ff/compiler/Dependencies.mjs

@@ -225,7 +225,6 @@ const _1 = info_;
 {
 const _c = _1;
 return ff_compiler_Syntax.PackageInfo(_c.package_, [coreDependency_, ...info_.dependencies_], _c.includes_)
-return
 }
 }
 }
@@ -324,7 +323,6 @@ const _1 = info_;
 {
 const _c = _1;
 return ff_compiler_Syntax.PackageInfo(_c.package_, [coreDependency_, ...info_.dependencies_], _c.includes_)
-return
 }
 }
 }