firefly-compiler 0.5.66 → 0.5.68

package/lsp/CompletionHandler.ff

@@ -49,7 +49,7 @@ handleCompletion(
     mutable typeCompletions = []
     let completions = patternCompletions.else {lspHook.results().flatMap {
         | ResolveTypeHook h =>
-            typeCompletions = [...typeCompletions, ...typeCompletion(h.types, h.typeGenerics)]
+            typeCompletions = [...typeCompletions, ...typeCompletion(h.types, h.typeGenerics, importSymbols)]
             []
         | ResolveVariantFieldHook _ =>
             sawParameterOrVariantFieldHook = True
@@ -259,7 +259,11 @@ importCompletion(moduleKeys: List[ModuleKey]): List[CompletionInfo] {
     }
 }
 
-typeCompletion(types: Map[String, String], typeGenerics: Map[String, List[String]]): List[CompletionInfo] {
+typeCompletion(
+    types: Map[String, String]
+    typeGenerics: Map[String, List[String]]
+    importSymbols: ImportSymbolsInfo
+): List[CompletionInfo] {
     let completions = types.toList().filter {| Pair(n, full) =>
         n.all {_.isAsciiLetterOrDigit()}
     }.map {| Pair(typeName, full) =>
@@ -270,7 +274,11 @@ typeCompletion(types: Map[String, String], typeGenerics: Map[String, List[String
         let snippet = typeName + if(realGenerics.isEmpty()) {""} else {"[$0]"}
         CompletionInfo(label, extra, "", snippet, False, TConstructor(Location("", 0, 0), "type", []), full, None)
     }
-    completions
+    let importCompletions = importSymbols.importSymbols.flatMap {| info =>
+        info.typeNames.map: name =>
+        makeAutoimportCompletion(info, importSymbols.importLine, name, True)
+    }
+    [...completions, ...importCompletions]
 }
 
 completion(
@@ -357,34 +365,37 @@ completion(
     if(prefix == "") {
         importSymbols.importSymbols.each {| info =>
             [info.moduleKey.name, ...info.variantNames].distinct().each: name =>
-            let moduleName = info.moduleKey.folders.map {_ + "."}.join() + info.moduleKey.name
-            let fromName = if(
-                info.moduleKey.packagePair.name == "script" && info.moduleKey.packagePair.group == "script"
-            ) {
-                ""
-            } else {
-                info.moduleKey.packagePair.groupName(":")
-            }
-            let importName = if(fromName == "") {moduleName} else {moduleName + " from " + fromName}
-            // TODO: Add edit that inserts the import
-            members.push(CompletionInfo(
-                label = name
-                extra = ""
-                more = if(fromName == "") {moduleName} else {fromName + "/" + moduleName}
-                snippet = name
-                member = False
-                type = TConstructor(Location("", 0, 0), "", [])
-                documentation = "// Will import the following module:\nimport " + importName
-                expectedType = None
-                secondarySort = 9
-                insertion = Some(Pair(importSymbols.importLine, "import " + importName + "\n"))
-            ))
+            members.push(makeAutoimportCompletion(info, importSymbols.importLine, name, False))
         }
     }
     
     members.toList()
 }
 
+makeAutoimportCompletion(info: ImportSymbolInfo, importLine: Int, name: String, isType: Bool): CompletionInfo {
+    let moduleName = info.moduleKey.folders.map {_ + "."}.join() + info.moduleKey.name
+    let fromName = if(
+        info.moduleKey.packagePair.name == "script" && info.moduleKey.packagePair.group == "script"
+    ) {
+        ""
+    } else {
+        info.moduleKey.packagePair.groupName(":")
+    }
+    let importName = if(fromName == "") {moduleName} else {moduleName + " from " + fromName}
+    CompletionInfo(
+        label = name
+        extra = ""
+        more = if(fromName == "") {moduleName} else {fromName + "/" + moduleName}
+        snippet = name
+        member = False
+        type = TConstructor(Location("", 0, 0), if(isType) {"type"} else {""}, [])
+        documentation = "// Will import the following module:\nimport " + importName
+        expectedType = None
+        secondarySort = 9
+        insertion = Some(Pair(importLine, "import " + importName + "\n"))
+    )
+}
+
 makeCompletion(
     unification: Unification
     expected: Type

package/lsp/Handler.ff

@@ -76,6 +76,7 @@ extend self: Handler {
                 let diagnostics = self.handleFocusDiagnostic(system, parameters, version)
                 [Pair("textDocument/publishDiagnostics", diagnostics)]
             | "custom/focusDocument" => 
+                self.importSymbolsCache = Pair("", [])
                 let diagnostics = self.handleFocusDiagnostic(system, parameters, version)
                 [Pair("textDocument/publishDiagnostics", diagnostics)]
             | "workspace/didRenameFiles" =>
@@ -240,7 +241,6 @@ extend self: Handler {
     }*/
 
     handleFocusDiagnostic(system: NodeSystem, parameters: Map[String, Json], version: Int): Json {
-        self.importSymbolsCache = Pair("", [])
         let js = system.js()
         let uri = parameters.grab("textDocument").field("uri").grabString()
         let path = system.pathFromUrl(uri)
@@ -406,7 +406,9 @@ extend self: Handler {
         errors.each {| CompileError(at, message) => 
             Log.trace("handleCompletion check error: " + message)
         }        
-        let importSymbols = self.findModulesToImport(system, path, lspHook)
+        let importSymbols = self.printTime(system.mainTask(), "findModulesToImport") {
+            self.findModulesToImport(system, path, lspHook)
+        }
         let o = CompletionHandler.handleCompletion(
             lspHook = lspHook
             toplevel = completionAt.column == 1

package/package.json

@@ -4,7 +4,7 @@
     "description": "Firefly compiler",
     "author": "Firefly team",
     "license": "MIT",
-    "version": "0.5.66",
+    "version": "0.5.68",
     "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.66",
+    "version": "0.5.68",
     "repository": {
         "type": "git",
         "url": "https://github.com/Ahnfelt/firefly-boot"