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

Minor. Change return type for method WritableScope.changeLockLevel

Browse Source
This commit is contained in:
Stanislav Erokhin
2015-08-23 14:30:50 +03:00
parent 3152d722cd
commit 40c3b03a54
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/WritableScope.kt
+4 -4
View File
@@ -16,9 +16,9 @@
package org.jetbrains.kotlin.resolve.scopes package org.jetbrains.kotlin.resolve.scopes
import com.google.common.collect.Multimap import org.jetbrains.kotlin.descriptors.ClassifierDescriptor
import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.descriptors.FunctionDescriptor
import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.descriptors.VariableDescriptor
public interface WritableScope : JetScope { public interface WritableScope : JetScope {
public enum class LockLevel { public enum class LockLevel {
@@ -29,7 +29,7 @@ public interface WritableScope : JetScope {
public fun takeSnapshot(): JetScope public fun takeSnapshot(): JetScope
public fun changeLockLevel(lockLevel: LockLevel): WritableScope public fun changeLockLevel(lockLevel: LockLevel)
public fun addVariableDescriptor(variableDescriptor: VariableDescriptor) public fun addVariableDescriptor(variableDescriptor: VariableDescriptor)
compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/WritableScopeImpl.kt
+1 -2
View File
@@ -58,12 +58,11 @@ public class WritableScopeImpl @jvmOverloads constructor(
override fun getContainingDeclaration() = ownerDeclarationDescriptor override fun getContainingDeclaration() = ownerDeclarationDescriptor
override fun changeLockLevel(lockLevel: WritableScope.LockLevel): WritableScope { override fun changeLockLevel(lockLevel: WritableScope.LockLevel) {
if (lockLevel.ordinal() < this.lockLevel.ordinal()) { if (lockLevel.ordinal() < this.lockLevel.ordinal()) {
throw IllegalStateException("cannot lower lock level from " + this.lockLevel + " to " + lockLevel + " at " + toString()) throw IllegalStateException("cannot lower lock level from " + this.lockLevel + " to " + lockLevel + " at " + toString())
} }
this.lockLevel = lockLevel this.lockLevel = lockLevel
return this
} }
protected fun checkMayRead() { protected fun checkMayRead() {
idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt
+1
View File
@@ -356,6 +356,7 @@ class CallableBuilder(val config: CallableBuilderConfiguration) {
) { ) {
receiverClassDescriptor.getTypeConstructor().getParameters().forEach { addClassifierDescriptor(it) } receiverClassDescriptor.getTypeConstructor().getParameters().forEach { addClassifierDescriptor(it) }
changeLockLevel(WritableScope.LockLevel.READING) changeLockLevel(WritableScope.LockLevel.READING)
this
} }
val projections = receiverClassDescriptor.getTypeConstructor().getParameters() val projections = receiverClassDescriptor.getTypeConstructor().getParameters()