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

Get rid of deprecated annotations and modifiers in project code

Browse Source
This commit is contained in:
Denis Zharkov
2015-09-14 16:26:59 +03:00
parent 02aafe4262
commit 9c4564a5a6
204 changed files with 485 additions and 439 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.frontend/src/org/jetbrains/kotlin/js/analyze/suppressWarnings.kt
+1 -1
View File
@@ -41,7 +41,7 @@ public class SuppressUninitializedErrorsForNativeDeclarations : DiagnosticsWithS
override fun isSuppressed(diagnostic: Diagnostic): Boolean {
if (diagnostic.getFactory() != Errors.UNINITIALIZED_VARIABLE) return false
@suppress("UNCHECKED_CAST")
@Suppress("UNCHECKED_CAST")
val diagnosticWithParameters = diagnostic as DiagnosticWithParameters1<JetSimpleNameExpression, VariableDescriptor>
val variableDescriptor = diagnosticWithParameters.getA()
js/js.frontend/src/org/jetbrains/kotlin/js/analyzer/JsAnalysisResult.kt
+2 -2
View File
@@ -21,7 +21,6 @@ import org.jetbrains.kotlin.resolve.BindingTrace
import org.jetbrains.kotlin.descriptors.ModuleDescriptor
import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.types.ErrorUtils
import kotlin.platform.platformStatic
public class JsAnalysisResult(
public val bindingTrace: BindingTrace,
@@ -29,7 +28,8 @@ public class JsAnalysisResult(
) : AnalysisResult(bindingTrace.getBindingContext(), moduleDescriptor) {
companion object {
platformStatic public fun success(trace: BindingTrace, module: ModuleDescriptor): JsAnalysisResult {
@JvmStatic
public fun success(trace: BindingTrace, module: ModuleDescriptor): JsAnalysisResult {
return JsAnalysisResult(trace, module)
}
}
js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/JsCallChecker.kt
+2 -3
View File
@@ -45,7 +45,6 @@ import org.jetbrains.kotlin.resolve.constants.StringValue
import org.jetbrains.kotlin.resolve.constants.TypedCompileTimeConstant
import org.jetbrains.kotlin.resolve.constants.evaluate.ConstantExpressionEvaluator
import org.jetbrains.kotlin.types.TypeUtils
import kotlin.platform.platformStatic
public class JsCallChecker(
private val constantExpressionEvaluator: ConstantExpressionEvaluator
@@ -54,13 +53,13 @@ public class JsCallChecker(
companion object {
private val JS_PATTERN: DescriptorPredicate = PatternBuilder.pattern("kotlin.js.js(String)")
platformStatic
@JvmStatic
public fun <F : CallableDescriptor?> ResolvedCall<F>.isJsCall(): Boolean {
val descriptor = getResultingDescriptor()
return descriptor is SimpleFunctionDescriptor && JS_PATTERN.apply(descriptor)
}
platformStatic
@JvmStatic
public fun extractStringValue(compileTimeConstant: CompileTimeConstant<*>?): String? {
return ((compileTimeConstant as? TypedCompileTimeConstant<*>)?.constantValue as? StringValue)?.value
}
js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/JsCodePositioningStrategy.kt
+1 -1
View File
@@ -28,7 +28,7 @@ import org.jetbrains.kotlin.diagnostics.DiagnosticWithParameters1
public object JsCodePositioningStrategy : PositioningStrategy<PsiElement>() {
override fun markDiagnostic(diagnostic: ParametrizedDiagnostic<out PsiElement>): List<TextRange> {
@suppress("UNCHECKED_CAST")
@Suppress("UNCHECKED_CAST")
val diagnosticWithParameters = diagnostic as DiagnosticWithParameters1<JetExpression, JsCallData>
val textRange = diagnosticWithParameters.getA().reportRange
return listOf(textRange)