firefly-compiler 0.5.71 → 0.5.72

package/.vscode/settings.json

@@ -1,5 +1,5 @@
 {
     "editor.suggest.showWords": false,
-    "firefly.trace.server": "verbose",
+    "firefly.trace.server": "messages",
     "editor.trimAutoWhitespace": false
 }

package/compiler/Builder.ff

@@ -135,7 +135,7 @@ check(
 ): List[CompileError] {
     let packages = path.isDirectory().{
         | False {path.endsWith([".firefly", "package.ff"])} => [PackageFiles(path.parent().grab(), Some(path), [])]
-        | True => findPackageFilesForDirectory(path, mustContain, skipFiles)
+        | True => findPackageFilesForDirectory(path, virtualFiles, mustContain, skipFiles)
         | False => findPackageFilesForFile(path).toList()
     }
     let errors = Array.new()
@@ -213,10 +213,11 @@ findPackageFilesForFile(file: Path): Option[PackageFiles] {
 
 findPackageFilesForDirectory(
     directory: Path
+    virtualFiles: Map[String, String]
     mustContain: Option[String]
     skipFiles: Set[String]
 ): List[PackageFiles] {
-    let files = findFireflyFiles(directory, mustContain, skipFiles)
+    let files = findFireflyFiles(directory, virtualFiles, mustContain, skipFiles)
     let split = files.partition {_.endsWith([".firefly", "package.ff"])}
     let packageFiles = split.first
     mutable singleFiles = split.second
@@ -236,6 +237,7 @@ findPackageFilesForDirectory(
 
 findFireflyFiles(
     path: Path
+    virtualFiles: Map[String, String]
     mustContain: Option[String]
     skipFiles: Set[String]
 ): List[Path] {
@@ -246,11 +248,14 @@ findFireflyFiles(
         c == '.' || c.isAsciiLower() || c.isAsciiDigit()
     }}
     let fireflyFiles = files.map {_.path()}.filter {file => 
-        file.extension() == ".ff" && !skipFiles.contains(file.absolute()) && mustContain.all {s => 
-            file.readText().contains(s)
-        }
+        file.extension() == ".ff" && !skipFiles.contains(file.absolute()) && (
+            file.endsWith([".firefly", "package.ff"]) || mustContain.all {s => 
+                let code = virtualFiles.get(file.absolute()).else {file.readText()}
+                code.contains(s)
+            }
+        )
     }
-    [...fireflyFiles, ...relevantDirectories.flatMap {findFireflyFiles(_, mustContain, skipFiles)}]
+    [...fireflyFiles, ...relevantDirectories.flatMap {findFireflyFiles(_, virtualFiles, mustContain, skipFiles)}]
 }
 
 internalCreateExecutable(

package/core/String.ff

@@ -150,8 +150,8 @@ extend self: String {
         self!->startsWith(prefix, offset)?
     }
 
-    endsWith(prefix: String): Bool {
-        self!->endsWith(prefix)?
+    endsWith(suffix: String): Bool {
+        self!->endsWith(suffix)?
     }
 
     removeFirst(prefix: String): Option[String] {

package/experimental/foldertest/Root.ff

@@ -1,10 +1,3 @@
-import a.A
-
-nodeMain(system: NodeSystem) {
-    Log.trace("Hello Root")
-    A.functionA()
+foo(abe: Int): Int {
+    bb
 }
-
-functionRoot() {
-    Log.trace("function Root")
-}

package/experimental/foldertest/findinfolder/FindInFolder.ff

@@ -0,0 +1,3 @@
+myFunction2(xxx: Int): Int {
+    xxx
+}

package/lsp/Handler.ff

@@ -316,7 +316,9 @@ extend self: Handler {
         let files = if(rootPath.isFile()) {
             [rootPath]
         } else {
-            self.printTime(system.mainTask(), "findFireflyFiles") {Builder.findFireflyFiles(rootPath, None, Set.new())}
+            self.printTime(system.mainTask(), "findFireflyFiles") {
+                Builder.findFireflyFiles(rootPath, self.virtualFiles, None, Set.new())
+            }
         }
         let root = if(rootPath.isFile()) {rootPath.parent().grab()} else {rootPath}
         let query = parameters.grab("query").grabString()
@@ -489,7 +491,6 @@ extend self: Handler {
             | Some([]) => Result(Json.null().write())
             | Some([first, ...] @ tokens) =>
                 let oldName = first.raw
-                Log.trace("Rename '" + oldName + "' to '" + newName + "'")
 
                 // TODO findReferences returns some bad tokens
                 let goodTokens = tokens.filter {_.raw == oldName}
@@ -519,8 +520,8 @@ extend self: Handler {
         version: Int
     ): Option[List[TokenLocation]] {
         let temporaryLspHook = LspHook.new(at = Some(targetAt), definedAt = None, insertIdentifier = False, trackSymbols = False)
-        let path = system.path(targetAt.file)
-        let errors = self.check(system, self.fireflyPath, path, None, Set.new(), self.virtualFiles, version, temporaryLspHook, True)
+        let targetPath = system.path(targetAt.file)
+        let errors = self.check(system, self.fireflyPath, targetPath, None, Set.new(), self.virtualFiles, version, temporaryLspHook, True)
         errors.each {| CompileError(at, message) => 
             Log.trace("findReferences first check error: " + message + " in " + at.file + ":" + at.line + ":" + at.column)
         }  
@@ -548,6 +549,9 @@ extend self: Handler {
             | h => None
         }.filter {pair => !pair.at.file.endsWith(">")}
             
+        Log.trace("findReferences("+Show.show(targetAt)+")")
+        Log.trace("definedAtList: " + Show.show(definedAtList))
+            
         function unqualify(qualifiedName: String): String {
             qualifiedName.split('.').grabLast().split('_').grabLast()
         }
@@ -566,10 +570,8 @@ extend self: Handler {
             | Some(definition) =>
                 let lspHook = LspHook.new(at = None, definedAt = Some(definition.at), insertIdentifier = False, trackSymbols = False)
                 let localCheck = local || definition.local
-                let path = if(localCheck) {system.path(targetAt.file)} else {self.rootPath.else {system.path(targetAt.file)}}
+                let checkPath = if(localCheck) {targetPath} else {self.rootPath.else {targetPath}}
                 let mustContain = Some(definition.name).filter {_ => !localCheck}.map(unqualify)
-                Log.trace("findReferences definition: " + Show.show(definition))
-                mustContain.each {Log.trace("mustContain: " + _)}
                 
                 let skipFiles = if(definition.name.contains(":")) {
                     let list = self.moduleCache.filesNotImporting(extractModuleKey(definition.name))
@@ -582,8 +584,8 @@ extend self: Handler {
                         Log.trace("No skip list due to unqualified definition.name: " + definition.name)
                         Set.new()
                     }
-                }
-                let errors = self.check(system, self.fireflyPath, path, mustContain, skipFiles, self.virtualFiles, version, lspHook, True)
+                }.remove(targetPath.absolute())
+                let errors = self.check(system, self.fireflyPath, checkPath, mustContain, skipFiles, self.virtualFiles, version, lspHook, True)
                 errors.each {| CompileError(at, message) => 
                     Log.trace("findReferences second check error: " + message + " in " + at.file + ":" + at.line + ":" + at.column)
                 }
@@ -604,8 +606,6 @@ extend self: Handler {
                     !at.file.endsWith(">") &&
                     (includeDeclaration || at != definition.at)
                 }
-                
-                //referencesResult.each {Log.trace(Show.show(_))}
 
                 let clientLocations = referencesResult.addAll(
                     if(includeDeclaration) {[definition.at]} else {[]}
@@ -640,7 +640,7 @@ extend self: Handler {
                 }.toOption()
             }
             let symbols = nonCore.flatMap {| Pair(packagePair, packagePath) =>
-                let packageFiles = Builder.findPackageFilesForDirectory(packagePath, None, Set.new())
+                let packageFiles = Builder.findPackageFilesForDirectory(packagePath, self.virtualFiles, None, Set.new())
                 packageFiles.flatMap {_.files.collect {file => 
                     parseModule(packagePair, file).map: module =>
                     let typeNames = module.types.map {_.name}
@@ -794,3 +794,7 @@ extend self: Handler {
     }
 
 }
+
+foo(bb: Int): Int {
+    bb
+}

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

@@ -214,7 +214,7 @@ 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_), [])]
 }
 if(_1) {
-return ff_compiler_Builder.findPackageFilesForDirectory_(path_, mustContain_, skipFiles_)
+return ff_compiler_Builder.findPackageFilesForDirectory_(path_, virtualFiles_, mustContain_, skipFiles_)
 }
 {
 return ff_core_Option.Option_toList(ff_compiler_Builder.findPackageFilesForFile_(path_))
@@ -315,8 +315,8 @@ return ff_compiler_Builder.PackageFiles(projectRoot_, packageFile_, [file_])
 } else return ff_core_Option.None()
 }
 
-export function findPackageFilesForDirectory_(directory_, mustContain_, skipFiles_) {
-const files_ = ff_compiler_Builder.findFireflyFiles_(directory_, mustContain_, skipFiles_);
+export function findPackageFilesForDirectory_(directory_, virtualFiles_, mustContain_, skipFiles_) {
+const files_ = ff_compiler_Builder.findFireflyFiles_(directory_, virtualFiles_, mustContain_, skipFiles_);
 const split_ = ff_core_List.List_partition(files_, ((_w1) => {
 return ff_core_Path.Path_endsWith(_w1, [".firefly", "package.ff"])
 }));
@@ -338,7 +338,7 @@ return ff_compiler_Builder.PackageFiles(projectRoot_, ff_core_Option.None(), [fi
 return [...multiFileProjects_, ...singleFileProjects_]
 }
 
-export function findFireflyFiles_(path_, mustContain_, skipFiles_) {
+export function findFireflyFiles_(path_, virtualFiles_, mustContain_, skipFiles_) {
 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)
 }));
@@ -354,12 +354,15 @@ 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(files_, ((_w1) => {
 return ff_core_Path.PathEntry_path(_w1)
 })), ((file_) => {
-return (((ff_core_Path.Path_extension(file_) === ".ff") && (!ff_core_Set.Set_contains(skipFiles_, ff_core_Path.Path_absolute(file_), ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String))) && ff_core_Option.Option_all(mustContain_, ((s_) => {
-return ff_core_String.String_contains(ff_core_Path.Path_readText(file_), s_)
-})))
+return (((ff_core_Path.Path_extension(file_) === ".ff") && (!ff_core_Set.Set_contains(skipFiles_, ff_core_Path.Path_absolute(file_), ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String))) && (ff_core_Path.Path_endsWith(file_, [".firefly", "package.ff"]) || ff_core_Option.Option_all(mustContain_, ((s_) => {
+const code_ = ff_core_Option.Option_else(ff_core_Map.Map_get(virtualFiles_, ff_core_Path.Path_absolute(file_), ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), (() => {
+return ff_core_Path.Path_readText(file_)
+}));
+return ff_core_String.String_contains(code_, s_)
+}))))
 }));
 return [...fireflyFiles_, ...ff_core_List.List_flatMap(relevantDirectories_, ((_w1) => {
-return ff_compiler_Builder.findFireflyFiles_(_w1, mustContain_, skipFiles_)
+return ff_compiler_Builder.findFireflyFiles_(_w1, virtualFiles_, mustContain_, skipFiles_)
 }))]
 }
 
@@ -493,7 +496,7 @@ if(!_1 && (await ff_core_Path.Path_endsWith$(path_, [".firefly", "package.ff"],
 return [ff_compiler_Builder.PackageFiles(ff_core_Option.Option_grab((await ff_core_Path.Path_parent$(path_, $task))), ff_core_Option.Some(path_), [])]
 }
 if(_1) {
-return (await ff_compiler_Builder.findPackageFilesForDirectory_$(path_, mustContain_, skipFiles_, $task))
+return (await ff_compiler_Builder.findPackageFilesForDirectory_$(path_, virtualFiles_, mustContain_, skipFiles_, $task))
 }
 {
 return ff_core_Option.Option_toList((await ff_compiler_Builder.findPackageFilesForFile_$(path_, $task)))
@@ -594,8 +597,8 @@ return ff_compiler_Builder.PackageFiles(projectRoot_, packageFile_, [file_])
 } else return ff_core_Option.None()
 }
 
-export async function findPackageFilesForDirectory_$(directory_, mustContain_, skipFiles_, $task) {
-const files_ = (await ff_compiler_Builder.findFireflyFiles_$(directory_, mustContain_, skipFiles_, $task));
+export async function findPackageFilesForDirectory_$(directory_, virtualFiles_, mustContain_, skipFiles_, $task) {
+const files_ = (await ff_compiler_Builder.findFireflyFiles_$(directory_, virtualFiles_, mustContain_, skipFiles_, $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));
@@ -617,7 +620,7 @@ return ff_compiler_Builder.PackageFiles(projectRoot_, ff_core_Option.None(), [fi
 return [...multiFileProjects_, ...singleFileProjects_]
 }
 
-export async function findFireflyFiles_$(path_, mustContain_, skipFiles_, $task) {
+export async function findFireflyFiles_$(path_, virtualFiles_, mustContain_, skipFiles_, $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));
@@ -633,12 +636,15 @@ return (((c_ === 46) || ff_core_Char.Char_isAsciiLower(c_)) || ff_core_Char.Char
 const fireflyFiles_ = (await ff_core_List.List_filter$((await ff_core_List.List_map$(files_, (async (_w1, $task) => {
 return (await ff_core_Path.PathEntry_path$(_w1, $task))
 }), $task)), (async (file_, $task) => {
-return ((((await ff_core_Path.Path_extension$(file_, $task)) === ".ff") && (!ff_core_Set.Set_contains(skipFiles_, (await ff_core_Path.Path_absolute$(file_, $task)), ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String))) && (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)))
+return ((((await ff_core_Path.Path_extension$(file_, $task)) === ".ff") && (!ff_core_Set.Set_contains(skipFiles_, (await ff_core_Path.Path_absolute$(file_, $task)), ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String))) && ((await ff_core_Path.Path_endsWith$(file_, [".firefly", "package.ff"], $task)) || (await ff_core_Option.Option_all$(mustContain_, (async (s_, $task) => {
+const code_ = (await ff_core_Option.Option_else$(ff_core_Map.Map_get(virtualFiles_, (await ff_core_Path.Path_absolute$(file_, $task)), ff_core_Ordering.ff_core_Ordering_Order$ff_core_String_String), (async ($task) => {
+return (await ff_core_Path.Path_readText$(file_, $task))
+}), $task));
+return ff_core_String.String_contains(code_, s_)
+}), $task))))
 }), $task));
 return [...fireflyFiles_, ...(await ff_core_List.List_flatMap$(relevantDirectories_, (async (_w1, $task) => {
-return (await ff_compiler_Builder.findFireflyFiles_$(_w1, mustContain_, skipFiles_, $task))
+return (await ff_compiler_Builder.findFireflyFiles_$(_w1, virtualFiles_, mustContain_, skipFiles_, $task))
 }), $task))]
 }
 

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

@@ -252,8 +252,8 @@ export function String_startsWith(self_, prefix_, offset_ = 0) {
 return self_.startsWith(prefix_, offset_)
 }
 
-export function String_endsWith(self_, prefix_) {
-return self_.endsWith(prefix_)
+export function String_endsWith(self_, suffix_) {
+return self_.endsWith(suffix_)
 }
 
 export function String_removeFirst(self_, prefix_) {
@@ -514,8 +514,8 @@ export async function String_startsWith$(self_, prefix_, offset_ = 0, $task) {
 return self_.startsWith(prefix_, offset_)
 }
 
-export async function String_endsWith$(self_, prefix_, $task) {
-return self_.endsWith(prefix_)
+export async function String_endsWith$(self_, suffix_, $task) {
+return self_.endsWith(suffix_)
 }
 
 export async function String_removeFirst$(self_, prefix_, $task) {

package/package.json

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

package/vscode/package.json

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

package/experimental/foldertest/a/A.ff

@@ -1,3 +0,0 @@
-functionA() {
-    Log.trace("function A")
-}

package/experimental/foldertest/a/MainA.ff

@@ -1,3 +0,0 @@
-nodeMain(system: NodeSystem) {
-    Log.trace("Hello from a/MainA")
-}