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

Typo fixed

Browse Source
This commit is contained in:
Mikhail Glukhikh
2015-09-29 13:26:09 +03:00
parent 3b018e9eb0
commit 1941827780
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java
+1 -1
View File
@@ -527,7 +527,7 @@ public interface Errors {
DiagnosticFactory1<JetSimpleNameExpression, JetType> COMPARE_TO_TYPE_MISMATCH = DiagnosticFactory1.create(ERROR); DiagnosticFactory1<JetSimpleNameExpression, JetType> COMPARE_TO_TYPE_MISMATCH = DiagnosticFactory1.create(ERROR);
DiagnosticFactory0<PsiElement> UNDESCORE_IS_DEPRECATED = DiagnosticFactory0.create(WARNING); DiagnosticFactory0<PsiElement> UNDERSCORE_IS_DEPRECATED = DiagnosticFactory0.create(WARNING);
DiagnosticFactory0<PsiElement> INAPPLICABLE_OPERATOR_MODIFIER = DiagnosticFactory0.create(ERROR); DiagnosticFactory0<PsiElement> INAPPLICABLE_OPERATOR_MODIFIER = DiagnosticFactory0.create(ERROR);
compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java
+1 -1
View File
@@ -357,7 +357,7 @@ public class DefaultErrorMessages {
MAP.put(COMPARE_TO_TYPE_MISMATCH, "''compareTo()'' must return kotlin.Int, but returns {0}", RENDER_TYPE); MAP.put(COMPARE_TO_TYPE_MISMATCH, "''compareTo()'' must return kotlin.Int, but returns {0}", RENDER_TYPE);
MAP.put(UNDESCORE_IS_DEPRECATED, "Names _, __, ___, ..., are deprecated"); MAP.put(UNDERSCORE_IS_DEPRECATED, "Names _, __, ___, ..., are deprecated");
MAP.put(INAPPLICABLE_OPERATOR_MODIFIER, "'operator' modifier is inapplicable on this function"); MAP.put(INAPPLICABLE_OPERATOR_MODIFIER, "'operator' modifier is inapplicable on this function");
compiler/frontend/src/org/jetbrains/kotlin/resolve/UnderscoreChecker.kt
+1 -1
View File
@@ -30,7 +30,7 @@ object UnderscoreChecker : DeclarationChecker {
fun checkIdentifier(identifier: PsiElement?, diagnosticHolder: DiagnosticSink) { fun checkIdentifier(identifier: PsiElement?, diagnosticHolder: DiagnosticSink) {
if (identifier == null || identifier.text.isEmpty()) return if (identifier == null || identifier.text.isEmpty()) return
if (identifier.text.all { it == '_' }) { if (identifier.text.all { it == '_' }) {
diagnosticHolder.report(Errors.UNDESCORE_IS_DEPRECATED.on(identifier)) diagnosticHolder.report(Errors.UNDERSCORE_IS_DEPRECATED.on(identifier))
} }
} }
compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyImportScope.kt
+1 -1
View File
@@ -102,7 +102,7 @@ class LazyImportResolver(
} }
for ((alias, import) in explicitClassImports.entries()) { for ((alias, import) in explicitClassImports.entries()) {
if (alias.all { it == '_' }) { if (alias.all { it == '_' }) {
traceForImportResolve.report(Errors.UNDESCORE_IS_DEPRECATED.on(import)) traceForImportResolve.report(Errors.UNDERSCORE_IS_DEPRECATED.on(import))
} }
} }
for (alias in explicitClassImports.keySet()) { for (alias in explicitClassImports.keySet()) {
compiler/testData/diagnostics/tests/Underscore.kt
Vendored
+7 -7
View File
@@ -1,16 +1,16 @@
// !DIAGNOSTICS: -DEPRECATED_SYMBOL_WITH_MESSAGE // !DIAGNOSTICS: -DEPRECATED_SYMBOL_WITH_MESSAGE
<!UNDESCORE_IS_DEPRECATED!>import kotlin.Deprecated as ___<!> <!UNDERSCORE_IS_DEPRECATED!>import kotlin.Deprecated as ___<!>
@___("") data class Pair(val x: Int, val y: Int) @___("") data class Pair(val x: Int, val y: Int)
class <!UNDESCORE_IS_DEPRECATED!>_<!><<!UNDESCORE_IS_DEPRECATED!>________<!>> class <!UNDERSCORE_IS_DEPRECATED!>_<!><<!UNDERSCORE_IS_DEPRECATED!>________<!>>
val <!UNDESCORE_IS_DEPRECATED!>______<!> = _<Int>() val <!UNDERSCORE_IS_DEPRECATED!>______<!> = _<Int>()
fun <!UNDESCORE_IS_DEPRECATED!>__<!>(<!UNDESCORE_IS_DEPRECATED!>___<!>: Int, y: _<Int>?): Int { fun <!UNDERSCORE_IS_DEPRECATED!>__<!>(<!UNDERSCORE_IS_DEPRECATED!>___<!>: Int, y: _<Int>?): Int {
val (x, <!UNDESCORE_IS_DEPRECATED!>__________<!>) = Pair(___ - 1, 42) val (x, <!UNDERSCORE_IS_DEPRECATED!>__________<!>) = Pair(___ - 1, 42)
val <!UNDESCORE_IS_DEPRECATED!>____<!> = x val <!UNDERSCORE_IS_DEPRECATED!>____<!> = x
// in backquotes: allowed // in backquotes: allowed
val `_` = __________ val `_` = __________
<!UNDESCORE_IS_DEPRECATED!>__<!>@ return if (y != null) __(____, y) else __(`_`, ______) <!UNDERSCORE_IS_DEPRECATED!>__<!>@ return if (y != null) __(____, y) else __(`_`, ______)
} }