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

Unit.VALUE -> Unit in code.

Browse Source
This commit is contained in:
Zalim Bashorov
2014-07-12 21:25:00 +04:00
parent c85ec97589
commit 4a8519615a
4 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/psi/DebugTextUtil.kt
+2 -2
View File
@@ -71,7 +71,7 @@ public fun JetElement.getDebugText(): String? {
} }
return "package " + fqName.asString() return "package " + fqName.asString()
} }
return accept(DebugTextBuildingVisitor, Unit.VALUE) return accept(DebugTextBuildingVisitor, Unit)
} }
@@ -341,4 +341,4 @@ private fun StringBuilder.appendInn(target: Any?, prefix: String = "", suffix: S
else -> target.toString() else -> target.toString()
}) })
append(suffix) append(suffix)
} }
compiler/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java
+1 -1
View File
@@ -128,7 +128,7 @@ public class JetTypeCheckerTest extends JetLiteFixture {
assertType("\"d\"", builtIns.getStringType()); assertType("\"d\"", builtIns.getStringType());
assertType("\"\"\"d\"\"\"", builtIns.getStringType()); assertType("\"\"\"d\"\"\"", builtIns.getStringType());
assertType("Unit.VALUE", KotlinBuiltIns.getInstance().getUnitType()); assertType("Unit", KotlinBuiltIns.getInstance().getUnitType());
assertType("null", KotlinBuiltIns.getInstance().getNullableNothingType()); assertType("null", KotlinBuiltIns.getInstance().getNullableNothingType());
} }
idea/src/org/jetbrains/jet/plugin/completion/smart/Utils.kt
+1 -1
View File
@@ -95,7 +95,7 @@ fun LookupElement.suppressAutoInsertion() = AutoCompletionPolicy.NEVER_AUTOCOMPL
val KEEP_OLD_ARGUMENT_LIST_ON_TAB_KEY = Key<Unit>("KEEP_OLD_ARGUMENT_LIST_ON_TAB_KEY") val KEEP_OLD_ARGUMENT_LIST_ON_TAB_KEY = Key<Unit>("KEEP_OLD_ARGUMENT_LIST_ON_TAB_KEY")
fun LookupElement.keepOldArgumentListOnTab(): LookupElement { fun LookupElement.keepOldArgumentListOnTab(): LookupElement {
putUserData(KEEP_OLD_ARGUMENT_LIST_ON_TAB_KEY, Unit.VALUE) putUserData(KEEP_OLD_ARGUMENT_LIST_ON_TAB_KEY, Unit)
return this return this
} }
libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter2/Html2CompilerPlugin.kt
+1 -4
View File
@@ -48,10 +48,7 @@ class Html2CompilerPlugin(private val compilerArguments: KDocArguments) : Doclet
val css = javaClass<Html2CompilerPlugin>().getClassLoader()!!.getResourceAsStream( val css = javaClass<Html2CompilerPlugin>().getClassLoader()!!.getResourceAsStream(
"org/jetbrains/kotlin/doc/highlighter2/hightlight.css")!! "org/jetbrains/kotlin/doc/highlighter2/hightlight.css")!!
File(srcOutputRoot, "highlight.css").write { outputStream -> File(srcOutputRoot, "highlight.css").write { outputStream -> css.copyTo(outputStream) }
css.copyTo(outputStream)
Unit.VALUE
}
for (sourceInfo in model.sourcesInfo) { for (sourceInfo in model.sourcesInfo) {
processFile(sourceInfo) processFile(sourceInfo)