feat: pack resources into jar (#37)

astansler · web-flow · commit c83679c1dd01 · 2017-09-26T15:06:17.000+03:00
* feat: pack resources into jar

* chore: edit comment
diff --git a/src/main/kotlin/app/extractors/CExtractor.kt b/src/main/kotlin/app/extractors/CExtractor.kt
@@ -19,17 +19,17 @@ class CExtractor : ExtractorInterface {
     }
 
     override fun extractImports(fileContent: List<String>): List<String> {
-        val libraries = mutableSetOf<String>()
+        val imports = mutableSetOf<String>()
 
         val regex = Regex("""#include\s+["<](\w+)[/\w+]*\.\w+[">]""")
         fileContent.forEach {
             val res = regex.find(it)
             if (res != null) {
                 val lineLib = res.groupValues.last()
-                libraries.add(lineLib)
+                imports.add(lineLib)
             }
         }
 
-        return libraries.toList()
+        return imports.toList()
     }
 }
diff --git a/src/main/kotlin/app/extractors/CSharpExtractor.kt b/src/main/kotlin/app/extractors/CSharpExtractor.kt
@@ -12,6 +12,7 @@ class CSharpExtractor : ExtractorInterface {
     companion object {
         val LANGUAGE_NAME = "cs"
         val FILE_EXTS = listOf("cs")
+        val LIBRARIES = ExtractorInterface.getLibraries("cs")
     }
 
     override fun extract(files: List<DiffFile>): List<CommitStats> {
@@ -20,27 +21,21 @@ class CSharpExtractor : ExtractorInterface {
     }
 
     override fun extractImports(fileContent: List<String>): List<String> {
-        val libraries = mutableSetOf<String>()
-
-        // TODO(anatoly): Load file statically.
-        val csLibraries = File("data/libraries/cs_libraries.txt")
-            .inputStream().bufferedReader()
-            .readLines()
-            .toSet()
+        val imports = mutableSetOf<String>()
 
         val regex = Regex("""using\s+(\w+[.\w+]*)""")
         fileContent.forEach {
             val res = regex.find(it)
             if (res != null) {
                 val importedName = res.groupValues[1]
-                csLibraries.forEach { library ->
+                LIBRARIES.forEach { library ->
                     if (importedName.startsWith(library)) {
-                        libraries.add(library)
+                        imports.add(library)
                     }
                 }
             }
         }
 
-        return libraries.toList()
+        return imports.toList()
     }
 }
diff --git a/src/main/kotlin/app/extractors/CppExtractor.kt b/src/main/kotlin/app/extractors/CppExtractor.kt
@@ -19,17 +19,17 @@ class CppExtractor : ExtractorInterface {
     }
 
     override fun extractImports(fileContent: List<String>): List<String> {
-        val libraries = mutableSetOf<String>()
+        val imports = mutableSetOf<String>()
 
         val regex = Regex("""#include\s+["<](\w+)[/\w+]*\.\w+[">]""")
         fileContent.forEach {
             val res = regex.find(it)
             if (res != null) {
                 val lineLib = res.groupValues.last()
-                libraries.add(lineLib)
+                imports.add(lineLib)
             }
         }
 
-        return libraries.toList()
+        return imports.toList()
     }
 }
diff --git a/src/main/kotlin/app/extractors/ExtractorInterface.kt b/src/main/kotlin/app/extractors/ExtractorInterface.kt
@@ -8,6 +8,14 @@ import app.model.DiffFile
 import app.model.CommitStats
 
 interface ExtractorInterface {
+    companion object {
+        fun getLibraries(name: String): Set<String> {
+            return ExtractorInterface::class.java.classLoader
+                .getResourceAsStream("data/libraries/${name}_libraries.txt")
+                .bufferedReader().readLines().toSet()
+        }
+    }
+
     fun extract(files: List<DiffFile>): List<CommitStats> {
         files.map { file ->
             file.old.imports = extractImports(file.old.content)
@@ -29,4 +37,6 @@ interface ExtractorInterface {
     fun extractImports(fileContent: List<String>): List<String> {
         return listOf()
     }
+
+
 }
diff --git a/src/main/kotlin/app/extractors/GoExtractor.kt b/src/main/kotlin/app/extractors/GoExtractor.kt
@@ -19,26 +19,26 @@ class GoExtractor : ExtractorInterface {
     }
 
     override fun extractImports(fileContent: List<String>): List<String> {
-        val libraries = mutableSetOf<String>()
+        val imports = mutableSetOf<String>()
 
         val singleImportRegex = Regex("""import\s+"(\w+)"""")
         fileContent.forEach {
             val res = singleImportRegex.find(it)
             if (res != null) {
                 val lineLib = res.groupValues.last()
-                libraries.add(lineLib)
+                imports.add(lineLib)
             }
         }
         val multipleImportRegex = Regex("""import[\s\t\n]+\((.+?)\)""",
                 RegexOption.DOT_MATCHES_ALL)
         val contentJoined = fileContent.joinToString(separator = "")
         multipleImportRegex.findAll(contentJoined).forEach { matchResult ->
-            libraries.addAll(matchResult.groupValues.last()
+            imports.addAll(matchResult.groupValues.last()
                 .split(Regex("""(\t+|\n+|\s+)"""))
                 .filter { it.isNotEmpty() }
                 .map { it -> it.replace("\"", "") })
         }
 
-        return libraries.toList()
+        return imports.toList()
     }
 }
diff --git a/src/main/kotlin/app/extractors/JavaExtractor.kt b/src/main/kotlin/app/extractors/JavaExtractor.kt
@@ -12,6 +12,7 @@ class JavaExtractor : ExtractorInterface {
     companion object {
         val LANGUAGE_NAME = "java"
         val FILE_EXTS = listOf("java")
+        val LIBRARIES = ExtractorInterface.getLibraries("java")
     }
 
     val KEYWORDS = listOf("abstract", "continue", "for", "new", "switch",
@@ -56,27 +57,21 @@ class JavaExtractor : ExtractorInterface {
     }
 
     override fun extractImports(fileContent: List<String>): List<String> {
-        val libraries = mutableSetOf<String>()
-
-        // TODO(anatoly): Load file statically.
-        val javaLibraries = File("data/libraries/java_libraries.txt")
-            .inputStream().bufferedReader()
-            .readLines()
-            .toSet()
+        val imports = mutableSetOf<String>()
 
         val regex = Regex("""import\s+(\w+[.\w+]*)""")
         fileContent.forEach {
             val res = regex.find(it)
             if (res != null) {
                 val importedName = res.groupValues[1]
-                javaLibraries.forEach { library ->
+                LIBRARIES.forEach { library ->
                     if (importedName.startsWith(library)) {
-                        libraries.add(library)
+                        imports.add(library)
                     }
                 }
             }
         }
 
-        return libraries.toList()
+        return imports.toList()
     }
 }
diff --git a/src/main/kotlin/app/extractors/JavascriptExtractor.kt b/src/main/kotlin/app/extractors/JavascriptExtractor.kt
@@ -6,12 +6,12 @@ package app.extractors
 
 import app.model.CommitStats
 import app.model.DiffFile
-import java.io.File
 
 class JavascriptExtractor : ExtractorInterface {
     companion object {
         val LANGUAGE_NAME = "js"
         val FILE_EXTS = listOf("js")
+        val LIBRARIES = ExtractorInterface.getLibraries("js")
     }
 
     override fun extract(files: List<DiffFile>): List<CommitStats> {
@@ -20,20 +20,14 @@ class JavascriptExtractor : ExtractorInterface {
     }
 
     override fun extractImports(fileContent: List<String>): List<String> {
-        val libraries = mutableSetOf<String>()
-
-        // TODO(anatoly): Load file statically.
-        val jsLibraries = File("data/libraries/js_libraries.txt")
-            .inputStream().bufferedReader()
-            .readLines()
-            .toSet()
+        val imports = mutableSetOf<String>()
 
         val splitRegex =
             Regex("""\s+|,|;|:|\\*|\n|\(|\)|\\[|]|\{|}|\+|=|\.|>|<|#|@|\$""")
         val fileTokens = fileContent.joinToString(separator = " ")
             .split(splitRegex)
-        libraries.addAll(fileTokens.filter { token -> token in jsLibraries })
+        imports.addAll(fileTokens.filter { token -> token in LIBRARIES })
 
-        return libraries.toList()
+        return imports.toList()
     }
 }
diff --git a/src/main/kotlin/app/extractors/ObjectiveCExtractor.kt b/src/main/kotlin/app/extractors/ObjectiveCExtractor.kt
@@ -19,7 +19,7 @@ class ObjectiveCExtractor : ExtractorInterface {
     }
 
     override fun extractImports(fileContent: List<String>): List<String> {
-        val libraries = mutableSetOf<String>()
+        val imports = mutableSetOf<String>()
 
         val sharpImportIncludeRegex =
             Regex("""#(import|include)\s+[">](\w+)[/\w+]*\.\w+[">]""")
@@ -30,10 +30,10 @@ class ObjectiveCExtractor : ExtractorInterface {
                 atImportRegex.findAll(it)
             if (res.toList().isNotEmpty()) {
                 val lineLib = res.toList().map { it.groupValues }.last().last()
-                libraries.add(lineLib)
+                imports.add(lineLib)
             }
         }
 
-        return libraries.toList()
+        return imports.toList()
     }
 }
diff --git a/src/main/kotlin/app/extractors/PhpExtractor.kt b/src/main/kotlin/app/extractors/PhpExtractor.kt
@@ -19,7 +19,7 @@ class PhpExtractor : ExtractorInterface {
     }
 
     override fun extractImports(fileContent: List<String>): List<String> {
-        val libraries = mutableSetOf<String>()
+        val imports = mutableSetOf<String>()
 
         val useRegex = Regex("""use\s+(\w+)[\\\w+]*""")
         val requireIncludeRegex = Regex("""(require|require_once|include|""" +
@@ -28,10 +28,10 @@ class PhpExtractor : ExtractorInterface {
             val res = useRegex.findAll(it) + requireIncludeRegex.findAll(it)
             if (res.toList().isNotEmpty()) {
                 val lineLib = res.toList().map { it.groupValues }.last().last()
-                libraries.add(lineLib)
+                imports.add(lineLib)
             }
         }
 
-        return libraries.toList()
+        return imports.toList()
     }
 }
diff --git a/src/main/kotlin/app/extractors/PythonExtractor.kt b/src/main/kotlin/app/extractors/PythonExtractor.kt
@@ -19,7 +19,7 @@ class PythonExtractor : ExtractorInterface {
     }
 
     override fun extractImports(fileContent: List<String>): List<String> {
-        val libraries = mutableSetOf<String>()
+        val imports = mutableSetOf<String>()
 
         val regex =
             Regex("""(from\s+(\w+)[.\w+]*\s+import|import\s+(\w+[,\s*\w+]*))""")
@@ -28,10 +28,10 @@ class PythonExtractor : ExtractorInterface {
             if (res != null) {
                 val lineLibs = res.groupValues.last { it != "" }
                     .split(Regex(""",\s*"""))
-                libraries.addAll(lineLibs)
+                imports.addAll(lineLibs)
             }
         }
 
-        return libraries.toList()
+        return imports.toList()
     }
 }
diff --git a/src/main/kotlin/app/extractors/RubyExtractor.kt b/src/main/kotlin/app/extractors/RubyExtractor.kt
@@ -19,17 +19,17 @@ class RubyExtractor : ExtractorInterface {
     }
 
     override fun extractImports(fileContent: List<String>): List<String> {
-        val libraries = mutableSetOf<String>()
+        val imports = mutableSetOf<String>()
 
         val regex = Regex("""(require\s+'(\w+)'|load\s+'(\w+)\.\w+')""")
         fileContent.forEach {
             val res = regex.find(it)
             if (res != null) {
                 val lineLib = res.groupValues.last { it -> it != "" }
-                libraries.add(lineLib)
+                imports.add(lineLib)
             }
         }
 
-        return libraries.toList()
+        return imports.toList()
     }
 }
diff --git a/src/main/kotlin/app/extractors/SwiftExtractor.kt b/src/main/kotlin/app/extractors/SwiftExtractor.kt
@@ -19,17 +19,17 @@ class SwiftExtractor : ExtractorInterface {
     }
 
     override fun extractImports(fileContent: List<String>): List<String> {
-        val libraries = mutableSetOf<String>()
+        val imports = mutableSetOf<String>()
 
         val regex = Regex("""import\s+(\w+)""")
         fileContent.forEach {
             val res = regex.find(it)
             if (res != null) {
                 val lineLib = res.groupValues[1]
-                libraries.add(lineLib)
+                imports.add(lineLib)
             }
         }
 
-        return libraries.toList()
+        return imports.toList()
     }
 }
diff --git a/src/main/kotlin/app/hashers/CommitHasher.kt b/src/main/kotlin/app/hashers/CommitHasher.kt
@@ -95,6 +95,7 @@ class CommitHasher(private val localRepo: LocalRepo,
             .subscribe({ commitsBundle ->  // OnNext.
                 postCommitsToServer(commitsBundle)  // Send ready commits.
             }, { e ->  // OnError.
+                Logger.error("Hashing error: " + e.message)
                 throwables.add(e)  // TODO(anatoly): Top-class handling errors.
             })
     }
diff --git a/src/main/resources/data/libraries/cs_libraries.txt b/src/main/resources/data/libraries/cs_libraries.txt
diff --git a/src/main/resources/data/libraries/java_libraries.txt b/src/main/resources/data/libraries/java_libraries.txt
diff --git a/src/main/resources/data/libraries/js_libraries.txt b/src/main/resources/data/libraries/js_libraries.txt

Original file line number	Diff line number	Diff line change
`@@ -19,17 +19,17 @@ class CExtractor : ExtractorInterface {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`override fun extractImports(fileContent: List<String>): List<String> {`
`22`		`- val libraries = mutableSetOf<String>()`
	`22`	`+ val imports = mutableSetOf<String>()`
`23`	`23`
`24`	`24`	`val regex = Regex("""#include\s+["<](\w+)[/\w+]*\.\w+[">]""")`
`25`	`25`	`fileContent.forEach {`
`26`	`26`	`val res = regex.find(it)`
`27`	`27`	`if (res != null) {`
`28`	`28`	`val lineLib = res.groupValues.last()`
`29`		`- libraries.add(lineLib)`
	`29`	`+ imports.add(lineLib)`
`30`	`30`	`}`
`31`	`31`	`}`
`32`	`32`
`33`		`- return libraries.toList()`
	`33`	`+ return imports.toList()`
`34`	`34`	`}`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ class CSharpExtractor : ExtractorInterface {`
`12`	`12`	`companion object {`
`13`	`13`	`val LANGUAGE_NAME = "cs"`
`14`	`14`	`val FILE_EXTS = listOf("cs")`
	`15`	`+ val LIBRARIES = ExtractorInterface.getLibraries("cs")`
`15`	`16`	`}`
`16`	`17`
`17`	`18`	`override fun extract(files: List<DiffFile>): List<CommitStats> {`
`@@ -20,27 +21,21 @@ class CSharpExtractor : ExtractorInterface {`
`20`	`21`	`}`
`21`	`22`
`22`	`23`	`override fun extractImports(fileContent: List<String>): List<String> {`
`23`		`- val libraries = mutableSetOf<String>()`
`24`		`-`
`25`		`- // TODO(anatoly): Load file statically.`
`26`		`- val csLibraries = File("data/libraries/cs_libraries.txt")`
`27`		`- .inputStream().bufferedReader()`
`28`		`- .readLines()`
`29`		`- .toSet()`
	`24`	`+ val imports = mutableSetOf<String>()`
`30`	`25`
`31`	`26`	`val regex = Regex("""using\s+(\w+[.\w+]*)""")`
`32`	`27`	`fileContent.forEach {`
`33`	`28`	`val res = regex.find(it)`
`34`	`29`	`if (res != null) {`
`35`	`30`	`val importedName = res.groupValues[1]`
`36`		`- csLibraries.forEach { library ->`
	`31`	`+ LIBRARIES.forEach { library ->`
`37`	`32`	`if (importedName.startsWith(library)) {`
`38`		`- libraries.add(library)`
	`33`	`+ imports.add(library)`
`39`	`34`	`}`
`40`	`35`	`}`
`41`	`36`	`}`
`42`	`37`	`}`
`43`	`38`
`44`		`- return libraries.toList()`
	`39`	`+ return imports.toList()`
`45`	`40`	`}`
`46`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,17 +19,17 @@ class CppExtractor : ExtractorInterface {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`override fun extractImports(fileContent: List<String>): List<String> {`
`22`		`- val libraries = mutableSetOf<String>()`
	`22`	`+ val imports = mutableSetOf<String>()`
`23`	`23`
`24`	`24`	`val regex = Regex("""#include\s+["<](\w+)[/\w+]*\.\w+[">]""")`
`25`	`25`	`fileContent.forEach {`
`26`	`26`	`val res = regex.find(it)`
`27`	`27`	`if (res != null) {`
`28`	`28`	`val lineLib = res.groupValues.last()`
`29`		`- libraries.add(lineLib)`
	`29`	`+ imports.add(lineLib)`
`30`	`30`	`}`
`31`	`31`	`}`
`32`	`32`
`33`		`- return libraries.toList()`
	`33`	`+ return imports.toList()`
`34`	`34`	`}`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,26 +19,26 @@ class GoExtractor : ExtractorInterface {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`override fun extractImports(fileContent: List<String>): List<String> {`
`22`		`- val libraries = mutableSetOf<String>()`
	`22`	`+ val imports = mutableSetOf<String>()`
`23`	`23`
`24`	`24`	`val singleImportRegex = Regex("""import\s+"(\w+)"""")`
`25`	`25`	`fileContent.forEach {`
`26`	`26`	`val res = singleImportRegex.find(it)`
`27`	`27`	`if (res != null) {`
`28`	`28`	`val lineLib = res.groupValues.last()`
`29`		`- libraries.add(lineLib)`
	`29`	`+ imports.add(lineLib)`
`30`	`30`	`}`
`31`	`31`	`}`
`32`	`32`	`val multipleImportRegex = Regex("""import[\s\t\n]+\((.+?)\)""",`
`33`	`33`	`RegexOption.DOT_MATCHES_ALL)`
`34`	`34`	`val contentJoined = fileContent.joinToString(separator = "")`
`35`	`35`	`multipleImportRegex.findAll(contentJoined).forEach { matchResult ->`
`36`		`- libraries.addAll(matchResult.groupValues.last()`
	`36`	`+ imports.addAll(matchResult.groupValues.last()`
`37`	`37`	`.split(Regex("""(\t+\|\n+\|\s+)"""))`
`38`	`38`	`.filter { it.isNotEmpty() }`
`39`	`39`	`.map { it -> it.replace("\"", "") })`
`40`	`40`	`}`
`41`	`41`
`42`		`- return libraries.toList()`
	`42`	`+ return imports.toList()`
`43`	`43`	`}`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ class JavaExtractor : ExtractorInterface {`
`12`	`12`	`companion object {`
`13`	`13`	`val LANGUAGE_NAME = "java"`
`14`	`14`	`val FILE_EXTS = listOf("java")`
	`15`	`+ val LIBRARIES = ExtractorInterface.getLibraries("java")`
`15`	`16`	`}`
`16`	`17`
`17`	`18`	`val KEYWORDS = listOf("abstract", "continue", "for", "new", "switch",`
`@@ -56,27 +57,21 @@ class JavaExtractor : ExtractorInterface {`
`56`	`57`	`}`
`57`	`58`
`58`	`59`	`override fun extractImports(fileContent: List<String>): List<String> {`
`59`		`- val libraries = mutableSetOf<String>()`
`60`		`-`
`61`		`- // TODO(anatoly): Load file statically.`
`62`		`- val javaLibraries = File("data/libraries/java_libraries.txt")`
`63`		`- .inputStream().bufferedReader()`
`64`		`- .readLines()`
`65`		`- .toSet()`
	`60`	`+ val imports = mutableSetOf<String>()`
`66`	`61`
`67`	`62`	`val regex = Regex("""import\s+(\w+[.\w+]*)""")`
`68`	`63`	`fileContent.forEach {`
`69`	`64`	`val res = regex.find(it)`
`70`	`65`	`if (res != null) {`
`71`	`66`	`val importedName = res.groupValues[1]`
`72`		`- javaLibraries.forEach { library ->`
	`67`	`+ LIBRARIES.forEach { library ->`
`73`	`68`	`if (importedName.startsWith(library)) {`
`74`		`- libraries.add(library)`
	`69`	`+ imports.add(library)`
`75`	`70`	`}`
`76`	`71`	`}`
`77`	`72`	`}`
`78`	`73`	`}`
`79`	`74`
`80`		`- return libraries.toList()`
	`75`	`+ return imports.toList()`
`81`	`76`	`}`
`82`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ class ObjectiveCExtractor : ExtractorInterface {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`override fun extractImports(fileContent: List<String>): List<String> {`
`22`		`- val libraries = mutableSetOf<String>()`
	`22`	`+ val imports = mutableSetOf<String>()`
`23`	`23`
`24`	`24`	`val sharpImportIncludeRegex =`
`25`	`25`	`Regex("""#(import\|include)\s+[">](\w+)[/\w+]*\.\w+[">]""")`
`@@ -30,10 +30,10 @@ class ObjectiveCExtractor : ExtractorInterface {`
`30`	`30`	`atImportRegex.findAll(it)`
`31`	`31`	`if (res.toList().isNotEmpty()) {`
`32`	`32`	`val lineLib = res.toList().map { it.groupValues }.last().last()`
`33`		`- libraries.add(lineLib)`
	`33`	`+ imports.add(lineLib)`
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`
`37`		`- return libraries.toList()`
	`37`	`+ return imports.toList()`
`38`	`38`	`}`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ class PhpExtractor : ExtractorInterface {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`override fun extractImports(fileContent: List<String>): List<String> {`
`22`		`- val libraries = mutableSetOf<String>()`
	`22`	`+ val imports = mutableSetOf<String>()`
`23`	`23`
`24`	`24`	`val useRegex = Regex("""use\s+(\w+)[\\\w+]*""")`
`25`	`25`	`val requireIncludeRegex = Regex("""(require\|require_once\|include\|""" +`
`@@ -28,10 +28,10 @@ class PhpExtractor : ExtractorInterface {`
`28`	`28`	`val res = useRegex.findAll(it) + requireIncludeRegex.findAll(it)`
`29`	`29`	`if (res.toList().isNotEmpty()) {`
`30`	`30`	`val lineLib = res.toList().map { it.groupValues }.last().last()`
`31`		`- libraries.add(lineLib)`
	`31`	`+ imports.add(lineLib)`
`32`	`32`	`}`
`33`	`33`	`}`
`34`	`34`
`35`		`- return libraries.toList()`
	`35`	`+ return imports.toList()`
`36`	`36`	`}`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ class PythonExtractor : ExtractorInterface {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`override fun extractImports(fileContent: List<String>): List<String> {`
`22`		`- val libraries = mutableSetOf<String>()`
	`22`	`+ val imports = mutableSetOf<String>()`
`23`	`23`
`24`	`24`	`val regex =`
`25`	`25`	`Regex("""(from\s+(\w+)[.\w+]\s+import\|import\s+(\w+[,\s\w+]*))""")`
`@@ -28,10 +28,10 @@ class PythonExtractor : ExtractorInterface {`
`28`	`28`	`if (res != null) {`
`29`	`29`	`val lineLibs = res.groupValues.last { it != "" }`
`30`	`30`	`.split(Regex(""",\s*"""))`
`31`		`- libraries.addAll(lineLibs)`
	`31`	`+ imports.addAll(lineLibs)`
`32`	`32`	`}`
`33`	`33`	`}`
`34`	`34`
`35`		`- return libraries.toList()`
	`35`	`+ return imports.toList()`
`36`	`36`	`}`
`37`	`37`	`}`