azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

JS: fix building stubs for JS library that contains classes in default package

Browse Source
This commit is contained in:
Alexey Andreev
2016-11-23 17:57:56 +03:00
parent efeccd0929
commit 20669c1b97
2 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.xml
-9
View File
@@ -420,15 +420,6 @@
</src> </src>
</new-kotlin2js> </new-kotlin2js>
<!-- TODO: it's a temporary hack, until IDEA indexer learns how to process this correctly -->
<delete file="${js.stdlib.output.dir}/tmp/kotlin/BaseOutput.kjsm"/>
<delete file="${js.stdlib.output.dir}/tmp/kotlin/BufferedOutput.kjsm"/>
<delete file="${js.stdlib.output.dir}/tmp/kotlin/BufferedOutputToConsoleLog.kjsm"/>
<delete file="${js.stdlib.output.dir}/tmp/kotlin/NodeJsOutput.kjsm"/>
<delete file="${js.stdlib.output.dir}/tmp/kotlin/OutputToConsoleLog.kjsm"/>
<delete file="${js.stdlib.output.dir}/tmp/kotlin/PropertyMetadata.kjsm"/>
<!-- -->
<move file="${js.stdlib.output.dir}/tmp-builtins/kotlin.js" tofile="${js.stdlib.output.dir}/builtins.js" /> <move file="${js.stdlib.output.dir}/tmp-builtins/kotlin.js" tofile="${js.stdlib.output.dir}/builtins.js" />
<move file="${js.stdlib.output.dir}/tmp/kotlin.js" tofile="${js.stdlib.output.dir}/${compiled.stdlib.js}" /> <move file="${js.stdlib.output.dir}/tmp/kotlin.js" tofile="${js.stdlib.output.dir}/${compiled.stdlib.js}" />
<move file="${js.stdlib.output.dir}/tmp/kotlin" todir="${js.stdlib.output.dir}" /> <move file="${js.stdlib.output.dir}/tmp/kotlin" todir="${js.stdlib.output.dir}" />
idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/js/JsMetaFileUtils.kt
+1 -1
View File
@@ -57,7 +57,7 @@ object JsMetaFileUtils {
private fun getPackageFqName(relPath: String): FqName { private fun getPackageFqName(relPath: String): FqName {
val pathToFile = relPath.substringAfter(VfsUtilCore.VFS_SEPARATOR_CHAR) val pathToFile = relPath.substringAfter(VfsUtilCore.VFS_SEPARATOR_CHAR)
if (isDefaultPackageMetafile(pathToFile)) return FqName.ROOT if (isDefaultPackageMetafile(pathToFile) || !pathToFile.contains(VfsUtilCore.VFS_SEPARATOR_CHAR)) return FqName.ROOT
val name = pathToFile.substringBeforeLast(VfsUtilCore.VFS_SEPARATOR_CHAR) val name = pathToFile.substringBeforeLast(VfsUtilCore.VFS_SEPARATOR_CHAR)
return FqName(name.replace(VfsUtilCore.VFS_SEPARATOR_CHAR, '.')) return FqName(name.replace(VfsUtilCore.VFS_SEPARATOR_CHAR, '.'))